Merge pull request #5750 from BlueWallet/androidpermissions

FIX: Permission issues on newer Android APIs

android/app/src/main/AndroidManifest.xml

@@ -8,6 +8,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"

blue_modules/notifications.js

@@ -4,6 +4,7 @@ import Frisbee from 'frisbee';
 import { getApplicationName, getVersion, getSystemName, getSystemVersion, hasGmsSync, hasHmsSync } from 'react-native-device-info';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import loc from '../loc';
+import { requestNotifications } from 'react-native-permissions';
 
 const PushNotification = require('react-native-push-notification');
 const constants = require('./constants');
@@ -38,6 +39,8 @@ function Notifications(props) {
    */
   const configureNotifications = async function () {
     return new Promise(function (resolve) {
+      requestNotifications(['alert', 'sound', 'badge']).then(({ status, _ }) => {
+        if (status === 'granted') {
           PushNotification.configure({
             // (optional) Called when Token is generated (iOS and Android)
             onRegister: async function (token) {
@@ -106,7 +109,10 @@ function Notifications(props) {
              */
             requestPermissions: true,
           });
+        }
       });
+    });
+    // …
   };
 
   Notifications.cleanUserOptOutFlag = async function () {
@@ -227,8 +233,7 @@ function Notifications(props) {
     if (!pushToken || !pushToken.token || !pushToken.os) return;
 
     const api = new Frisbee({ baseURI });
-
-    return await api.post(
+    const postCall = await api.post(
       '/unsubscribe',
       Object.assign({}, _getHeaders(), {
         body: {
@@ -240,6 +245,8 @@ function Notifications(props) {
         },
       }),
     );
+    Notifications.abandonPermissions();
+    return postCall;
   };
 
   Notifications.isNotificationsEnabled = async function () {

ios/BlueWallet.xcodeproj/xcuserdata/marcosrodriguez.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -47,7 +47,7 @@
 		<key>WidgetsExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>144</integer>
+			<integer>99</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

ios/Podfile

@@ -16,7 +16,7 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 workspace 'BlueWallet'
 platform :ios, '13.0'
 prepare_react_native_project!
-setup_permissions(['Camera'])
+setup_permissions(['Camera', 'Notifications'])
 # If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
 # because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
 #

ios/Podfile.lock

@@ -780,7 +780,7 @@ SPEC CHECKSUMS:
   RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa
   RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
   RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
-  RNPermissions: eae8b97d8ab0587f082966ee608f47c97b2a349b
+  RNPermissions: e9e703e08dfe50cf4d2ca45852eb45c4ac98f7b7
   RNPrivacySnapshot: 71919dde3c6a29dd332115409c2aec564afee8f4
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNRate: ef3bcff84f39bb1d1e41c5593d3eea4aab2bd73a
@@ -793,6 +793,6 @@ SPEC CHECKSUMS:
   RNWatch: fd30ca40a5b5ef58dcbc195638e68219bc455236
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
 
-PODFILE CHECKSUM: 23bb5c319ccbedd7e109c44fe4273afce6efb48a
+PODFILE CHECKSUM: 27db07925dc3a89e9ecced7e377a50dba9deb58a
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.13.0

screen/send/create.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { TextInput, FlatList, Linking, TouchableOpacity, StyleSheet, Text, View, Platform, PermissionsAndroid, Alert } from 'react-native';
+import { TextInput, FlatList, Linking, TouchableOpacity, StyleSheet, Text, View, Platform, Alert } from 'react-native';
 import Clipboard from '@react-native-clipboard/clipboard';
 import { Icon } from 'react-native-elements';
 import Share from 'react-native-share';
@@ -15,6 +15,7 @@ import { DynamicQRCode } from '../../components/DynamicQRCode';
 import { isDesktop } from '../../blue_modules/environment';
 import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
 import alert from '../../components/Alert';
+import { PERMISSIONS, RESULTS, request } from 'react-native-permissions';
 const bitcoin = require('bitcoinjs-lib');
 const currency = require('../../blue_modules/currency');
 
@@ -68,15 +69,8 @@ const SendCreate = () => {
           RNFS.unlink(filePath);
         });
     } else if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
-        title: loc.send.permission_storage_title,
-        message: loc.send.permission_storage_message,
-        buttonNeutral: loc.send.permission_storage_later,
-        buttonNegative: loc._.cancel,
-        buttonPositive: loc._.ok,
-      });
-
-      if (granted === PermissionsAndroid.RESULTS.GRANTED || Platform.Version >= 33) {
+      const granted = await request(PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE);
+      if (granted === RESULTS.GRANTED) {
         console.log('Storage Permission: Granted');
         const filePath = RNFS.DownloadDirectoryPath + `/${fileName}`;
         try {

screen/wallets/details.js

@@ -14,7 +14,6 @@ import {
   StyleSheet,
   StatusBar,
   ScrollView,
-  PermissionsAndroid,
   InteractionManager,
   ActivityIndicator,
   I18nManager,
@@ -45,6 +44,7 @@ import { AbstractHDElectrumWallet } from '../../class/wallets/abstract-hd-electr
 import alert from '../../components/Alert';
 import { BitcoinUnit, Chain } from '../../models/bitcoinUnits';
 import { writeFileAndExport } from '../../blue_modules/fs';
+import { PERMISSIONS, RESULTS, request } from 'react-native-permissions';
 
 const prompt = require('../../helpers/prompt');
 
@@ -364,15 +364,8 @@ const WalletDetails = () => {
           RNFS.unlink(filePath);
         });
     } else if (Platform.OS === 'android') {
-      const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
-        title: loc.send.permission_storage_title,
-        message: loc.send.permission_storage_message,
-        buttonNeutral: loc.send.permission_storage_later,
-        buttonNegative: loc._.cancel,
-        buttonPositive: loc._.ok,
-      });
-
-      if (granted === PermissionsAndroid.RESULTS.GRANTED || Platform.Version >= 33) {
+      const granted = await request(PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE);
+      if (granted === RESULTS.GRANTED) {
         console.log('Storage Permission: Granted');
         const filePath = RNFS.DownloadDirectoryPath + `/${fileName}`;
         try {

tests/setup.js

@@ -50,6 +50,8 @@ jest.mock('@react-native-community/push-notification-ios', () => {
   return {};
 });
 
+jest.mock('react-native-permissions', () => require('react-native-permissions/mock'));
+
 jest.mock('react-native-device-info', () => {
   return {
     getUniqueId: jest.fn().mockReturnValue('uniqueId'),