Skip to content

Caller Display / Address Fix, DRY out Code For Executing Callbacks #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2025
Merged

Caller Display / Address Fix, DRY out Code For Executing Callbacks #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a56b6c
Create CordovaCall.emitEvent(...) simplify callback execution
WesUnwin Oct 2, 2025
5ee7b47
Fix connection display name + address setting logic
WesUnwin Oct 2, 2025
1f0ba55
Remove usage of call_url / on_click_path
WesUnwin Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/android/CordovaCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,18 @@ public static HashMap<String, ArrayList<CallbackContext>> getCallbackContexts()
return callbackContextMap;
}

public static void emitEvent(String eventName, PluginResult result) {
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get(eventName);
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
}

public static CordovaInterface getCordova() {
return cordovaInterface;
}
Expand Down
95 changes: 20 additions & 75 deletions src/android/MyConnectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public static void deinitConnection() {
@Override
public Connection onCreateIncomingConnection(final PhoneAccountHandle connectionManagerPhoneAccount, final ConnectionRequest request) {
Bundle requestExtras = request.getExtras() != null ? request.getExtras() : new Bundle();
String fromAddress = requestExtras.getString("from");
String payloadString = requestExtras.getString("payload");

final Connection connection = new Connection() {
Expand Down Expand Up @@ -67,16 +66,7 @@ public void onAnswer() {
handler.postDelayed(new Runnable() {
@Override
public void run() {
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get("answer");
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
PluginResult result = new PluginResult(PluginResult.Status.OK, payloadString);
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
CordovaCall.emitEvent("answer", new PluginResult(PluginResult.Status.OK, payloadString));
}
}, 1000);
}
Expand All @@ -87,16 +77,7 @@ public void onReject() {
this.setDisconnected(cause);
this.destroy();
conn = null;
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get("reject");
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
PluginResult result = new PluginResult(PluginResult.Status.OK, payloadString);
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
CordovaCall.emitEvent("reject", new PluginResult(PluginResult.Status.OK, payloadString));
}

@Override
Expand All @@ -110,36 +91,20 @@ public void onDisconnect() {
this.setDisconnected(cause);
this.destroy();
conn = null;
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get("hangup");
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
PluginResult result = new PluginResult(PluginResult.Status.OK, "hangup event called successfully");
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
CordovaCall.emitEvent("hangup", new PluginResult(PluginResult.Status.OK, "hangup event called successfully"));
}
};

connection.setAddress(Uri.parse(fromAddress), TelecomManager.PRESENTATION_ALLOWED);
String from = requestExtras.getString("from");
connection.setCallerDisplayName(from, TelecomManager.PRESENTATION_ALLOWED);

Icon icon = CordovaCall.getIcon();
if(icon != null) {
StatusHints statusHints = new StatusHints((CharSequence)"", icon, new Bundle());
connection.setStatusHints(statusHints);
}
conn = connection;
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get("receiveCall");
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
PluginResult result = new PluginResult(PluginResult.Status.OK, "receiveCall event called successfully");
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
CordovaCall.emitEvent("receiveCall", new PluginResult(PluginResult.Status.OK, "receiveCall event called successfully"));
return connection;
}

Expand Down Expand Up @@ -167,31 +132,22 @@ public void onDisconnect() {
this.setDisconnected(cause);
this.destroy();
conn = null;
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get("hangup");
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
PluginResult result = new PluginResult(PluginResult.Status.OK, "hangup event called successfully");
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
CordovaCall.emitEvent("hangup", new PluginResult(PluginResult.Status.OK, "hangup event called successfully"));
}

@Override
public void onStateChanged(int state) {
if(state == Connection.STATE_DIALING) {
final Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
Intent intent = new Intent(CordovaCall.getCordova().getActivity().getApplicationContext(), CordovaCall.getCordova().getActivity().getClass());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
CordovaCall.getCordova().getActivity().getApplicationContext().startActivity(intent);
}
}, 500);
}
if(state == Connection.STATE_DIALING) {
final Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
Intent intent = new Intent(CordovaCall.getCordova().getActivity().getApplicationContext(), CordovaCall.getCordova().getActivity().getClass());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
CordovaCall.getCordova().getActivity().getApplicationContext().startActivity(intent);
}
}, 500);
}
}
};
connection.setAddress(Uri.parse(request.getExtras().getString("to")), TelecomManager.PRESENTATION_ALLOWED);
Expand All @@ -202,18 +158,7 @@ public void run() {
}
connection.setDialing();
conn = connection;
ArrayList<CallbackContext> callbackContexts = CordovaCall.getCallbackContexts().get("sendCall");
if(callbackContexts != null) {
for (final CallbackContext callbackContext : callbackContexts) {
CordovaCall.getCordova().getThreadPool().execute(new Runnable() {
public void run() {
PluginResult result = new PluginResult(PluginResult.Status.OK, "sendCall event called successfully");
result.setKeepCallback(true);
callbackContext.sendPluginResult(result);
}
});
}
}
CordovaCall.emitEvent("sendCall", new PluginResult(PluginResult.Status.OK, "sendCall event called successfully"));
return connection;
}
}