Skip to content

Commit a630c64

Browse files
authored
Merge pull request #1 from UN-ICC/bugfix/dismiss-incoming-calls
Raise RN endcall event when calls are dismissed
2 parents 29fbcaa + 7d993a8 commit a630c64

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
import android.view.WindowManager;
77
import android.content.Context;
88
import android.util.Log;
9-
import java.util.Timer;
10-
import java.util.TimerTask;
11-
129
import com.facebook.react.bridge.ReactApplicationContext;
1310
import com.facebook.react.bridge.ReactContextBaseJavaModule;
1411
import com.facebook.react.bridge.ReactMethod;
@@ -60,17 +57,6 @@ public void display(String uuid, String name, String avatar, String info, int ti
6057
}
6158
}
6259

63-
@ReactMethod
64-
public void dismiss() {
65-
// final Activity activity = reactContext.getCurrentActivity();
66-
67-
// assert activity != null;
68-
69-
UnlockScreenActivity.dismissIncoming();
70-
71-
return;
72-
}
73-
7460
private Context getAppContext() {
7561
return this.reactContext.getApplicationContext();
7662
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.List;
1818
import java.util.Timer;
1919
import java.util.TimerTask;
20+
2021
import android.app.Activity;
2122

2223
import androidx.appcompat.app.AppCompatActivity;
@@ -43,10 +44,11 @@ public class UnlockScreenActivity extends AppCompatActivity implements UnlockScr
4344
static boolean active = false;
4445
private static Vibrator v = (Vibrator) IncomingCallModule.reactContext.getSystemService(Context.VIBRATOR_SERVICE);
4546
private long[] pattern = {0, 1000, 800};
46-
private static MediaPlayer player = MediaPlayer.create(IncomingCallModule.reactContext.getApplicationContext(), Settings.System.DEFAULT_RINGTONE_URI);
47+
private static MediaPlayer player = MediaPlayer.create(IncomingCallModule.reactContext, Settings.System.DEFAULT_RINGTONE_URI);
4748
private static Activity fa;
4849
private Timer timer;
4950

51+
5052
@Override
5153
public void onStart() {
5254
super.onStart();
@@ -148,11 +150,11 @@ public void onBackPressed() {
148150
// Dont back
149151
}
150152

151-
public static void dismissIncoming() {
153+
public void dismissIncoming() {
152154
v.cancel();
153155
player.stop();
154156
player.prepareAsync();
155-
fa.finish();
157+
dismissDialing();
156158
}
157159

158160
private void acceptDialing() {

0 commit comments

Comments
 (0)