From fbfae5262724ac81edf90f457ef73158915aae63 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Sun, 20 Nov 2022 14:41:41 +0100
Subject: [PATCH] Try fix #451

Android does not support true context menu anyway, thus removing per toot component.
---
 package.json                              |   2 +-
 src/components/Timeline/Default.tsx       |  11 +-
 src/components/Timeline/Notifications.tsx | 241 ++++++++++++----------
 3 files changed, 140 insertions(+), 114 deletions(-)

diff --git a/package.json b/package.json
index fca7ccd7..5179551f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index 8eb7876d..5adcf7e4 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -17,7 +17,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { uniqBy } from 'lodash'
 import React, { useRef } from 'react'
-import { Pressable, StyleProp, View, ViewStyle } from 'react-native'
+import { Platform, Pressable, StyleProp, View, ViewStyle } from 'react-native'
 import { useSelector } from 'react-redux'
 import TimelineContextMenu from './Shared/ContextMenu'
 import TimelineFeedback from './Shared/Feedback'
@@ -156,6 +156,15 @@ const TimelineDefault: React.FC<Props> = ({
 
   return disableOnPress ? (
     <View style={mainStyle}>{main()}</View>
+  ) : Platform.OS === 'android' ? (
+    <Pressable
+      accessible={highlighted ? false : true}
+      style={mainStyle}
+      onPress={onPress}
+      onLongPress={() => {}}
+    >
+      {main()}
+    </Pressable>
   ) : (
     <TimelineContextMenu
       copiableContent={copiableContent}
diff --git a/src/components/Timeline/Notifications.tsx b/src/components/Timeline/Notifications.tsx
index cad50a18..85dc7943 100644
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@@ -17,7 +17,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import { isEqual, uniqBy } from 'lodash'
 import React, { useCallback, useRef } from 'react'
-import { Pressable, View } from 'react-native'
+import { Platform, Pressable, View } from 'react-native'
 import { useSelector } from 'react-redux'
 import TimelineContextMenu from './Shared/ContextMenu'
 import TimelineFiltered, { shouldFilter } from './Shared/Filtered'
@@ -29,129 +29,146 @@ export interface Props {
   highlighted?: boolean
 }
 
-const TimelineNotifications = React.memo(
-  ({ notification, queryKey, highlighted = false }: Props) => {
-    const copiableContent = useRef<{ content: string; complete: boolean }>({
-      content: '',
-      complete: false
+const TimelineNotifications: React.FC<Props> = ({
+  notification,
+  queryKey,
+  highlighted = false
+}) => {
+  const copiableContent = useRef<{ content: string; complete: boolean }>({
+    content: '',
+    complete: false
+  })
+
+  const filtered =
+    notification.status &&
+    shouldFilter({
+      copiableContent,
+      status: notification.status,
+      queryKey
     })
+  if (notification.status && filtered) {
+    return <TimelineFiltered phrase={filtered} />
+  }
 
-    const filtered =
-      notification.status &&
-      shouldFilter({
-        copiableContent,
-        status: notification.status,
-        queryKey
+  const { colors } = useTheme()
+  const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev?.id === next?.id)
+  const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
+
+  const actualAccount = notification.status ? notification.status.account : notification.account
+
+  const onPress = useCallback(() => {
+    analytics('timeline_notification_press')
+    notification.status &&
+      navigation.push('Tab-Shared-Toot', {
+        toot: notification.status,
+        rootQueryKey: queryKey
       })
-    if (notification.status && filtered) {
-      return <TimelineFiltered phrase={filtered} />
-    }
-
-    const { colors } = useTheme()
-    const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev?.id === next?.id)
-    const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
-
-    const actualAccount = notification.status ? notification.status.account : notification.account
-
-    const onPress = useCallback(() => {
-      analytics('timeline_notification_press')
-      notification.status &&
-        navigation.push('Tab-Shared-Toot', {
-          toot: notification.status,
-          rootQueryKey: queryKey
-        })
-    }, [])
+  }, [])
 
+  const main = () => {
     return (
-      <TimelineContextMenu
-        copiableContent={copiableContent}
-        status={notification.status}
-        queryKey={queryKey}
-      >
-        <Pressable
+      <>
+        {notification.type !== 'mention' ? (
+          <TimelineActioned
+            action={notification.type}
+            account={notification.account}
+            notification
+          />
+        ) : null}
+
+        <View
           style={{
-            padding: StyleConstants.Spacing.Global.PagePadding,
-            backgroundColor: colors.backgroundDefault,
-            paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
+            opacity:
+              notification.type === 'follow' ||
+              notification.type === 'follow_request' ||
+              notification.type === 'mention' ||
+              notification.type === 'status'
+                ? 1
+                : 0.5
           }}
-          onPress={onPress}
-          onLongPress={() => {}}
         >
-          {notification.type !== 'mention' ? (
-            <TimelineActioned
-              action={notification.type}
-              account={notification.account}
-              notification
-            />
-          ) : null}
-
-          <View
-            style={{
-              opacity:
-                notification.type === 'follow' ||
-                notification.type === 'follow_request' ||
-                notification.type === 'mention' ||
-                notification.type === 'status'
-                  ? 1
-                  : 0.5
-            }}
-          >
-            <View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
-              <TimelineAvatar
-                queryKey={queryKey}
-                account={actualAccount}
-                highlighted={highlighted}
-              />
-              <TimelineHeaderNotification queryKey={queryKey} notification={notification} />
-            </View>
-
-            {notification.status ? (
-              <View
-                style={{
-                  paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
-                  paddingLeft: highlighted ? 0 : StyleConstants.Avatar.M + StyleConstants.Spacing.S
-                }}
-              >
-                {notification.status.content.length > 0 ? (
-                  <TimelineContent status={notification.status} highlighted={highlighted} />
-                ) : null}
-                {notification.status.poll ? (
-                  <TimelinePoll
-                    queryKey={queryKey}
-                    statusId={notification.status.id}
-                    poll={notification.status.poll}
-                    reblog={false}
-                    sameAccount={notification.account.id === instanceAccount?.id}
-                  />
-                ) : null}
-                {notification.status.media_attachments.length > 0 ? (
-                  <TimelineAttachment status={notification.status} />
-                ) : null}
-                {notification.status.card ? <TimelineCard card={notification.status.card} /> : null}
-                <TimelineFullConversation queryKey={queryKey} status={notification.status} />
-              </View>
-            ) : null}
+          <View style={{ flex: 1, width: '100%', flexDirection: 'row' }}>
+            <TimelineAvatar queryKey={queryKey} account={actualAccount} highlighted={highlighted} />
+            <TimelineHeaderNotification queryKey={queryKey} notification={notification} />
           </View>
 
           {notification.status ? (
-            <TimelineActions
-              queryKey={queryKey}
-              status={notification.status}
-              highlighted={highlighted}
-              accts={uniqBy(
-                ([notification.status.account] as Mastodon.Account[] & Mastodon.Mention[])
-                  .concat(notification.status.mentions)
-                  .filter(d => d?.id !== instanceAccount?.id),
-                d => d?.id
-              ).map(d => d?.acct)}
-              reblog={false}
-            />
+            <View
+              style={{
+                paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
+                paddingLeft: highlighted ? 0 : StyleConstants.Avatar.M + StyleConstants.Spacing.S
+              }}
+            >
+              {notification.status.content.length > 0 ? (
+                <TimelineContent status={notification.status} highlighted={highlighted} />
+              ) : null}
+              {notification.status.poll ? (
+                <TimelinePoll
+                  queryKey={queryKey}
+                  statusId={notification.status.id}
+                  poll={notification.status.poll}
+                  reblog={false}
+                  sameAccount={notification.account.id === instanceAccount?.id}
+                />
+              ) : null}
+              {notification.status.media_attachments.length > 0 ? (
+                <TimelineAttachment status={notification.status} />
+              ) : null}
+              {notification.status.card ? <TimelineCard card={notification.status.card} /> : null}
+              <TimelineFullConversation queryKey={queryKey} status={notification.status} />
+            </View>
           ) : null}
-        </Pressable>
-      </TimelineContextMenu>
+        </View>
+
+        {notification.status ? (
+          <TimelineActions
+            queryKey={queryKey}
+            status={notification.status}
+            highlighted={highlighted}
+            accts={uniqBy(
+              ([notification.status.account] as Mastodon.Account[] & Mastodon.Mention[])
+                .concat(notification.status.mentions)
+                .filter(d => d?.id !== instanceAccount?.id),
+              d => d?.id
+            ).map(d => d?.acct)}
+            reblog={false}
+          />
+        ) : null}
+      </>
     )
-  },
-  (prev, next) => isEqual(prev.notification, next.notification)
-)
+  }
+
+  return Platform.OS === 'android' ? (
+    <Pressable
+      style={{
+        padding: StyleConstants.Spacing.Global.PagePadding,
+        backgroundColor: colors.backgroundDefault,
+        paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
+      }}
+      onPress={onPress}
+      onLongPress={() => {}}
+    >
+      {main()}
+    </Pressable>
+  ) : (
+    <TimelineContextMenu
+      copiableContent={copiableContent}
+      status={notification.status}
+      queryKey={queryKey}
+    >
+      <Pressable
+        style={{
+          padding: StyleConstants.Spacing.Global.PagePadding,
+          backgroundColor: colors.backgroundDefault,
+          paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
+        }}
+        onPress={onPress}
+        onLongPress={() => {}}
+      >
+        {main()}
+      </Pressable>
+    </TimelineContextMenu>
+  )
+}
 
 export default TimelineNotifications