diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
index fd62a1521..ea928ec74 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -51,7 +51,6 @@ import org.thoughtcrime.securesms.util.Prefs;
import org.thoughtcrime.securesms.util.RelayUtil;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.videochat.VideochatUtil;
import java.util.Timer;
import java.util.TimerTask;
@@ -82,7 +81,6 @@ public class ConversationListFragment extends BaseConversationListFragment
eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_INCOMING_MSG, this);
eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_MSGS_NOTICED, this);
eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_CHAT_DELETED, this);
- eventCenter.addMultiAccountObserver(DcContext.DC_EVENT_INCOMING_CALL, this);
eventCenter.addObserver(DcContext.DC_EVENT_CHAT_MODIFIED, this);
eventCenter.addObserver(DcContext.DC_EVENT_CONTACTS_CHANGED, this);
eventCenter.addObserver(DcContext.DC_EVENT_MSGS_CHANGED, this);
@@ -345,8 +343,6 @@ public class ConversationListFragment extends BaseConversationListFragment
((ConversationListActivity) activity).refreshAvatar();
}
- } else if (event.getId() == DcContext.DC_EVENT_INCOMING_CALL) {
- VideochatUtil.joinCall(getActivity(), event.getData1Int(), event.getData2Str());
} else {
loadChatlistAsync();
}
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java b/src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java
index 41abd0567..d0ae0aec4 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcEventCenter.java
@@ -183,6 +183,10 @@ public class DcEventCenter {
DcHelper.getNotificationCenter(context).notifyWebxdc(accountId, event.getData1Int(), event.getData2Int(), event.getData2Str());
break;
+ case DcContext.DC_EVENT_INCOMING_CALL:
+ DcHelper.getNotificationCenter(context).notifyCall(accountId, event.getData1Int(), event.getData2Str());
+ break;
+
case DcContext.DC_EVENT_MSGS_NOTICED:
DcHelper.getNotificationCenter(context).removeNotifications(accountId, event.getData1Int());
break;
diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
index ef44f7b93..32967e1ef 100644
--- a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+++ b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java
@@ -48,6 +48,7 @@ import org.thoughtcrime.securesms.util.JsonUtils;
import org.thoughtcrime.securesms.util.Pair;
import org.thoughtcrime.securesms.util.Prefs;
import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.videochat.VideochatActivity;
import java.math.BigInteger;
import java.security.MessageDigest;
@@ -159,6 +160,19 @@ public class NotificationCenter {
return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
}
+ private PendingIntent getAnswerIntent(ChatData chatData, int callId, String payload) {
+ String hash = "#offer=" + payload;
+ Intent intent = new Intent(context, VideochatActivity.class);
+ intent.setAction(Intent.ACTION_VIEW);
+ intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, chatData.accountId);
+ intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatData.chatId);
+ intent.putExtra(VideochatActivity.EXTRA_CALL_ID, callId);
+ intent.putExtra(VideochatActivity.EXTRA_HASH, hash);
+ intent.setPackage(context.getPackageName());
+ return TaskStackBuilder.create(context)
+ .addNextIntentWithParentStack(intent)
+ .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT | IntentUtils.FLAG_MUTABLE());
+ }
// Groups and Notification channel groups
// --------------------------------------------------------------------------------------------
@@ -383,14 +397,16 @@ public class NotificationCenter {
// add notifications & co.
// --------------------------------------------------------------------------------------------
- public void addCallNotification(int accId, int chatId, int callId) {
+ public void notifyCall(int accId, int callId, String payload) {
Util.runOnAnyBackgroundThread(() -> {
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
DcContext dcContext = context.dcAccounts.getAccount(accId);
+ int chatId = dcContext.getMsg(callId).getChatId();
DcChat dcChat = dcContext.getChat(chatId);
String name = dcChat.getName();
ChatData chatData = new ChatData(accId, chatId);
String notificationChannel = getCallNotificationChannel(notificationManager, chatData, name);
+
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, notificationChannel)
.setSmallIcon(R.drawable.icon_notification)
.setColor(context.getResources().getColor(R.color.delta_primary))
@@ -405,6 +421,12 @@ public class NotificationCenter {
// .setDeleteIntenta(getMarkAsReadIntent(chatData, msgId, false))
// .setContentIntent(getOpenChatIntent(chatData));
+ builder.addAction(
+ new NotificationCompat.Action.Builder(
+ R.drawable.baseline_call_24,
+ context.getString(R.string.answer_call),
+ getAnswerIntent(chatData, callId, payload)).build());
+
Bitmap bitmap = getAvatar(dcChat);
if (bitmap != null) {
builder.setLargeIcon(bitmap);
diff --git a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java
index 0073baac7..4433145a9 100644
--- a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatActivity.java
@@ -23,6 +23,7 @@ import java.util.Objects;
public class VideochatActivity extends WebViewActivity implements DcEventCenter.DcEventDelegate {
+ public static final String EXTRA_ACCOUNT_ID = "acc_id";
public static final String EXTRA_CHAT_ID = "chat_id";
public static final String EXTRA_CALL_ID = "call_id";
public static final String EXTRA_HASH = "hash";
@@ -36,13 +37,14 @@ public class VideochatActivity extends WebViewActivity implements DcEventCenter.
@Override
protected void onCreate(Bundle state, boolean ready) {
super.onCreate(state, ready);
- this.dcContext = DcHelper.getContext(getApplicationContext());
Bundle bundle = getIntent().getExtras();
assert bundle != null;
String hash = bundle.getString(EXTRA_HASH, "");
chatId = bundle.getInt(EXTRA_CHAT_ID, 0);
callId = bundle.getInt(EXTRA_CALL_ID, 0);
+ int accId = bundle.getInt(EXTRA_ACCOUNT_ID, -1);
+ this.dcContext = DcHelper.getAccounts(getApplicationContext()).getAccount(accId);
WebSettings webSettings = webView.getSettings();
webSettings.setJavaScriptEnabled(true);
diff --git a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
index 82a18b63a..13ba3a155 100644
--- a/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
+++ b/src/main/java/org/thoughtcrime/securesms/videochat/VideochatUtil.java
@@ -4,9 +4,6 @@ import android.Manifest;
import android.app.Activity;
import android.content.Intent;
-import com.b44t.messenger.DcContext;
-import com.b44t.messenger.DcMsg;
-
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.permissions.Permissions;
@@ -14,34 +11,17 @@ import org.thoughtcrime.securesms.permissions.Permissions;
public class VideochatUtil {
public static void startCall(Activity activity, int chatId) {
- openCall(activity, chatId, 0, "#call");
- }
-
- public static void joinCall(Activity activity, int callId, String payload) {
- DcContext dcContext = DcHelper.getContext(activity);
- DcMsg dcMsg = dcContext.getMsg(callId);
- int accId = dcContext.getAccountId();
- int chatId = dcMsg.getChatId();
- String hash = "#offer=" + payload;
-
- //DcHelper.getNotificationCenter(activity).addCallNotification(accId, chatId, callId);
- openCall(activity, chatId, callId, hash);
- }
-
- private static void openCall(Activity activity, int chatId, int callId, String hash) {
- DcContext dcContext = DcHelper.getContext(activity);
- int accId = dcContext.getAccountId();
-
Permissions.with(activity)
.request(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)
.ifNecessary()
.withPermanentDenialDialog(activity.getString(R.string.perm_explain_access_to_camera_denied))
.onAllGranted(() -> {
+ int accId = DcHelper.getContext(activity).getAccountId();
Intent intent = new Intent(activity, VideochatActivity.class);
intent.setAction(Intent.ACTION_VIEW);
+ intent.putExtra(VideochatActivity.EXTRA_ACCOUNT_ID, accId);
intent.putExtra(VideochatActivity.EXTRA_CHAT_ID, chatId);
- intent.putExtra(VideochatActivity.EXTRA_CALL_ID, callId);
- intent.putExtra(VideochatActivity.EXTRA_HASH, hash);
+ intent.putExtra(VideochatActivity.EXTRA_HASH, "#call");
activity.startActivity(intent);
})
.execute();
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 23cf77c99..64fdeea8d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -370,6 +370,8 @@
Call
Video Calls
+ Answer
+ Decline
Video Chat