From db5cc566eaebbbce1e58cd1c60c05bebabd929bd Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 27 Mar 2023 14:40:08 +1300
Subject: [PATCH] Remove double permissions request and fix import - 1.136

---
 SettingsPage.tsx         | 13 ++++---------
 android/app/build.gradle |  4 ++--
 jestSetup.ts             |  1 -
 package.json             |  3 +--
 yarn.lock                | 27 ---------------------------
 5 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index b9a3c23..92675d8 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -6,7 +6,6 @@ import {NativeModules, ScrollView, View} from 'react-native'
 import DocumentPicker from 'react-native-document-picker'
 import {Dirs, FileSystem} from 'react-native-file-access'
 import {Button, Subheading} from 'react-native-paper'
-import {PERMISSIONS, request} from 'react-native-permissions'
 import ConfirmDialog from './ConfirmDialog'
 import {ITEM_PADDING, MARGIN} from './constants'
 import {AppDataSource} from './data-source'
@@ -135,12 +134,7 @@ export default function SettingsPage() {
           return
         case 'backup':
           if (value) {
-            const granted = await request(
-              PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE,
-            )
-            if (!granted) return
             const result = await DocumentPicker.pickDirectory()
-            console.log(result.uri)
             toast('Backup database daily.')
             NativeModules.BackupModule.start(result.uri)
           } else {
@@ -247,14 +241,15 @@ export default function SettingsPage() {
   const confirmImport = useCallback(async () => {
     setImporting(false)
     await AppDataSource.destroy()
-    const result = await DocumentPicker.pickSingle()
-    await FileSystem.cp(result.uri, Dirs.DatabaseDir + '/massive.db')
+    const file = await DocumentPicker.pickSingle()
+    await FileSystem.cp(file.uri, Dirs.DatabaseDir + '/massive.db')
     await AppDataSource.initialize()
     await setRepo.createQueryBuilder().update().set({image: null}).execute()
     await update('sound', null)
     const {alarm, backup} = await settingsRepo.findOne({where: {}})
     console.log({backup})
-    if (backup) NativeModules.BackupModule.start()
+    const directory = await DocumentPicker.pickDirectory()
+    if (backup) NativeModules.BackupModule.start(directory.uri)
     else NativeModules.BackupModule.stop()
     NativeModules.SettingsModule.ignoringBattery(
       async (isIgnoring: boolean) => {
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 664852d..75f473b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -41,8 +41,8 @@ android {
         missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36161
-        versionName "1.135"
+        versionCode 36162
+        versionName "1.136"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/jestSetup.ts b/jestSetup.ts
index fe3c97b..79027f0 100644
--- a/jestSetup.ts
+++ b/jestSetup.ts
@@ -11,7 +11,6 @@ NativeModules.SettingsModule = NativeModules.SettingsModule || {
 
 jest.mock('react-native-file-access', () => jest.fn())
 jest.mock('react-native-share', () => jest.fn())
-jest.mock('react-native-permissions', () => jest.fn())
 jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper')
 jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter')
 
diff --git a/package.json b/package.json
index 560f453..00ebec0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "massive",
-  "version": "1.135",
+  "version": "1.136",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {
@@ -39,7 +39,6 @@
     "react-native-linear-gradient": "^2.6.2",
     "react-native-pager-view": "^6.0.1",
     "react-native-paper": "^4.12.5",
-    "react-native-permissions": "^3.8.0",
     "react-native-reanimated": "^2.12.0",
     "react-native-safe-area-context": "^4.4.1",
     "react-native-screens": "^3.18.2",
diff --git a/yarn.lock b/yarn.lock
index 4984f9b..b2065b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7313,7 +7313,6 @@ __metadata:
     react-native-linear-gradient: ^2.6.2
     react-native-pager-view: ^6.0.1
     react-native-paper: ^4.12.5
-    react-native-permissions: ^3.8.0
     react-native-reanimated: ^2.12.0
     react-native-safe-area-context: ^4.4.1
     react-native-screens: ^3.18.2
@@ -8593,15 +8592,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "pkg-dir@npm:5.0.0"
-  dependencies:
-    find-up: ^5.0.0
-  checksum: b167bb8dac7bbf22b1d5e30ec223e6b064b84b63010c9d49384619a36734caf95ed23ad23d4f9bd975e8e8082b60a83395f43a89bb192df53a7c25a38ecb57d9
-  languageName: node
-  linkType: hard
-
 "posix-character-classes@npm:^0.1.0":
   version: 0.1.1
   resolution: "posix-character-classes@npm:0.1.1"
@@ -8908,23 +8898,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-permissions@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "react-native-permissions@npm:3.8.0"
-  dependencies:
-    picocolors: ^1.0.0
-    pkg-dir: ^5.0.0
-  peerDependencies:
-    react: ">=16.13.1"
-    react-native: ">=0.63.3"
-    react-native-windows: ">=0.62.0"
-  peerDependenciesMeta:
-    react-native-windows:
-      optional: true
-  checksum: acbd8605adabfc48e19fbc468a3a143fb85bd34d3ed0fe6a4b52f16304591b8a4b3c561a507c11643fcc8ce1b4dc09e31f149387d1ea461098a2e40c43989f7c
-  languageName: node
-  linkType: hard
-
 "react-native-reanimated@npm:^2.12.0":
   version: 2.12.0
   resolution: "react-native-reanimated@npm:2.12.0"