TST

Abstraktikus · Jan 15, 2020 · c2cea68 · c2cea68
1 parent 335ad5f
commit c2cea68
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 77 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -4,7 +4,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
       android:name=".MainApplication"

diff --git a/package-lock.json b/package-lock.json
diff --git a/screen/send/create.js b/screen/send/create.js
@@ -13,7 +13,7 @@ import {
   Text,
   View,
   Platform,
-  Alert,
+  PermissionsAndroid,
 } from 'react-native';
 import { BlueNavigationStyle, SafeBlueArea, BlueCard, BlueText } from '../../BlueComponents';
 import PropTypes from 'prop-types';
@@ -73,38 +73,22 @@ export default class SendCreate extends Component {
           RNFS.unlink(filePath);
         });
     } else if (Platform.OS === 'android') {
-      Alert.alert(
-        'Export',
-        'Where would you like to export this transaction?',
-        [
-          {
-            text: 'External Storage',
-            onPress: async () => {
-              try {
-                await RNFS.writeFile('file://' + RNFS.ExternalStorageDirectoryPath + `/${fileName}`, this.state.tx, 'ascii');
-                alert('Successfully exported.');
-              } catch (e) {
-                console.log(e);
-                alert(e);
-              }
-            },
-          },
-          {
-            text: 'Documents Folder',
-            onPress: async () => {
-              try {
-                await RNFS.writeFile('file://' + RNFS.DocumentDirectoryPath + `/${fileName}`, this.state.tx, 'ascii');
-                alert('Successfully exported.');
-              } catch (e) {
-                console.log(e);
-                alert(e);
-              }
-            },
-          },
-          { text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel' },
-        ],
-        { cancelable: true },
-      );
+      const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
+        title: 'BlueWallet Storage Access Permission',
+        message: 'BlueWallet needs your permission to access your storage to save this transaction.',
+        buttonNeutral: 'Ask Me Later',
+        buttonNegative: 'Cancel',
+        buttonPositive: 'OK',
+      });
+
+      if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+        console.log('Storage Permission: Granted');
+        const filePath = RNFS.ExternalCachesDirectoryPath + `/${this.fileName}`;
+        await RNFS.writeFile(filePath, this.state.tx);
+        alert(`This transaction has been saved in ${filePath}`);
+      } else {
+        console.log('Storage Permission: Denied');
+      }
     }
   };
 

diff --git a/screen/send/psbtWithHardwareWallet.js b/screen/send/psbtWithHardwareWallet.js
@@ -7,11 +7,11 @@ import {
   View,
   Dimensions,
   Image,
-  Alert,
   TextInput,
   Clipboard,
   Linking,
   Platform,
+  PermissionsAndroid,
 } from 'react-native';
 import QRCode from 'react-native-qrcode-svg';
 import { Icon, Text } from 'react-native-elements';
@@ -73,6 +73,7 @@ export default class PsbtWithHardwareWallet extends Component {
       deepLinkPSBT: undefined,
       txhex: props.navigation.getParam('txhex') || undefined,
     };
+    this.fileName = `${Date.now()}.psbt`;
   }
 
   static getDerivedStateFromProps(nextProps, prevState) {
@@ -229,9 +230,8 @@ export default class PsbtWithHardwareWallet extends Component {
   }
 
   exportPSBT = async () => {
-    const fileName = `${Date.now()}.psbt`;
     if (Platform.OS === 'ios') {
-      const filePath = RNFS.TemporaryDirectoryPath + `/${fileName}`;
+      const filePath = RNFS.TemporaryDirectoryPath + `/${this.fileName}`;
       await RNFS.writeFile(filePath, this.state.isFirstPSBTAlreadyBase64 ? this.state.psbt : this.state.psbt.toBase64());
       Share.open({
         url: 'file://' + filePath,
@@ -241,46 +241,22 @@ export default class PsbtWithHardwareWallet extends Component {
           RNFS.unlink(filePath);
         });
     } else if (Platform.OS === 'android') {
-      Alert.alert(
-        'Export',
-        'Where would you like to export this transaction?',
-        [
-          {
-            text: 'External Storage',
-            onPress: async () => {
-              try {
-                await RNFS.writeFile(
-                  'file://' + RNFS.ExternalStorageDirectoryPath + `/${fileName}`,
-                  this.state.isFirstPSBTAlreadyBase64 ? this.state.psbt : this.state.psbt.toBase64(),
-                  'ascii',
-                );
-                alert('Successfully exported.');
-              } catch (e) {
-                console.log(e);
-                alert(e);
-              }
-            },
-          },
-          {
-            text: 'Documents Folder',
-            onPress: async () => {
-              try {
-                await RNFS.writeFile(
-                  'file://' + RNFS.DocumentDirectoryPath + `/${fileName}`,
-                  this.state.isFirstPSBTAlreadyBase64 ? this.state.psbt : this.state.psbt.toBase64(),
-                  'ascii',
-                );
-                alert('Successfully exported.');
-              } catch (e) {
-                console.log(e);
-                alert(e);
-              }
-            },
-          },
-          { text: 'Cancel', onPress: () => console.log('Cancel Pressed'), style: 'cancel' },
-        ],
-        { cancelable: true },
-      );
+      const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
+        title: 'BlueWallet Storage Access Permission',
+        message: 'BlueWallet needs your permission to access your storage to save this transaction.',
+        buttonNeutral: 'Ask Me Later',
+        buttonNegative: 'Cancel',
+        buttonPositive: 'OK',
+      });
+
+      if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+        console.log('Storage Permission: Granted');
+        const filePath = RNFS.ExternalCachesDirectoryPath + `/${this.fileName}`;
+        await RNFS.writeFile(filePath, this.state.isFirstPSBTAlreadyBase64 ? this.state.psbt : this.state.psbt.toBase64());
+        alert(`This transaction has been saved in ${filePath}`);
+      } else {
+        console.log('Storage Permission: Denied');
+      }
     }
   };