Merge pull request #23 from UN-ICC/master

Dismiss incoming call timers when accepting or rejecting a call

Author: bkdev98

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

@@ -6,9 +6,6 @@
 import android.view.WindowManager;
 import android.content.Context;
 import android.util.Log;
-import java.util.Timer;
-import java.util.TimerTask;
-
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -47,6 +44,7 @@ public void display(String uuid, String name, String avatar, String info, int ti
             bundle.putString("name", name);
             bundle.putString("avatar", avatar);
             bundle.putString("info", info);
+            bundle.putInt("timeout", timeout);
             Intent i = new Intent(reactContext, UnlockScreenActivity.class);
             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
             i.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED +
@@ -55,30 +53,10 @@ public void display(String uuid, String name, String avatar, String info, int ti
 
             i.putExtras(bundle);
             reactContext.startActivity(i);
-
-            if (timeout > 0) {
-                new Timer().schedule(new TimerTask() {          
-                    @Override
-                    public void run() {
-                        // this code will be executed after timeout seconds
-                        UnlockScreenActivity.dismissIncoming();
-                    }
-                }, timeout);
-            }
+            
         }
     }
 
-    @ReactMethod
-    public void dismiss() {
-        // final Activity activity = reactContext.getCurrentActivity();
-
-        // assert activity != null;
-
-        UnlockScreenActivity.dismissIncoming();
-
-        return;
-    }
-
     private Context getAppContext() {
         return this.reactContext.getApplicationContext();
     }

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

@@ -15,6 +15,9 @@
 import android.media.MediaPlayer;
 import android.provider.Settings;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
 import android.app.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -36,16 +39,29 @@ public class UnlockScreenActivity extends AppCompatActivity implements UnlockScr
     private TextView tvName;
     private TextView tvInfo;
     private ImageView ivAvatar;
+    private Integer timeout = 0;
     private String uuid = "";
     static boolean active = false;
     private static Vibrator v = (Vibrator) IncomingCallModule.reactContext.getSystemService(Context.VIBRATOR_SERVICE);
     private long[] pattern = {0, 1000, 800};
-    private static MediaPlayer player = MediaPlayer.create(IncomingCallModule.reactContext.getApplicationContext(), Settings.System.DEFAULT_RINGTONE_URI);
+    private static MediaPlayer player = MediaPlayer.create(IncomingCallModule.reactContext, Settings.System.DEFAULT_RINGTONE_URI);
     private static Activity fa;
+    private Timer timer;
+
 
     @Override
     public void onStart() {
         super.onStart();
+        if (this.timeout > 0) {
+              this.timer = new Timer();
+              this.timer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    // this code will be executed after timeout seconds
+                    dismissIncoming();
+                }
+            }, timeout);
+        }
         active = true;
     }
 
@@ -86,6 +102,10 @@ protected void onCreate(Bundle savedInstanceState) {
                     Picasso.get().load(avatar).transform(new CircleTransform()).into(ivAvatar);
                 }
             }
+            if (bundle.containsKey("timeout")) {
+                this.timeout = bundle.getInt("timeout");
+            }
+            else this.timeout = 0;
         }
 
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
@@ -130,17 +150,20 @@ public void onBackPressed() {
         // Dont back
     }
 
-    public static void dismissIncoming() {
+    public void dismissIncoming() {
         v.cancel();
         player.stop();
         player.prepareAsync();
-        fa.finish();
+        dismissDialing();
     }
 
     private void acceptDialing() {
         WritableMap params = Arguments.createMap();
         params.putBoolean("accept", true);
         params.putString("uuid", uuid);
+        if (timer != null){
+          timer.cancel();
+        }
         if (!IncomingCallModule.reactContext.hasCurrentActivity()) {
             params.putBoolean("isHeadless", true);
         }
@@ -165,6 +188,9 @@ private void dismissDialing() {
         WritableMap params = Arguments.createMap();
         params.putBoolean("accept", false);
         params.putString("uuid", uuid);
+        if (timer != null) {
+          timer.cancel();
+        }
         if (!IncomingCallModule.reactContext.hasCurrentActivity()) {
             params.putBoolean("isHeadless", true);
         }