Skip to content

Commit b282ab3

Browse files
committed
Remove dependency on com.facebook.* from non-RN part of Android code
1 parent 5c57ba3 commit b282ab3

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import com.facebook.react.bridge.ReadableArray;
5656
import com.facebook.react.bridge.ReadableMap;
5757
import com.facebook.react.bridge.WritableMap;
58+
import com.facebook.react.HeadlessJsTaskService;
5859
import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
5960

6061
import java.lang.reflect.Array;
@@ -80,6 +81,7 @@
8081
import static io.wazo.callkeep.Constants.ACTION_ONGOING_CALL;
8182
import static io.wazo.callkeep.Constants.ACTION_AUDIO_SESSION;
8283
import static io.wazo.callkeep.Constants.ACTION_CHECK_REACHABILITY;
84+
import static io.wazo.callkeep.Constants.ACTION_WAKE_APP;
8385

8486
// @see https://github.com/kbagchiGWC/voice-quickstart-android/blob/9a2aff7fbe0d0a5ae9457b48e9ad408740dfb968/exampleConnectionService/src/main/java/com/twilio/voice/examples/connectionservice/VoiceConnectionServiceActivity.java
8587
public class RNCallKeepModule extends ReactContextBaseJavaModule {
@@ -568,6 +570,18 @@ public void onReceive(Context context, Intent intent) {
568570
case ACTION_CHECK_REACHABILITY:
569571
sendEventToJS("RNCallKeepCheckReachability", null);
570572
break;
573+
case ACTION_WAKE_APP:
574+
Intent headlessIntent = new Intent(reactContext, RNCallKeepBackgroundMessagingService.class);
575+
headlessIntent.putExtra("callUUID", attributeMap.get(EXTRA_CALL_UUID));
576+
headlessIntent.putExtra("name", attributeMap.get(EXTRA_CALLER_NAME));
577+
headlessIntent.putExtra("handle", attributeMap.get(EXTRA_CALL_NUMBER));
578+
Log.d(TAG, "wakeUpApplication: " + attributeMap.get(EXTRA_CALL_UUID) + ", number : " + attributeMap.get(EXTRA_CALL_NUMBER) + ", displayName:" + attributeMap.get(EXTRA_CALLER_NAME));
579+
580+
ComponentName name = reactContext.startService(headlessIntent);
581+
if (name != null) {
582+
HeadlessJsTaskService.acquireWakeLockNow(reactContext);
583+
}
584+
break;
571585
}
572586
}
573587
}

android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
import android.app.ActivityManager;
4141
import android.app.ActivityManager.RunningTaskInfo;
4242

43-
import com.facebook.react.HeadlessJsTaskService;
44-
4543
import java.util.ArrayList;
4644
import java.util.HashMap;
4745
import java.util.Iterator;
@@ -54,6 +52,7 @@
5452
import static io.wazo.callkeep.Constants.ACTION_AUDIO_SESSION;
5553
import static io.wazo.callkeep.Constants.ACTION_ONGOING_CALL;
5654
import static io.wazo.callkeep.Constants.ACTION_CHECK_REACHABILITY;
55+
import static io.wazo.callkeep.Constants.ACTION_WAKE_APP;
5756
import static io.wazo.callkeep.Constants.EXTRA_CALLER_NAME;
5857
import static io.wazo.callkeep.Constants.EXTRA_CALL_NUMBER;
5958
import static io.wazo.callkeep.Constants.EXTRA_CALL_UUID;
@@ -191,19 +190,11 @@ private Connection makeOutgoingCall(ConnectionRequest request, String uuid, Bool
191190
}
192191

193192
private void wakeUpApplication(String uuid, String number, String displayName) {
194-
Intent headlessIntent = new Intent(
195-
this.getApplicationContext(),
196-
RNCallKeepBackgroundMessagingService.class
197-
);
198-
headlessIntent.putExtra("callUUID", uuid);
199-
headlessIntent.putExtra("name", displayName);
200-
headlessIntent.putExtra("handle", number);
201-
Log.d(TAG, "wakeUpApplication: " + uuid + ", number : " + number + ", displayName:" + displayName);
202-
203-
ComponentName name = this.getApplicationContext().startService(headlessIntent);
204-
if (name != null) {
205-
HeadlessJsTaskService.acquireWakeLockNow(this.getApplicationContext());
206-
}
193+
HashMap<String, String> extrasMap = new HashMap();
194+
extrasMap.put(EXTRA_CALL_UUID, uuid);
195+
extrasMap.put(EXTRA_CALLER_NAME, displayName);
196+
extrasMap.put(EXTRA_CALL_NUMBER, number);
197+
sendCallRequestToActivity(ACTION_WAKE_APP, extrasMap);
207198
}
208199

209200
private void wakeUpAfterReachabilityTimeout(ConnectionRequest request) {

0 commit comments

Comments
 (0)