From 7e1ebebd5d678b7ddd2e62943ba926ca0bcf1482 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 12 Apr 2024 11:45:05 +0200 Subject: [PATCH] remove unnecessary KEY_FROM_NOTIFICATION_START_CALL handling this seems to be a relict caused by conductor back then. CallNotificationActivity is opened directly. There shouldn't have been any scenario anymore when it would be opened by MainActivity. Back then with conductor, this was done because there must have been an activity to open which then opened a controller. Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/activities/MainActivity.kt | 19 ++++++------------- .../nextcloud/talk/jobs/NotificationWorker.kt | 2 -- .../talk/jobs/UploadAndShareFilesWorker.kt | 4 +--- 3 files changed, 7 insertions(+), 18 deletions(-) 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 a25927dd4..e56f4f898 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -28,7 +28,6 @@ import com.nextcloud.talk.account.ServerSelectionActivity import com.nextcloud.talk.account.WebViewLoginActivity import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication -import com.nextcloud.talk.callnotification.CallNotificationActivity import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.conversationlist.ConversationsListActivity import com.nextcloud.talk.data.user.model.User @@ -245,19 +244,13 @@ class MainActivity : BaseActivity(), ActionBarProvider { if (user != null && userManager.setUserAsActive(user).blockingGet()) { if (intent.hasExtra(BundleKeys.KEY_REMOTE_TALK_SHARE)) { if (intent.getBooleanExtra(BundleKeys.KEY_REMOTE_TALK_SHARE, false)) { - val intent = Intent(this, InvitationsActivity::class.java) - startActivity(intent) - } - } else if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { - if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) { - val callNotificationIntent = Intent(this, CallNotificationActivity::class.java) - intent.extras?.let { callNotificationIntent.putExtras(it) } - startActivity(callNotificationIntent) - } else { - val chatIntent = Intent(context, ChatActivity::class.java) - chatIntent.putExtras(intent.extras!!) - startActivity(chatIntent) + val invitationsIntent = Intent(this, InvitationsActivity::class.java) + startActivity(invitationsIntent) } + } else { + val chatIntent = Intent(context, ChatActivity::class.java) + chatIntent.putExtras(intent.extras!!) + startActivity(chatIntent) } } else { if (!appPreferences.isDbRoomMigrated) { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt index bc015687e..fbbbfc9fe 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt @@ -986,7 +986,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor val bundle = Bundle() bundle.putString(KEY_ROOM_TOKEN, pushMessage.id) bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!) - bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, false) intent.putExtras(bundle) return intent } @@ -997,7 +996,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor val bundle = Bundle() bundle.putString(KEY_ROOM_TOKEN, pushMessage.id) bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!) - bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, false) intent.putExtras(bundle) val requestCode = System.currentTimeMillis().toInt() diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt index 20eef7217..93d0b9212 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt @@ -35,13 +35,12 @@ import com.nextcloud.talk.upload.chunked.ChunkedFileUploader import com.nextcloud.talk.upload.chunked.OnDataTransferProgressListener import com.nextcloud.talk.upload.normal.FileUploader import com.nextcloud.talk.users.UserManager +import com.nextcloud.talk.utils.CapabilitiesUtil import com.nextcloud.talk.utils.FileUtils import com.nextcloud.talk.utils.NotificationUtils import com.nextcloud.talk.utils.RemoteFileUtils -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FROM_NOTIFICATION_START_CALL import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN -import com.nextcloud.talk.utils.CapabilitiesUtil import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import com.nextcloud.talk.utils.preferences.AppPreferences import okhttp3.MediaType.Companion.toMediaTypeOrNull @@ -295,7 +294,6 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa bundle.putString(KEY_ROOM_TOKEN, roomToken) bundle.putLong(KEY_INTERNAL_USER_ID, currentUser.id!!) - bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, false) intent.putExtras(bundle)