ble premmisions android

Author: SagivOnoApps

ios/Podfile

@@ -33,7 +33,8 @@ def project_pods
   pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-
+  
+  pod 'Permission-BluetoothPeripheral', :path => "../node_modules/react-native-permissions/ios/BluetoothPeripheral.podspec"
   pod 'Permission-LocationAlways', :path => "../node_modules/react-native-permissions/ios/LocationAlways.podspec"
   pod 'Permission-Motion', :path => "../node_modules/react-native-permissions/ios/Motion.podspec"
 

ios/Podfile.lock

@@ -112,6 +112,8 @@ PODS:
     - nanopb/encode (= 0.3.9011)
   - nanopb/decode (0.3.9011)
   - nanopb/encode (0.3.9011)
+  - Permission-BluetoothPeripheral (2.1.5):
+    - RNPermissions
   - Permission-LocationAlways (2.1.5):
     - RNPermissions
   - Permission-Motion (2.1.5):
@@ -391,6 +393,7 @@ DEPENDENCIES:
   - GoogleMaps
   - lottie-ios (from `../node_modules/lottie-ios`)
   - lottie-react-native (from `../node_modules/lottie-react-native`)
+  - Permission-BluetoothPeripheral (from `../node_modules/react-native-permissions/ios/BluetoothPeripheral.podspec`)
   - Permission-LocationAlways (from `../node_modules/react-native-permissions/ios/LocationAlways.podspec`)
   - Permission-Motion (from `../node_modules/react-native-permissions/ios/Motion.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -477,6 +480,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/lottie-ios"
   lottie-react-native:
     :path: "../node_modules/lottie-react-native"
+  Permission-BluetoothPeripheral:
+    :path: "../node_modules/react-native-permissions/ios/BluetoothPeripheral.podspec"
   Permission-LocationAlways:
     :path: "../node_modules/react-native-permissions/ios/LocationAlways.podspec"
   Permission-Motion:
@@ -597,6 +602,7 @@ SPEC CHECKSUMS:
   lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a
   lottie-react-native: 2a1a82bb326ae51331a5520de0cf706733c6db69
   nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
+  Permission-BluetoothPeripheral: 4663a8373072abfe3099c44cb06bf10b0c16c110
   Permission-LocationAlways: 155e6251b757b380f6354737cae8e8d59c472495
   Permission-Motion: 099bc32191080089d1cb839cbae96d621a589c8f
   Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
@@ -647,6 +653,6 @@ SPEC CHECKSUMS:
   RNWifi: 1747f039612dd494192ba6c8bc498606ad9f3ec4
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
-PODFILE CHECKSUM: c85d4a94c29bc88bc3f697f6b2b5831cdd10d31a
+PODFILE CHECKSUM: 837d1b8bd2e1fdf1485b9358860cb5287bda5d36
 
 COCOAPODS: 1.9.1

ios/codeAgainstCorona.xcodeproj/xcshareddata/xcschemes/hamagen-qa.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

src/actions/GeneralActions.ts

@@ -73,10 +73,7 @@ export const checkIfHideLocationHistory = () => async (dispatch: any) => {
 };
 
 export const checkIfBleEnabled = () => async (dispatch: any) => {
-  // await AsyncStorage.removeItem(USER_AGREE_TO_BLE)
-
-  
-  if (IS_IOS || !ENABLE_BLE_IN_APP) {
+  if (!ENABLE_BLE_IN_APP) {
     dispatch({ type: ENABLE_BLE, payload: false });
   } else {
     try {

src/components/Loading.tsx

@@ -216,8 +216,6 @@ const migrateIntersectionSickDatabase = async (dbSick: any) => {
 
       if (dismissedExposures) {
         const parsedDismissedExposures: number[] = JSON.parse(dismissedExposures);
-        console.log('parsedDismissedExposures', parsedDismissedExposures);
-
         await dbSick.upgradeSickRecord(false, parsedDismissedExposures);
       }
     }

src/components/Main/BluetoothModal.tsx

@@ -6,6 +6,7 @@ import BluetoothPermission from '../common/BluetoothPermission';
 import { HeaderButton } from '../common';
 import { PADDING_TOP, IS_SMALL_SCREEN, PADDING_BOTTOM, USER_AGREE_TO_BLE } from '../../constants/Constants';
 import { ENABLE_BLE } from '../../constants/ActionTypes';
+import { initBLETracing } from '../../services/BLEService';
 
 const BluetoothModal = ({ navigation }) => {
   const dispatch = useDispatch();
@@ -16,9 +17,15 @@ const BluetoothModal = ({ navigation }) => {
   };
 
   return (
-    <View style={styles.container}> 
+    <View style={styles.container}>
       <HeaderButton type="close" onPress={handleExit} />
-      <BluetoothPermission onEnd={navigation.goBack} />
+      <BluetoothPermission
+        onEnd={() => {
+          navigation.goBack();
+          // user agreed so start service
+          initBLETracing();
+        }}
+      />
     </View>
   );
 };

src/components/common/BluetoothPermission.tsx

@@ -30,16 +30,19 @@ const BluetoothPermission: FunctionComponent<Props> = ({ onEnd }) => {
   };
 
   const handlePressIOS = async () => {
-    
     const BTCheckStatus: PermissionStatus = await check(PERMISSIONS.IOS.BLUETOOTH_PERIPHERAL);
-    console.log('BTCheckStatus',BTCheckStatus);
-    
-    if(BTCheckStatus !== RESULTS.UNAVAILABLE && BTCheckStatus !== RESULTS.GRANTED) {
-      const BTRequestStatus = await request(PERMISSIONS.IOS.BLUETOOTH_PERIPHERAL)
+
+
+    if (BTCheckStatus !== RESULTS.UNAVAILABLE && BTCheckStatus !== RESULTS.GRANTED) {
+      const BTRequestStatus = await request(PERMISSIONS.IOS.BLUETOOTH_PERIPHERAL);
+      if (BTRequestStatus === RESULTS.GRANTED) {
+        dispatch({ type: ENABLE_BLE, payload: true });
+        await AsyncStorage.setItem(USER_AGREE_TO_BLE, 'true');
+      }
     }
 
-    onEnd()
-   };
+    onEnd();
+  };
 
   const handlePressAndroid = async () => {
     onEnd();

src/constants/Constants.ts

@@ -70,4 +70,4 @@ export const USAGE_PRIVACY = 'USAGE_PRIVACY';
 
 // BLE
 export const USER_AGREE_TO_BLE = 'USER_AGREE_TO_BLE';
-export const ENABLE_BLE = true
+export const ENABLE_BLE = true;

src/services/BLEService.ts

@@ -2,14 +2,15 @@ import { NativeEventEmitter, Clipboard, Alert } from 'react-native';
 import AsyncStorage from '@react-native-community/async-storage';
 // @ts-ignore
 import SpecialBle from 'rn-contact-tracing';
-import { IS_IOS, ENABLE_BLE } from '../constants/Constants';
+import { IS_IOS, ENABLE_BLE, USER_AGREE_TO_BLE } from '../constants/Constants';
 import { onError } from './ErrorService';
 import { downloadAndVerifySigning } from './SigningService';
 import config from '../config/config';
 import defaultBleResponse from '../constants/defaultBleResponse.json';
 
 export const initBLETracing = () => new Promise(async (resolve) => {
-  if (ENABLE_BLE) {
+  const userAgreed = await AsyncStorage.getItem(USER_AGREE_TO_BLE);
+  if (ENABLE_BLE && userAgreed === 'true') {
     try {
       const UUID = '00000000-0000-1000-8000-00805F9B34FB';