Merge pull request #196 from tooot-app/main

Test v3.1

android/app/src/main/java/com/xmflsct/app/tooot/MainApplication.java

@@ -15,8 +15,6 @@ import com.facebook.soloader.SoLoader;
 
 import expo.modules.ApplicationLifecycleDispatcher;
 import expo.modules.ReactNativeHostWrapper;
-import expo.modules.permissions.PermissionsPackage;
-import expo.modules.filesystem.FileSystemPackage;
 import expo.modules.updates.UpdatesController;
 
 import java.lang.reflect.InvocationTargetException;

ios/Podfile.lock

@@ -14,7 +14,7 @@ PODS:
     - ExpoModulesCore
   - EXErrorRecovery (3.0.4):
     - ExpoModulesCore
-  - EXFileSystem (13.1.0):
+  - EXFileSystem (13.2.0):
     - ExpoModulesCore
   - EXFirebaseAnalytics (6.0.0):
     - EXFirebaseCore
@@ -38,20 +38,15 @@ PODS:
     - ExpoModulesCore
   - EXManifests (0.2.2):
     - EXJSONUtils
-  - EXMediaLibrary (14.0.0):
-    - ExpoModulesCore
-    - React-Core
   - EXNotifications (0.14.0):
     - ExpoModulesCore
-  - EXPermissions (13.1.0):
+  - Expo (44.0.4):
-    - ExpoModulesCore
-  - Expo (44.0.3):
     - ExpoModulesCore
   - ExpoHaptics (11.1.0):
     - ExpoModulesCore
   - ExpoLocalization (12.0.0):
     - ExpoModulesCore
-  - ExpoModulesCore (0.6.3):
+  - ExpoModulesCore (0.6.4):
     - React-Core
     - ReactCommon/turbomodule/core
   - EXRandom (12.1.1):
@@ -73,7 +68,7 @@ PODS:
     - EXUpdatesInterface
     - React-Core
   - EXUpdatesInterface (0.5.0)
-  - EXVideoThumbnails (6.1.0):
+  - EXVideoThumbnails (6.2.0):
     - ExpoModulesCore
   - EXWebBrowser (10.1.0):
     - ExpoModulesCore
@@ -531,9 +526,7 @@ DEPENDENCIES:
   - EXJSONUtils (from `../node_modules/expo-json-utils/ios`)
   - EXKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - EXManifests (from `../node_modules/expo-manifests/ios`)
-  - EXMediaLibrary (from `../node_modules/expo-media-library/ios`)
   - EXNotifications (from `../node_modules/expo-notifications/ios`)
-  - EXPermissions (from `../node_modules/expo-permissions/ios`)
   - Expo (from `../node_modules/expo/ios`)
   - ExpoHaptics (from `../node_modules/expo-haptics/ios`)
   - ExpoLocalization (from `../node_modules/expo-localization/ios`)
@@ -654,12 +647,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-keep-awake/ios"
   EXManifests:
     :path: "../node_modules/expo-manifests/ios"
-  EXMediaLibrary:
-    :path: "../node_modules/expo-media-library/ios"
   EXNotifications:
     :path: "../node_modules/expo-notifications/ios"
-  EXPermissions:
-    :path: "../node_modules/expo-permissions/ios"
   Expo:
     :path: "../node_modules/expo/ios"
   ExpoHaptics:
@@ -786,7 +775,7 @@ SPEC CHECKSUMS:
   EXCrypto: e3c0853c2a9ef885928f6227b967b9598132f727
   EXDevice: 7de98d8f97088fad9c01e9a68abad07e501208b2
   EXErrorRecovery: deea88a01d38f8b1c1181b4e1d179b0ba0e4bb5b
-  EXFileSystem: 7d1309ba6b38b82ef7fc9e80174de3f9184ac8b4
+  EXFileSystem: 7bcd3c1428698150d5c8ca140c8183f2ee204048
   EXFirebaseAnalytics: 27dbc5cb83c244d8404b2927676299f3e172470e
   EXFirebaseCore: 16f39b0ea94ce985a8f2e16cc796bf79bdcfa297
   EXFont: 1fb13af43dc517c01c0ff21a6e32f9f9bf2ea602
@@ -796,13 +785,11 @@ SPEC CHECKSUMS:
   EXJSONUtils: f515cf71710855d7ba5bfc6752af3b9a6f6aad01
   EXKeepAwake: b571c2ad8323b2fced6e907766e2549f75119471
   EXManifests: 50e42e01335df4e54109dee7be5a91bfd37347db
-  EXMediaLibrary: 6acf919299bccc64a59e6e89a3b792276e309302
   EXNotifications: d5b454a2363c8743aa9b2888cc0df70a1d9ee816
-  EXPermissions: f4c65fa770489cbf16ea17c3013a670671525014
+  Expo: d9b8b5e49c200471fc473a652a84fe30dee73027
-  Expo: 5f9812539b12998a813315ea8036971c9b56a9e7
   ExpoHaptics: c62a5fc7bba0184d0165d559fc2b0fc46168ef40
   ExpoLocalization: 83582a967db52987a8479490b056d5eb9fd70552
-  ExpoModulesCore: d04e519b3e8e21523b195bb21a40144e30f1e163
+  ExpoModulesCore: 64abda7af7cf659d2fa092934e29c6f4ea7e849f
   EXRandom: 06978dcf45075f3c9e17ae5e726b887316ee9877
   EXScreenCapture: 0146fdf6ca4c3402a1cf62b2ddb739a840e08c94
   EXSecureStore: fa0fdde1c81ceee2a3cb0519e649feae42767969
@@ -811,7 +798,7 @@ SPEC CHECKSUMS:
   EXStructuredHeaders: 2ce79a3770bd3795bade1aab215ada70deae8bbc
   EXUpdates: 98b9e647ce7a0e9d5ab67135bf42188c750a99eb
   EXUpdatesInterface: f459b515151bd73fff7a35366eace34a6c6a0d3f
-  EXVideoThumbnails: 6c08e978ed7a5542c5dca04a1757363fd29cb2a1
+  EXVideoThumbnails: 847d648d6f4bc0c1afad05caa56a487dc543445e
   EXWebBrowser: 37388663fa51cbfc883de2244931a5182d948e5f
   FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
   FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58

package.json

@@ -39,30 +39,27 @@
     "@sentry/react-native": "3.2.3",
     "@sharcoux/slider": "5.6.1",
     "axios": "0.24.0",
-    "expo": "44.0.3",
+    "expo": "44.0.4",
     "expo-auth-session": "3.5.0",
     "expo-av": "10.2.0",
     "expo-constants": "^13.0.0",
     "expo-crypto": "10.1.1",
     "expo-device": "4.1.0",
-    "expo-file-system": "13.1.0",
+    "expo-file-system": "13.2.0",
     "expo-firebase-analytics": "6.0.0",
     "expo-haptics": "11.1.0",
     "expo-image-manipulator": "10.2.0",
     "expo-image-picker": "12.0.1",
     "expo-linking": "3.0.0",
     "expo-localization": "12.0.0",
-    "expo-media-library": "^14.0.0",
     "expo-notifications": "0.14.0",
-    "expo-permissions": "13.1.0",
     "expo-random": "12.1.1",
     "expo-screen-capture": "4.1.0",
     "expo-secure-store": "11.1.0",
     "expo-splash-screen": "0.14.1",
-    "expo-status-bar": "1.2.0",
     "expo-store-review": "5.1.0",
     "expo-updates": "0.11.3",
-    "expo-video-thumbnails": "6.1.0",
+    "expo-video-thumbnails": "6.2.0",
     "expo-web-browser": "10.1.0",
     "i18next": "20.6.1",
     "li": "1.3.0",

src/api/general.ts

@@ -58,9 +58,9 @@ const apiGeneral = async <T = unknown>({
       })
     })
     .catch(error => {
-      if (sentry && Math.random() < 0.001) {
+      if (sentry && Math.random() < 0.01) {
         Sentry.Native.setExtras({
-          API: 'instance',
+          API: 'general',
           ...(error.response && { response: error.response }),
           ...(error.request && { request: error.request })
         })

src/api/tooot.ts

@@ -61,7 +61,7 @@ const apiTooot = async <T = unknown>({
       })
     })
     .catch(error => {
-      if (sentry && Math.random() < 0.005) {
+      if (sentry && Math.random() < 0.01) {
         Sentry.Native.setExtras({
           API: 'tooot',
           ...(error.response && { response: error.response }),

src/components/Timeline/Shared/Attachment/Audio.tsx

@@ -96,7 +96,7 @@ const AttachmentAudio: React.FC<Props> = ({
           </>
         )}
       </View>
-      {audio.meta.original.duration ? (
+      {audio.meta?.original?.duration ? (
         <View
           style={{
             alignSelf: 'flex-end',

src/screens/ImageViewer/save.ts

@@ -3,10 +3,9 @@ import { displayMessage } from '@components/Message'
 import CameraRoll from '@react-native-community/cameraroll'
 import { RootStackParamList } from '@utils/navigation/navigators'
 import * as FileSystem from 'expo-file-system'
-import * as MediaLibrary from 'expo-media-library'
 import i18next from 'i18next'
 import { RefObject } from 'react'
-import { Platform } from 'react-native'
+import { PermissionsAndroid, Platform } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
 
 type CommonProps = {
@@ -65,12 +64,31 @@ const saveAndroid = async ({ messageRef, mode, image }: CommonProps) => {
     await FileSystem.downloadAsync(image.url, fileUri)
 
   if (downloadedFile.status != 200) {
-    console.warn('error!')
+    haptics('Error')
+    displayMessage({
+      ref: messageRef,
+      mode,
+      type: 'error',
+      message: i18next.t('screenImageViewer:content.save.failed')
+    })
+    return
   }
 
-  const perm = await MediaLibrary.requestPermissionsAsync()
+  const permission = PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE
-  if (!perm.granted) {
+
-    return
+  const hasPermission = await PermissionsAndroid.check(permission)
+  if (!hasPermission) {
+    const status = await PermissionsAndroid.request(permission)
+    if (status !== 'granted') {
+      haptics('Error')
+      displayMessage({
+        ref: messageRef,
+        mode,
+        type: 'error',
+        message: i18next.t('screenImageViewer:content.save.failed')
+      })
+      return
+    }
   }
 
   CameraRoll.save(downloadedFile.uri)

src/screens/Tabs/Shared/Toot.tsx

@@ -7,6 +7,7 @@ import { findIndex } from 'lodash'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { FlatList } from 'react-native'
 import { InfiniteQueryObserver, useQueryClient } from 'react-query'
+import * as Sentry from 'sentry-expo'
 
 const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
   route: {
@@ -40,30 +41,56 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
         if (!scrolled.current) {
           scrolled.current = true
           const pointer = findIndex(flattenData, ['id', toot.id])
-          pointer < flattenData.length &&
+          try {
-            setTimeout(() => {
+            pointer < flattenData.length &&
-              flRef.current?.scrollToIndex({
+              setTimeout(() => {
+                flRef.current?.scrollToIndex({
+                  index: pointer,
+                  viewOffset: 100
+                })
+              }, 500)
+          } catch (err) {
+            if (Math.random() < 0.1) {
+              Sentry.Native.setExtras({
+                type: 'original',
                 index: pointer,
-                viewOffset: 100
+                itemsLength: flattenData.length,
+                flattenData
               })
-            }, 500)
+              Sentry.Native.captureException(err)
+            }
+          }
         }
       }
     })
     return () => unsubscribe()
-  }, [])
+  }, [scrolled.current])
 
   // Toot page auto scroll to selected toot
   const onScrollToIndexFailed = useCallback(
     error => {
       const offset = error.averageItemLength * error.index
       flRef.current?.scrollToOffset({ offset })
-      setTimeout(
+      try {
-        () =>
+        error.index < itemsLength &&
-          error.index < itemsLength &&
+          setTimeout(
-          flRef.current?.scrollToIndex({ index: error.index, viewOffset: 100 }),
+            () =>
-        500
+              flRef.current?.scrollToIndex({
-      )
+                index: error.index,
+                viewOffset: 100
+              }),
+            500
+          )
+      } catch (err) {
+        if (Math.random() < 0.1) {
+          Sentry.Native.setExtras({
+            type: 'onScrollToIndexFailed',
+            index: error.index,
+            itemsLength
+          })
+          Sentry.Native.captureException(err)
+        }
+      }
     },
     [itemsLength]
   )

yarn.lock

@@ -1342,7 +1342,7 @@
     xcode "^3.0.1"
     xml2js "0.4.23"
 
-"@expo/config-plugins@4.0.15":
+"@expo/config-plugins@4.0.15", "@expo/config-plugins@^4.0.14":
   version "4.0.15"
   resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.15.tgz#cc170a0cf890973b6491cf357540e9955296019c"
   integrity sha512-QqxVEt2bFu3ZuI1soULRJv7i0Zrg/FMZ0IxNV7Y3AjH7fhtUJH3pPo9f6MURvqNr+PLxhBlkofkWfunrVejSkw==
@@ -3545,7 +3545,15 @@ expo-error-recovery@~3.0.4:
   resolved "https://registry.yarnpkg.com/expo-error-recovery/-/expo-error-recovery-3.0.4.tgz#de85c8c6b387d9b1e532256600882f2c2704383a"
   integrity sha512-7z2V7n9Yvm9/ogm4I1KgcsQZfgyDMSOBVHk8pA3IY0jL8+tXTyTrStxHsPXRjE8HHeYikfTRBIeFsh/1wWY7oA==
 
-expo-file-system@13.1.0, expo-file-system@~13.1.0:
+expo-file-system@13.2.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-13.2.0.tgz#155fecd095d0aa01b9b78423077033e6ab852f0c"
+  integrity sha512-YboLdTuPVhYYcAIwYkJXsh0Ud6d3hwxU2DQ167lVktQ+SUIAyGN/VQQm1pkQBcpj/FFd2IM3NTD0ofx9qxyVGg==
+  dependencies:
+    "@expo/config-plugins" "^4.0.14"
+    uuid "^3.4.0"
+
+expo-file-system@~13.1.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-13.1.0.tgz#7758617ad5bd60dac82c642bf8c85d0cdb00c117"
   integrity sha512-Hd+aBfcZfiD9p2qOEMvcUJuEnQk5NEostZjT5gVkQmRoITUxf9wGgrX1tSAzF8JQAtOJVjfWYOwTMHq2H9M8AA==
@@ -3633,14 +3641,18 @@ expo-manifests@~0.2.2:
   dependencies:
     expo-json-utils "~0.2.0"
 
-expo-media-library@^14.0.0:
+expo-modules-autolinking@0.5.5:
-  version "14.0.0"
+  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-14.0.0.tgz#aed008f7b750c02ec4a298c7aaa2fc4454171eea"
+  resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-0.5.5.tgz#6bcc42072dcbdfca79d207b7f549f1fdb54a2b74"
-  integrity sha512-rbrFSLxpmhKqvWivjpMXhAOu0D0sRhu2UNc+SJntXJwsLYx7Mzh9N8pk2kU7iLTPR2YYfxOGW7HyFj18+OB6QQ==
+  integrity sha512-bILEG0Fg+ZhIhdEaShHzsEN1WC0hUmXJ5Kcd4cd+8rVk1Ead9vRZxA/yLx1cNBDCOwMe0GAMrhF7TKT+A1P+YA==
   dependencies:
-    "@expo/config-plugins" "^4.0.2"
+    chalk "^4.1.0"
+    commander "^7.2.0"
+    fast-glob "^3.2.5"
+    find-up "^5.0.0"
+    fs-extra "^9.1.0"
 
-expo-modules-autolinking@0.5.4, expo-modules-autolinking@~0.5.1:
+expo-modules-autolinking@~0.5.1:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-0.5.4.tgz#d105d46cb6faab71c72c3181b9c2ab8cc8b09dba"
   integrity sha512-Q2wQp7tE7nlkmIQslQxa02uswOAJZXuJHWmb5oCG8BkzL6QBmDURJ/1j5hlIKuyN+j1M0rZbzyVI+ufyziGsSQ==
@@ -3651,10 +3663,10 @@ expo-modules-autolinking@0.5.4, expo-modules-autolinking@~0.5.1:
     find-up "^5.0.0"
     fs-extra "^9.1.0"
 
-expo-modules-core@0.6.3:
+expo-modules-core@0.6.4:
-  version "0.6.3"
+  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-0.6.3.tgz#e5326169a888144f2691ffd49b7686dfac235227"
+  resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-0.6.4.tgz#dd0265da98a92bd8004c83d9953136e4820f1bef"
-  integrity sha512-VLVQ6mK9rQHdcV+dn2keXsnDGR8OehUHkSAeZ88e5N8j1zjBo/9SI2/R7v3jBj+1Adg/wmVc5vyJzqnj2hlM2w==
+  integrity sha512-I5MvSZHjww4Jfvob/woCbI0ZLZIUBmhoiLeZsMJoWJuWa8QmtxXjI+4eRjaDB7+RxNVhrnVcmRjQPYG/5HepVg==
   dependencies:
     compare-versions "^3.4.0"
     invariant "^2.2.4"
@@ -3676,11 +3688,6 @@ expo-notifications@0.14.0:
     unimodules-task-manager-interface "~7.1.0"
     uuid "^3.4.0"
 
-expo-permissions@13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-13.1.0.tgz#1be8fe01476950d642ea83d383fd8912492434b9"
-  integrity sha512-f3ngERaoeAw8236xyvw4gS89Fxd4fU2soKXQn0JPXwiDGmIXO+lIJNH3psNvAebj4DfmyQtGW4AS1itG83GHaQ==
-
 expo-random@12.1.1:
   version "12.1.1"
   resolved "https://registry.yarnpkg.com/expo-random/-/expo-random-12.1.1.tgz#75f6eec8d4b9026a27eb90ed4b60d56dab414106"
@@ -3706,11 +3713,6 @@ expo-splash-screen@0.14.1:
     "@expo/configure-splash-screen" "^0.6.0"
     "@expo/prebuild-config" "^3.0.15"
 
-expo-status-bar@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.2.0.tgz#16e73205da563f9536f562e439081e30e318a82e"
-  integrity sha512-pVZZ/kDCXFK79E4dCtRecs3XLC8aiwlciutSd/fFmUPJSQZ1Txia6hlKajPt0GAYft8/YnT0V3URXzWZOBniYQ==
-
 expo-store-review@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/expo-store-review/-/expo-store-review-5.1.0.tgz#56e2fb7ee321d849ce27cb11fb328aa05faf8dd9"
@@ -3741,10 +3743,10 @@ expo-updates@0.11.3:
     resolve-from "^5.0.0"
     uuid "^3.4.0"
 
-expo-video-thumbnails@6.1.0:
+expo-video-thumbnails@6.2.0:
-  version "6.1.0"
+  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/expo-video-thumbnails/-/expo-video-thumbnails-6.1.0.tgz#377c3569a5a584d95c88b7d6c475a260d063ef41"
+  resolved "https://registry.yarnpkg.com/expo-video-thumbnails/-/expo-video-thumbnails-6.2.0.tgz#ebf33500b6b32a9efdaf498a08dd0d9ac2add049"
-  integrity sha512-qRMsgL6JY6um3UKq//0VO6J4NurqMOLuAv+Mu01Z4pweuoR83j7HOKNr0PKszIyBv/9tNeLzzrUYQuQPzXmKHA==
+  integrity sha512-iW49Atk3fijqxFY7PLfmOL2QhWsD/A7Sh+4X8YtNGG0T2Bd16fMEvl5BdvBZdAz+A67VidGkI4hxNWTDWw/bVw==
 
 expo-web-browser@10.1.0, expo-web-browser@~10.1.0:
   version "10.1.0"
@@ -3753,10 +3755,10 @@ expo-web-browser@10.1.0, expo-web-browser@~10.1.0:
   dependencies:
     compare-urls "^2.0.0"
 
-expo@44.0.3:
+expo@44.0.4:
-  version "44.0.3"
+  version "44.0.4"
-  resolved "https://registry.yarnpkg.com/expo/-/expo-44.0.3.tgz#6f30ff51fbb2608a408c7ac10aeb703fc04d304e"
+  resolved "https://registry.yarnpkg.com/expo/-/expo-44.0.4.tgz#328e3ca41f6d195d3525b30c8a74d8c241efcf7d"
-  integrity sha512-uk6t89gV5Gs5MdHXZkjKlBdXSo4j+oKj/BrK/FTFlKvEqEL34SbEXy9IcS0o7IDPFuqVIzclXcnAI+sOU4J5Lg==
+  integrity sha512-XYEG0ldlKmRGTFBGSCcW6GI6SNMBrp1uM+s8yIfUmRzHmxj2D0HP+r1aUH8iU1alsIjh00IAGQ71BMPu0hRlNQ==
   dependencies:
     "@babel/runtime" "^7.14.0"
     "@expo/metro-config" "~0.2.6"
@@ -3769,8 +3771,8 @@ expo@44.0.3:
     expo-file-system "~13.1.0"
     expo-font "~10.0.4"
     expo-keep-awake "~10.0.1"
-    expo-modules-autolinking "0.5.4"
+    expo-modules-autolinking "0.5.5"
-    expo-modules-core "0.6.3"
+    expo-modules-core "0.6.4"
     fbemitter "^2.1.1"
     invariant "^2.2.4"
     md5-file "^3.2.3"