Skip to content

Commit 9d8f656

Browse files
LinusULinusU
committed
Remove dependency on RN* part from other part of Android code
1 parent ff0b4be commit 9d8f656

File tree

5 files changed

+60
-46
lines changed

5 files changed

+60
-46
lines changed

‎android/src/main/java/io/wazo/callkeep/Constants.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package io.wazo.callkeep;
2+
3+
public class Constants {
4+
public static final String CHECKING_PERMS = "CHECKING_PERMS";
5+
public static final String EXTRA_CALLER_NAME = "EXTRA_CALLER_NAME";
6+
public static final String EXTRA_CALL_UUID = "EXTRA_CALL_UUID";
7+
public static final String EXTRA_CALL_NUMBER = "EXTRA_CALL_NUMBER";
8+
public static final String ACTION_END_CALL = "ACTION_END_CALL";
9+
public static final String ACTION_ANSWER_CALL = "ACTION_ANSWER_CALL";
10+
public static final String ACTION_MUTE_CALL = "ACTION_MUTE_CALL";
11+
public static final String ACTION_UNMUTE_CALL = "ACTION_UNMUTE_CALL";
12+
public static final String ACTION_DTMF_TONE = "ACTION_DTMF_TONE";
13+
public static final String ACTION_HOLD_CALL = "ACTION_HOLD_CALL";
14+
public static final String ACTION_UNHOLD_CALL = "ACTION_UNHOLD_CALL";
15+
public static final String ACTION_ONGOING_CALL = "ACTION_ONGOING_CALL";
16+
public static final String ACTION_AUDIO_SESSION = "ACTION_AUDIO_SESSION";
17+
public static final String ACTION_CHECK_REACHABILITY = "ACTION_CHECK_REACHABILITY";
18+
public static final String ACTION_WAKE_APP = "ACTION_WAKE_APP";
19+
}

‎android/src/main/java/io/wazo/callkeep/RNCallKeepBackgroundMessagingService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import com.facebook.react.bridge.Arguments;
2727
import com.facebook.react.jstasks.HeadlessJsTaskConfig;
2828

29-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALLER_NAME;
30-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALL_NUMBER;
31-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALL_UUID;
29+
import static io.wazo.callkeep.Constants.EXTRA_CALLER_NAME;
30+
import static io.wazo.callkeep.Constants.EXTRA_CALL_NUMBER;
31+
import static io.wazo.callkeep.Constants.EXTRA_CALL_UUID;
3232

3333
import javax.annotation.Nullable;
3434

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,25 @@
6767

6868
import static android.support.v4.app.ActivityCompat.requestPermissions;
6969

70+
import static io.wazo.callkeep.Constants.EXTRA_CALLER_NAME;
71+
import static io.wazo.callkeep.Constants.EXTRA_CALL_UUID;
72+
import static io.wazo.callkeep.Constants.EXTRA_CALL_NUMBER;
73+
import static io.wazo.callkeep.Constants.ACTION_END_CALL;
74+
import static io.wazo.callkeep.Constants.ACTION_ANSWER_CALL;
75+
import static io.wazo.callkeep.Constants.ACTION_MUTE_CALL;
76+
import static io.wazo.callkeep.Constants.ACTION_UNMUTE_CALL;
77+
import static io.wazo.callkeep.Constants.ACTION_DTMF_TONE;
78+
import static io.wazo.callkeep.Constants.ACTION_HOLD_CALL;
79+
import static io.wazo.callkeep.Constants.ACTION_UNHOLD_CALL;
80+
import static io.wazo.callkeep.Constants.ACTION_ONGOING_CALL;
81+
import static io.wazo.callkeep.Constants.ACTION_AUDIO_SESSION;
82+
import static io.wazo.callkeep.Constants.ACTION_CHECK_REACHABILITY;
83+
7084
// @see https://github.com/kbagchiGWC/voice-quickstart-android/blob/9a2aff7fbe0d0a5ae9457b48e9ad408740dfb968/exampleConnectionService/src/main/java/com/twilio/voice/examples/connectionservice/VoiceConnectionServiceActivity.java
7185
public class RNCallKeepModule extends ReactContextBaseJavaModule {
7286
public static final int REQUEST_READ_PHONE_STATE = 1337;
7387
public static final int REQUEST_REGISTER_CALL_PROVIDER = 394859;
7488

75-
public static final String CHECKING_PERMS = "CHECKING_PERMS";
76-
public static final String EXTRA_CALLER_NAME = "EXTRA_CALLER_NAME";
77-
public static final String EXTRA_CALL_UUID = "EXTRA_CALL_UUID";
78-
public static final String EXTRA_CALL_NUMBER = "EXTRA_CALL_NUMBER";
79-
public static final String ACTION_END_CALL = "ACTION_END_CALL";
80-
public static final String ACTION_ANSWER_CALL = "ACTION_ANSWER_CALL";
81-
public static final String ACTION_MUTE_CALL = "ACTION_MUTE_CALL";
82-
public static final String ACTION_UNMUTE_CALL = "ACTION_UNMUTE_CALL";
83-
public static final String ACTION_DTMF_TONE = "ACTION_DTMF_TONE";
84-
public static final String ACTION_HOLD_CALL = "ACTION_HOLD_CALL";
85-
public static final String ACTION_UNHOLD_CALL = "ACTION_UNHOLD_CALL";
86-
public static final String ACTION_ONGOING_CALL = "ACTION_ONGOING_CALL";
87-
public static final String ACTION_AUDIO_SESSION = "ACTION_AUDIO_SESSION";
88-
public static final String ACTION_CHECK_REACHABILITY = "ACTION_CHECK_REACHABILITY";
89-
9089
private static final String E_ACTIVITY_DOES_NOT_EXIST = "E_ACTIVITY_DOES_NOT_EXIST";
9190
private static final String REACT_NATIVE_MODULE_NAME = "RNCallKeep";
9291
private static final String[] permissions = { Manifest.permission.READ_PHONE_STATE,
@@ -122,6 +121,7 @@ public void setup(ReadableMap options) {
122121
this.registerPhoneAccount(this.getAppContext());
123122
voiceBroadcastReceiver = new VoiceBroadcastReceiver();
124123
registerReceiver();
124+
VoiceConnectionService.setPhoneAccountHandle(handle);
125125
VoiceConnectionService.setAvailable(true);
126126
}
127127
}

‎android/src/main/java/io/wazo/callkeep/VoiceConnection.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737

3838
import java.util.HashMap;
3939

40-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_ANSWER_CALL;
41-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_AUDIO_SESSION;
42-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_DTMF_TONE;
43-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_END_CALL;
44-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_HOLD_CALL;
45-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_MUTE_CALL;
46-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_UNHOLD_CALL;
47-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_UNMUTE_CALL;
48-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALLER_NAME;
49-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALL_NUMBER;
50-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALL_UUID;
40+
import static io.wazo.callkeep.Constants.ACTION_ANSWER_CALL;
41+
import static io.wazo.callkeep.Constants.ACTION_AUDIO_SESSION;
42+
import static io.wazo.callkeep.Constants.ACTION_DTMF_TONE;
43+
import static io.wazo.callkeep.Constants.ACTION_END_CALL;
44+
import static io.wazo.callkeep.Constants.ACTION_HOLD_CALL;
45+
import static io.wazo.callkeep.Constants.ACTION_MUTE_CALL;
46+
import static io.wazo.callkeep.Constants.ACTION_UNHOLD_CALL;
47+
import static io.wazo.callkeep.Constants.ACTION_UNMUTE_CALL;
48+
import static io.wazo.callkeep.Constants.EXTRA_CALLER_NAME;
49+
import static io.wazo.callkeep.Constants.EXTRA_CALL_NUMBER;
50+
import static io.wazo.callkeep.Constants.EXTRA_CALL_UUID;
5151

5252
@TargetApi(Build.VERSION_CODES.M)
5353
public class VoiceConnection extends Connection {

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

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,12 @@
5353
import java.util.UUID;
5454
import java.util.stream.Collectors;
5555

56-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_ANSWER_CALL;
57-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_AUDIO_SESSION;
58-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_DTMF_TONE;
59-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_END_CALL;
60-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_HOLD_CALL;
61-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_MUTE_CALL;
62-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_ONGOING_CALL;
63-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_UNHOLD_CALL;
64-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_UNMUTE_CALL;
65-
import static io.wazo.callkeep.RNCallKeepModule.ACTION_CHECK_REACHABILITY;
66-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALLER_NAME;
67-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALL_NUMBER;
68-
import static io.wazo.callkeep.RNCallKeepModule.EXTRA_CALL_UUID;
69-
import static io.wazo.callkeep.RNCallKeepModule.handle;
56+
import static io.wazo.callkeep.Constants.ACTION_AUDIO_SESSION;
57+
import static io.wazo.callkeep.Constants.ACTION_ONGOING_CALL;
58+
import static io.wazo.callkeep.Constants.ACTION_CHECK_REACHABILITY;
59+
import static io.wazo.callkeep.Constants.EXTRA_CALLER_NAME;
60+
import static io.wazo.callkeep.Constants.EXTRA_CALL_NUMBER;
61+
import static io.wazo.callkeep.Constants.EXTRA_CALL_UUID;
7062

7163
// @see https://github.com/kbagchiGWC/voice-quickstart-android/blob/9a2aff7fbe0d0a5ae9457b48e9ad408740dfb968/exampleConnectionService/src/main/java/com/twilio/voice/examples/connectionservice/VoiceConnectionService.java
7264
@TargetApi(Build.VERSION_CODES.M)
@@ -76,6 +68,7 @@ public class VoiceConnectionService extends ConnectionService {
7668
private static Boolean isReachable;
7769
private static String notReachableCallUuid;
7870
private static ConnectionRequest currentConnectionRequest;
71+
private static PhoneAccountHandle phoneAccountHandle;
7972
private static String TAG = "RNCK:VoiceConnectionService";
8073
public static Map<String, VoiceConnection> currentConnections = new HashMap<>();
8174
public static Boolean hasOutgoingCall = false;
@@ -98,6 +91,10 @@ public VoiceConnectionService() {
9891
currentConnectionService = this;
9992
}
10093

94+
public static void setPhoneAccountHandle(PhoneAccountHandle phoneAccountHandle) {
95+
VoiceConnectionService.phoneAccountHandle = phoneAccountHandle;
96+
}
97+
10198
public static void setAvailable(Boolean value) {
10299
Log.d(TAG, "setAvailable: " + (value ? "true" : "false"));
103100
if (value) {
@@ -271,9 +268,7 @@ public void onConference(Connection connection1, Connection connection2) {
271268
VoiceConnection voiceConnection1 = (VoiceConnection) connection1;
272269
VoiceConnection voiceConnection2 = (VoiceConnection) connection2;
273270

274-
PhoneAccountHandle phoneAccountHandle = RNCallKeepModule.handle;
275-
276-
VoiceConference voiceConference = new VoiceConference(handle);
271+
VoiceConference voiceConference = new VoiceConference(phoneAccountHandle);
277272
voiceConference.addConnection(voiceConnection1);
278273
voiceConference.addConnection(voiceConnection2);
279274

0 commit comments

Comments
 (0)