fix background

Author: Quoc Khanh

android/src/main/java/com/incomingcall/IncomingCallModule.java

@@ -12,13 +12,15 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.WritableMap;
 
 public class IncomingCallModule extends ReactContextBaseJavaModule {
 
     public static ReactApplicationContext reactContext;
     public static Activity mainActivity;
 
     private static final String TAG = "RNIC:IncomingCallModule";
+    private WritableMap headlessExtras;
 
     public IncomingCallModule(ReactApplicationContext context) {
         super(context);
@@ -57,11 +59,6 @@ public void display(String uuid, String name, String avatar, String info) {
     public void dismiss() {
         final Activity activity = reactContext.getCurrentActivity();
 
-        // if (MainActivity.active) {
-        //     Intent i = new Intent(reactContext, MainActivity.class);
-        //     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        //     reactContext.getApplicationContext().startActivity(i);
-        // }
         assert activity != null;
     }
 
@@ -85,22 +82,40 @@ public void backToForeground() {
     }
 
     @ReactMethod
-    public void getLaunchParameters(final Promise promise) {
-        final Activity activity = getCurrentActivity();
-        final Intent intent = activity.getIntent();
-        Bundle b = intent.getExtras();
-        String value = "";
-        if (b != null) {
-            value = b.getString("uuid", "");            
+    public void openAppFromHeadlessMode(String uuid) {
+        Context context = getAppContext();
+        String packageName = context.getApplicationContext().getPackageName();
+        Intent focusIntent = context.getPackageManager().getLaunchIntentForPackage(packageName).cloneFilter();
+        Activity activity = getCurrentActivity();
+        boolean isOpened = activity != null;
+
+        if (!isOpened) {
+            focusIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
+                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+                    WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
+                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+
+            final WritableMap response = new WritableNativeMap();
+            response.putBoolean("isHeadless", true);
+            response.putString("uuid", uuid);
+
+            this.headlessExtras = response;
+
+            getReactApplicationContext().startActivity(focusIntent);
         }
-        promise.resolve(value);
     }
 
     @ReactMethod
-    public void clearLaunchParameters() {
-        final Activity activity = getCurrentActivity();
-        final Intent intent = activity.getIntent();
-        Bundle b = new Bundle();
-        intent.putExtras(b);
+    public void getExtrasFromHeadlessMode(Promise promise) {
+        if (this.headlessExtras != null) {
+            promise.resolve(this.headlessExtras);
+
+            this.headlessExtras = null;
+
+            return;
+        }
+
+        promise.resolve(null);
     }
 }

android/src/main/java/com/incomingcall/UnlockScreenActivity.java

@@ -124,45 +124,27 @@ public void onBackPressed() {
 
     private void acceptDialing() {
         WritableMap params = Arguments.createMap();
-        params.putBoolean("done", true);
+        params.putBoolean("accept", true);
         params.putString("uuid", uuid);
+        if (!IncomingCallModule.reactContext.hasCurrentActivity()) {
+            params.putBoolean("isHeadless", true);
+        }
 
         sendEvent("answerCall", params);
 
-        // if (!foregrounded()) {
-        //     // App in background or killed, start app and add launch params
-        //     String packageNames = IncomingCallModule.reactContext.getPackageName();
-        //     Intent launchIntent = IncomingCallModule.reactContext.getPackageManager().getLaunchIntentForPackage(packageNames);
-        //     String className = launchIntent.getComponent().getClassName();
-        //     try {
-        //         Class<?> activityClass = Class.forName(className);
-        //         Intent i = new Intent(IncomingCallModule.reactContext, activityClass);
-        //         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        //         Bundle b = new Bundle();
-        //         b.putString("uuid", uuid);
-        //         i.putExtras(b);
-        //         IncomingCallModule.reactContext.startActivity(i);
-        //     } catch (Exception e) {
-        //         Log.e("RNIncomingCall", "Class not found", e);
-        //         return;
-        //     }
-        // }
-
         finish();
     }
 
     private void dismissDialing() {
         WritableMap params = Arguments.createMap();
-        params.putBoolean("done", false);
+        params.putBoolean("accept", false);
         params.putString("uuid", uuid);
-
-        if (IncomingCallModule.reactContext.hasCurrentActivity()) {
-            // App in foreground or background, send event for app to listen
-            sendEvent("endCall", params);
-        } else {
-            // App killed, need to do something after
+        if (!IncomingCallModule.reactContext.hasCurrentActivity()) {
+            params.putBoolean("isHeadless", true);
         }
 
+        sendEvent("endCall", params);
+
         finish();
     }
 

example/yarn.lock

@@ -5443,7 +5443,7 @@ react-native-bootsplash@^2.2.4:
 
 "react-native-incoming-call@git+https://github.com/bkdev98/react-native-incoming-call.git#v2":
   version "2.0.0"
-  resolved "git+https://github.com/bkdev98/react-native-incoming-call.git#e09438f3d2af7d2f346aa77fa65c572f6f699a3d"
+  resolved "git+https://github.com/bkdev98/react-native-incoming-call.git#18bf304653dd5ded1b080c984bd01deddc1e2554"
 
 [email protected]:
   version "0.62.2"