From 02baf824f9b2f6bf52aa3a22abd7681ea907fe97 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 5 Aug 2020 19:59:25 +0200 Subject: [PATCH] Give user the possibility to prevent accidental call (#1869) --- CHANGES.md | 2 +- .../home/room/detail/RoomDetailFragment.kt | 14 ++++++++++++++ .../app/features/settings/VectorPreferences.kt | 12 +++++++++++- vector/src/main/res/values/strings.xml | 2 ++ vector/src/main/res/xml/vector_settings_root.xml | 3 +-- .../main/res/xml/vector_settings_voice_video.xml | 15 ++++++++++++--- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6f40a758fc..76524d008f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,7 @@ Features ✨: - Protect access to the app by a pin code (#1700) Improvements 🙌: - - + - Give user the possibility to prevent accidental call (#1869) Bugfix 🐛: - Fix invisible toolbar (Status.im theme) (#1746) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt index cb568a46a8..a9dcdee08d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt @@ -591,6 +591,20 @@ class RoomDetailFragment @Inject constructor( } private fun safeStartCall(isVideoCall: Boolean) { + if (vectorPreferences.preventAccidentalCall()) { + AlertDialog.Builder(requireActivity()) + .setMessage(if (isVideoCall) R.string.start_video_call_prompt_msg else R.string.start_voice_call_prompt_msg) + .setPositiveButton(if (isVideoCall) R.string.start_video_call else R.string.start_voice_call) { _, _ -> + safeStartCall2(isVideoCall) + } + .setNegativeButton(R.string.cancel, null) + .show() + } else { + safeStartCall2(isVideoCall) + } + } + + private fun safeStartCall2(isVideoCall: Boolean) { val startCallAction = RoomDetailAction.StartCall(isVideoCall) roomDetailViewModel.pendingAction = startCallAction if (isVideoCall) { diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt index 8aa0f7a6f9..654f49a220 100755 --- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt @@ -24,11 +24,11 @@ import android.provider.MediaStore import androidx.core.content.edit import androidx.preference.PreferenceManager import com.squareup.seismic.ShakeDetector -import im.vector.matrix.android.api.extensions.tryThis import im.vector.app.BuildConfig import im.vector.app.R import im.vector.app.features.homeserver.ServerUrlsRepository import im.vector.app.features.themes.ThemeUtils +import im.vector.matrix.android.api.extensions.tryThis import timber.log.Timber import javax.inject.Inject @@ -110,6 +110,7 @@ class VectorPreferences @Inject constructor(private val context: Context) { // notifications const val SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY = "SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY" const val SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY = "SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY" + // public static final String SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY = "SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"; const val SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY = "SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY" const val SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY = "SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY" @@ -130,6 +131,7 @@ class VectorPreferences @Inject constructor(private val context: Context) { const val SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY = "SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY" // Calls + const val SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY = "SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY" const val SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY = "SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY" const val SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY = "SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY" @@ -147,6 +149,7 @@ class VectorPreferences @Inject constructor(private val context: Context) { private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY" private const val SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY = "SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY" private const val SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY" + // SETTINGS_LABS_HIDE_TECHNICAL_E2E_ERRORS private const val SETTINGS_LABS_MERGE_E2E_ERRORS = "SETTINGS_LABS_MERGE_E2E_ERRORS" const val SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB = "SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB" @@ -644,6 +647,13 @@ class VectorPreferences @Inject constructor(private val context: Context) { } } + /** + * Tells if a confirmation dialog should be displayed before staring a call + */ + fun preventAccidentalCall(): Boolean { + return defaultPrefs.getBoolean(SETTINGS_CALL_PREVENT_ACCIDENTAL_CALL_KEY, false) + } + /** * Tells if the read receipts should be shown * diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index c9bffeb320..33b09205f1 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -362,6 +362,8 @@ Calls + Prevent accidental call + Ask for confirmation before starting a call Use default Element ringtone for incoming calls Allow fallback call assist server Will use "%s" as assist when your home server does not offer one (your IP address will be shared during a call) diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml index 9af2d377ee..100db7ce79 100644 --- a/vector/src/main/res/xml/vector_settings_root.xml +++ b/vector/src/main/res/xml/vector_settings_root.xml @@ -26,8 +26,7 @@ + app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment" /> - + + + + android:title="@string/settings_call_ringtone_use_app_ringtone" + app:isPreferenceVisible="@bool/false_not_implemented" /> + android:title="@string/settings_call_ringtone_title" + app:isPreferenceVisible="@bool/false_not_implemented" />