mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-27 15:39:47 +01:00
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 <dev@mhibbe.de>
This commit is contained in:
parent
4c96f511c8
commit
7e1ebebd5d
@ -28,7 +28,6 @@ import com.nextcloud.talk.account.ServerSelectionActivity
|
|||||||
import com.nextcloud.talk.account.WebViewLoginActivity
|
import com.nextcloud.talk.account.WebViewLoginActivity
|
||||||
import com.nextcloud.talk.api.NcApi
|
import com.nextcloud.talk.api.NcApi
|
||||||
import com.nextcloud.talk.application.NextcloudTalkApplication
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
||||||
import com.nextcloud.talk.callnotification.CallNotificationActivity
|
|
||||||
import com.nextcloud.talk.chat.ChatActivity
|
import com.nextcloud.talk.chat.ChatActivity
|
||||||
import com.nextcloud.talk.conversationlist.ConversationsListActivity
|
import com.nextcloud.talk.conversationlist.ConversationsListActivity
|
||||||
import com.nextcloud.talk.data.user.model.User
|
import com.nextcloud.talk.data.user.model.User
|
||||||
@ -245,19 +244,13 @@ class MainActivity : BaseActivity(), ActionBarProvider {
|
|||||||
if (user != null && userManager.setUserAsActive(user).blockingGet()) {
|
if (user != null && userManager.setUserAsActive(user).blockingGet()) {
|
||||||
if (intent.hasExtra(BundleKeys.KEY_REMOTE_TALK_SHARE)) {
|
if (intent.hasExtra(BundleKeys.KEY_REMOTE_TALK_SHARE)) {
|
||||||
if (intent.getBooleanExtra(BundleKeys.KEY_REMOTE_TALK_SHARE, false)) {
|
if (intent.getBooleanExtra(BundleKeys.KEY_REMOTE_TALK_SHARE, false)) {
|
||||||
val intent = Intent(this, InvitationsActivity::class.java)
|
val invitationsIntent = Intent(this, InvitationsActivity::class.java)
|
||||||
startActivity(intent)
|
startActivity(invitationsIntent)
|
||||||
}
|
|
||||||
} 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)
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
val chatIntent = Intent(context, ChatActivity::class.java)
|
||||||
|
chatIntent.putExtras(intent.extras!!)
|
||||||
|
startActivity(chatIntent)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!appPreferences.isDbRoomMigrated) {
|
if (!appPreferences.isDbRoomMigrated) {
|
||||||
|
@ -986,7 +986,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
|
|||||||
val bundle = Bundle()
|
val bundle = Bundle()
|
||||||
bundle.putString(KEY_ROOM_TOKEN, pushMessage.id)
|
bundle.putString(KEY_ROOM_TOKEN, pushMessage.id)
|
||||||
bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!)
|
bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!)
|
||||||
bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, false)
|
|
||||||
intent.putExtras(bundle)
|
intent.putExtras(bundle)
|
||||||
return intent
|
return intent
|
||||||
}
|
}
|
||||||
@ -997,7 +996,6 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
|
|||||||
val bundle = Bundle()
|
val bundle = Bundle()
|
||||||
bundle.putString(KEY_ROOM_TOKEN, pushMessage.id)
|
bundle.putString(KEY_ROOM_TOKEN, pushMessage.id)
|
||||||
bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!)
|
bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!)
|
||||||
bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, false)
|
|
||||||
intent.putExtras(bundle)
|
intent.putExtras(bundle)
|
||||||
|
|
||||||
val requestCode = System.currentTimeMillis().toInt()
|
val requestCode = System.currentTimeMillis().toInt()
|
||||||
|
@ -35,13 +35,12 @@ import com.nextcloud.talk.upload.chunked.ChunkedFileUploader
|
|||||||
import com.nextcloud.talk.upload.chunked.OnDataTransferProgressListener
|
import com.nextcloud.talk.upload.chunked.OnDataTransferProgressListener
|
||||||
import com.nextcloud.talk.upload.normal.FileUploader
|
import com.nextcloud.talk.upload.normal.FileUploader
|
||||||
import com.nextcloud.talk.users.UserManager
|
import com.nextcloud.talk.users.UserManager
|
||||||
|
import com.nextcloud.talk.utils.CapabilitiesUtil
|
||||||
import com.nextcloud.talk.utils.FileUtils
|
import com.nextcloud.talk.utils.FileUtils
|
||||||
import com.nextcloud.talk.utils.NotificationUtils
|
import com.nextcloud.talk.utils.NotificationUtils
|
||||||
import com.nextcloud.talk.utils.RemoteFileUtils
|
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_INTERNAL_USER_ID
|
||||||
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
|
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.permissions.PlatformPermissionUtil
|
||||||
import com.nextcloud.talk.utils.preferences.AppPreferences
|
import com.nextcloud.talk.utils.preferences.AppPreferences
|
||||||
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
||||||
@ -295,7 +294,6 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
|
|||||||
|
|
||||||
bundle.putString(KEY_ROOM_TOKEN, roomToken)
|
bundle.putString(KEY_ROOM_TOKEN, roomToken)
|
||||||
bundle.putLong(KEY_INTERNAL_USER_ID, currentUser.id!!)
|
bundle.putLong(KEY_INTERNAL_USER_ID, currentUser.id!!)
|
||||||
bundle.putBoolean(KEY_FROM_NOTIFICATION_START_CALL, false)
|
|
||||||
|
|
||||||
intent.putExtras(bundle)
|
intent.putExtras(bundle)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user