From 1adf9e6cffa8d2692d1c3f997415418bbf08a831 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 20 Feb 2020 15:13:55 +0100 Subject: [PATCH] Reword incoming call extra & cleanup Signed-off-by: Mario Danic --- .../talk/services/firebase/MagicFirebaseMessagingService.kt | 4 ++-- .../java/com/nextcloud/talk/activities/MagicCallActivity.kt | 2 +- .../main/java/com/nextcloud/talk/activities/MainActivity.kt | 4 ++-- .../java/com/nextcloud/talk/controllers/ChatController.kt | 4 ++-- .../java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt | 1 - .../main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt | 4 +--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt index 3e67c3828..8536c324c 100644 --- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt +++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt @@ -50,7 +50,7 @@ import com.nextcloud.talk.utils.NotificationUtils.cancelAllNotificationsForAccou import com.nextcloud.talk.utils.NotificationUtils.cancelExistingNotificationWithId import com.nextcloud.talk.utils.PushUtils import com.nextcloud.talk.utils.bundle.BundleKeys -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FROM_NOTIFICATION_START_CALL +import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_OPEN_INCOMING_CALL import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY import com.nextcloud.talk.utils.preferences.AppPreferences import kotlinx.serialization.json.Json @@ -125,10 +125,10 @@ class MagicFirebaseMessagingService : FirebaseMessagingService(), KoinComponent } type == "call" -> { val fullScreenIntent = Intent(applicationContext, MagicCallActivity::class.java) + fullScreenIntent.action = KEY_OPEN_INCOMING_CALL val bundle = Bundle() bundle.putString(BundleKeys.KEY_ROOM_ID, decryptedPushMessage.id) bundle.putParcelable(KEY_USER_ENTITY, signatureVerification.userEntity) - bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, true) fullScreenIntent.putExtras(bundle) fullScreenIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt index 2e85e957f..716830e18 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt @@ -64,7 +64,7 @@ class MagicCallActivity : BaseActivity() { router!!.setPopsLastView(false) if (!router!!.hasRootController()) { - if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) { + if (intent.getBooleanExtra(BundleKeys.KEY_OPEN_INCOMING_CALL, false)) { router!!.setRoot( RouterTransaction.with(CallNotificationController(intent.extras!!)) .pushChangeHandler(HorizontalChangeHandler()) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index 21c8e4e1d..e77824158 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -154,8 +154,8 @@ class MainActivity : BaseActivity(), ActionBarProvider { } } } - } else if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { - router!!.pushController( + } else if (intent.action == BundleKeys.KEY_OPEN_INCOMING_CALL) { + router?.pushController( RouterTransaction.with(CallNotificationController(intent.extras!!)) .pushChangeHandler(HorizontalChangeHandler()) .popChangeHandler(HorizontalChangeHandler()) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 68fe7f279..28a407413 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -195,8 +195,8 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter credentials = ApiUtils.getCredentials(conversationUser?.username, conversationUser?.token) } - if (args.containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { - this.startCallFromNotification = args.getBoolean(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL) + if (args.containsKey(BundleKeys.KEY_OPEN_INCOMING_CALL)) { + this.startCallFromNotification = args.getBoolean(BundleKeys.KEY_OPEN_INCOMING_CALL) } this.voiceOnly = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt index 02e3789bd..4fb18d4d0 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/MessageNotificationWorker.kt @@ -203,7 +203,6 @@ class MessageNotificationWorker( val pendingIntent: PendingIntent? = PendingIntent.getActivity(applicationContext, 0, intent, 0) - val userBaseUrl = Uri.parse(signatureVerification.userEntity!!.baseUrl).toString() val soundUri = NotificationUtils.getMessageSoundUri(applicationContext, appPreferences) val audioAttributesBuilder: AudioAttributes.Builder = diff --git a/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt index 6d9074d57..e5da0af3f 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt @@ -43,8 +43,6 @@ object BundleKeys { val KEY_EXISTING_PARTICIPANTS = "KEY_EXISTING_PARTICIPANTS" val KEY_CALL_URL = "KEY_CALL_URL" val KEY_MODIFIED_BASE_URL = "KEY_MODIFIED_BASE_URL" - val KEY_NOTIFICATION_SUBJECT = "KEY_NOTIFICATION_SUBJECT" - val KEY_NOTIFICATION_SIGNATURE = "KEY_NOTIFICATION_SIGNATURE" val KEY_INTERNAL_USER_ID = "KEY_INTERNAL_USER_ID" val KEY_CONVERSATION_TYPE = "KEY_CONVERSATION_TYPE" val KEY_INVITED_PARTICIPANTS = "KEY_INVITED_PARTICIPANTS" @@ -53,7 +51,7 @@ object BundleKeys { val KEY_CALL_VOICE_ONLY = "KEY_CALL_VOICE_ONLY" val KEY_ACTIVE_CONVERSATION = "KEY_ACTIVE_CONVERSATION" val KEY_SERVER_CAPABILITIES = "KEY_SERVER_CAPABILITIES" - val KEY_FROM_NOTIFICATION_START_CALL = "KEY_FROM_NOTIFICATION_START_CALL" + val KEY_OPEN_INCOMING_CALL = "KEY_OPEN_INCOMING_CALL" val KEY_ROOM_ID = "KEY_ROOM_ID" val KEY_ARE_CALL_SOUNDS = "KEY_ARE_CALL_SOUNDS" val KEY_BROWSER_TYPE = "KEY_BROWSER_TYPE"