[ICA-208] Sharing device remains in sharing state when Requesting phone gets disconnected (like network issue)

machines/request.ts

@@ -57,6 +57,9 @@ export const requestMachine = model.createMachine(
     },
     id: 'request',
     initial: 'inactive',
+    invoke: {
+      src: 'checkConnection',
+    },
     on: {
       SCREEN_BLUR: 'inactive',
       SCREEN_FOCUS: 'checkingBluetoothService',
@@ -225,6 +228,7 @@ export const requestMachine = model.createMachine(
         exit: ['disconnect'],
       },
       disconnected: {
+        entry: ['disconnect'],
         on: {
           DISMISS: 'waitingForConnection',
         },
@@ -370,6 +374,16 @@ export const requestMachine = model.createMachine(
           .catch(() => callback(model.events.BLUETOOTH_DISABLED()));
       },
 
+      checkConnection: () => (callback) => {
+        const subscription = SmartShare.handleNearbyEvents((event) => {
+          if (event.type === 'onDisconnected') {
+            callback({ type: 'DISCONNECT' });
+          }
+        });
+
+        return () => subscription.remove();
+      },
+
       advertiseDevice: () => (callback) => {
         SmartShare.createConnection('advertiser', () => {
           callback({ type: 'CONNECTED' });
@@ -378,10 +392,6 @@ export const requestMachine = model.createMachine(
 
       exchangeDeviceInfo: (context) => (callback) => {
         const subscription = SmartShare.handleNearbyEvents((event) => {
-          if (event.type === 'onDisconnected') {
-            callback({ type: 'DISCONNECT' });
-          }
-
           if (event.type !== 'msg') return;
 
           const message = Message.fromString<DeviceInfo>(event.data);

machines/request.typegen.ts

@@ -10,13 +10,13 @@ export interface Typegen0 {
       | 'SCREEN_BLUR'
       | 'xstate.after(CLEAR_DELAY)#clearingConnection'
       | 'DISMISS';
-    disconnect: '';
+    disconnect: '' | 'DISCONNECT';
     registerLoggers: 'xstate.after(CLEAR_DELAY)#clearingConnection' | 'DISMISS';
     generateConnectionParams:
       | 'xstate.after(CLEAR_DELAY)#clearingConnection'
       | 'DISMISS';
     requestReceiverInfo: 'CONNECTED';
-    requestReceivedVcs: 'xstate.init';
+    requestReceivedVcs: 'ACCEPT';
     requestExistingVc: 'VC_RESPONSE';
     mergeIncomingVc: 'STORE_RESPONSE';
     prependReceivedVc: 'VC_RESPONSE';
@@ -32,6 +32,7 @@ export interface Typegen0 {
     'xstate.init': { type: 'xstate.init' };
   };
   'invokeSrcNameMap': {
+    checkConnection: 'done.invoke.request:invocation[0]';
     checkBluetoothService: 'done.invoke.request.checkingBluetoothService.checking:invocation[0]';
     requestBluetooth: 'done.invoke.request.checkingBluetoothService.requesting:invocation[0]';
     advertiseDevice: 'done.invoke.waitingForConnection:invocation[0]';
@@ -48,7 +49,8 @@ export interface Typegen0 {
     delays: never;
   };
   'eventsCausingServices': {
-    checkBluetoothService: 'xstate.init';
+    checkConnection: 'xstate.init';
+    checkBluetoothService: 'SCREEN_FOCUS';
     requestBluetooth: 'BLUETOOTH_DISABLED';
     advertiseDevice: 'xstate.after(CLEAR_DELAY)#clearingConnection' | 'DISMISS';
     exchangeDeviceInfo: 'RECEIVE_DEVICE_INFO';

machines/scan.ts

@@ -14,6 +14,7 @@ import { VC_ITEM_STORE_KEY } from '../shared/constants';
 
 const checkingAirplaneMode = '#checkingAirplaneMode';
 const checkingLocationService = '#checkingLocationService';
+const findingConnection = '#scan.findingConnection';
 
 const model = createModel(
   {
@@ -70,6 +71,9 @@ export const scanMachine = model.createMachine(
     },
     id: 'scan',
     initial: 'inactive',
+    invoke: {
+      src: 'checkConnection',
+    },
     on: {
       SCREEN_BLUR: 'inactive',
       SCREEN_FOCUS: 'checkingAirplaneMode',
@@ -218,10 +222,12 @@ export const scanMachine = model.createMachine(
           idle: {
             on: {
               ACCEPT_REQUEST: 'selectingVc',
+              DISCONNECT: findingConnection,
             },
           },
           selectingVc: {
             on: {
+              DISCONNECT: findingConnection,
               SELECT_VC: {
                 target: 'sendingVc',
                 actions: ['setSelectedVc'],
@@ -234,7 +240,7 @@ export const scanMachine = model.createMachine(
               src: 'sendVc',
             },
             on: {
-              DISCONNECT: '#scan.disconnected',
+              DISCONNECT: findingConnection,
               VC_ACCEPTED: 'accepted',
               VC_REJECTED: 'rejected',
             },
@@ -362,6 +368,16 @@ export const scanMachine = model.createMachine(
     },
 
     services: {
+      checkConnection: () => (callback) => {
+        const subscription = SmartShare.handleNearbyEvents((event) => {
+          if (event.type === 'onDisconnected') {
+            callback({ type: 'DISCONNECT' });
+          }
+        });
+
+        return () => subscription.remove();
+      },
+
       checkLocationPermission: () => async (callback) => {
         try {
           // wait a bit for animation to finish when app becomes active
@@ -424,10 +440,6 @@ export const scanMachine = model.createMachine(
         const message = new Message('exchange:sender-info', context.senderInfo);
         SmartShare.send(message.toString(), () => {
           subscription = SmartShare.handleNearbyEvents((event) => {
-            if (event.type === 'onDisconnected') {
-              callback({ type: 'DISCONNECT' });
-            }
-
             if (event.type !== 'msg') return;
             const response = Message.fromString<DeviceInfo>(event.data);
             if (response.type === 'exchange:receiver-info') {

machines/scan.typegen.ts

@@ -13,14 +13,16 @@ export interface Typegen0 {
       | 'SCREEN_BLUR'
       | 'xstate.after(CLEAR_DELAY)#clearingConnection'
       | 'CANCEL'
-      | 'DISMISS';
+      | 'DISMISS'
+      | 'DISCONNECT';
     requestToDisableFlightMode: 'FLIGHT_REQUEST';
     requestToEnableLocation: 'LOCATION_DISABLED' | 'LOCATION_REQUEST';
     disconnect: 'LOCATION_ENABLED';
     registerLoggers:
       | 'xstate.after(CLEAR_DELAY)#clearingConnection'
       | 'CANCEL'
-      | 'DISMISS';
+      | 'DISMISS'
+      | 'DISCONNECT';
     requestSenderInfo: 'SCAN';
     clearReason: 'xstate.init';
     logShared: 'VC_ACCEPTED';
@@ -32,6 +34,7 @@ export interface Typegen0 {
     'xstate.init': { type: 'xstate.init' };
   };
   'invokeSrcNameMap': {
+    checkConnection: 'done.invoke.scan:invocation[0]';
     checkAirplaneMode: 'done.invoke.scan.checkingAirplaneMode.checkingStatus:invocation[0]';
     checkLocationStatus: 'done.invoke.checkingLocationService:invocation[0]';
     checkLocationPermission: 'done.invoke.scan.checkingLocationService.checkingPermission:invocation[0]';
@@ -46,7 +49,8 @@ export interface Typegen0 {
     delays: never;
   };
   'eventsCausingServices': {
-    checkAirplaneMode: 'APP_ACTIVE';
+    checkConnection: 'xstate.init';
+    checkAirplaneMode: 'SCREEN_FOCUS' | 'APP_ACTIVE' | 'FLIGHT_ENABLED';
     checkLocationStatus: 'FLIGHT_DISABLED';
     checkLocationPermission: 'LOCATION_ENABLED' | 'APP_ACTIVE';
     discoverDevice: 'RECEIVE_DEVICE_INFO';

screens/Profile/ProfileScreen.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { View } from 'react-native';
 import { getVersion } from 'react-native-device-info';
 import { ListItem, Switch } from 'react-native-elements';
 import { Column, Text } from '../../components/ui';
@@ -90,7 +91,7 @@ export const ProfileScreen: React.FC<MainRouteProps> = (props) => {
         Version: {getVersion()}
       </Text>
       {controller.backendInfo.application.name !== '' ? (
-        <div>
+        <View>
           <Text
             weight="semibold"
             align="center"
@@ -106,7 +107,7 @@ export const ProfileScreen: React.FC<MainRouteProps> = (props) => {
             color={Colors.Grey}>
             MOSIP: {controller.backendInfo.config['mosip.host']}
           </Text>
-        </div>
+        </View>
       ) : null}
     </Column>
   );