diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 642c62850..1990473d9 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -442,6 +442,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
menu.findItem(R.id.menu_show_map).setVisible(false);
}
+ menu.findItem(R.id.menu_start_call).setVisible(Prefs.isCallsEnabled(this) && dcChat.isEncrypted() && !isMultiUser());
+
if (!dcChat.isEncrypted() || !dcChat.canSend() || dcChat.isMailingList() ) {
menu.findItem(R.id.menu_ephemeral_messages).setVisible(false);
}
@@ -532,6 +534,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} else if (itemId == R.id.menu_show_map) {
WebxdcActivity.openMaps(this, chatId);
return true;
+ } else if (itemId == R.id.menu_start_call) {
+ VideochatUtil.startCall(this, chatId);
+ return true;
} else if (itemId == R.id.menu_all_media) {
handleAllMedia();
return true;
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 3f18901e6..b6225518e 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -205,6 +205,22 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
});
}
+ Preference callsEnabled = this.findPreference("pref_calls_enabled");
+ if (callsEnabled != null) {
+ callsEnabled.setOnPreferenceChangeListener((preference, newValue) -> {
+ if ((Boolean)newValue) {
+ new AlertDialog.Builder(requireActivity())
+ .setTitle("Thanks for trying out \"Video Calls\"!")
+ .setMessage("• You can now call contacts\n\n"
+ + "• If you want to quit the experimental feature, you can disable it at \"Settings / Advanced\"")
+ .setCancelable(false)
+ .setPositiveButton(R.string.ok, null)
+ .show();
+ }
+ return true;
+ });
+ }
+
Preference selfReporting = this.findPreference("pref_self_reporting");
if (selfReporting != null) {
selfReporting.setOnPreferenceClickListener(((preference) -> {
diff --git a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
index 355b56d63..0a01b3878 100644
--- a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
+++ b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java
@@ -179,6 +179,11 @@ public class Prefs {
return getBooleanPreference(context, "pref_new_broadcast_list", false);
}
+
+ public static boolean isCallsEnabled(Context context) {
+ return getBooleanPreference(context, "pref_calls_enabled", false);
+ }
+
// ringtone
public static @NonNull Uri getNotificationRingtone(Context context) {
diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml
index 2cbf9a2c9..cbe09e6f7 100644
--- a/src/main/res/menu/conversation.xml
+++ b/src/main/res/menu/conversation.xml
@@ -25,6 +25,11 @@
android:visible="false"
app:showAsAction="always"/>
+
+
-
File saved to \"%1$s\".
+ Call
+ Video Calls
+
Video Chat
diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml
index 59ee601cc..4cb87cfa1 100644
--- a/src/main/res/xml/preferences_advanced.xml
+++ b/src/main/res/xml/preferences_advanced.xml
@@ -20,6 +20,11 @@
android:title="@string/webxdc_store_url"
android:summary="@string/none"/>
+
+