Merge pull request bkdev98#1 from UN-ICC/bugfix/dismiss-incoming-calls

Raise RN endcall event when calls are dismissed

Author: icc-guerrero

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;
@@ -60,17 +57,6 @@ public void display(String uuid, String name, String avatar, String info, int ti
         }
     }
 
-    @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

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+
 import android.app.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -43,10 +44,11 @@ public class UnlockScreenActivity extends AppCompatActivity implements UnlockScr
     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();
@@ -148,11 +150,11 @@ public void onBackPressed() {
         // Dont back
     }
 
-    public static void dismissIncoming() {
+    public void dismissIncoming() {
         v.cancel();
         player.stop();
         player.prepareAsync();
-        fa.finish();
+        dismissDialing();
     }
 
     private void acceptDialing() {