gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace Controller with Activity for chat

Browse Source 
chat opens, but quite some todos open. expect crashes.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-03-31 15:23:52 +02:00
parent b95a0dfbb5
commit cd2ef40dc8
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
13 changed files with 704 additions and 668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -218,6 +218,10 @@
android:name=".contacts.ContactsActivity" android:name=".contacts.ContactsActivity"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme" />
<activity
android:name=".chat.ChatActivity"
android:theme="@style/AppTheme" />
<receiver android:name=".receivers.PackageReplacedReceiver" <receiver android:name=".receivers.PackageReplacedReceiver"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>

84
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -39,6 +39,7 @@ import com.nextcloud.talk.BuildConfig
import com.nextcloud.talk.R import com.nextcloud.talk.R
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.chat.ChatActivity
import com.nextcloud.talk.controllers.ConversationsListController import com.nextcloud.talk.controllers.ConversationsListController
import com.nextcloud.talk.controllers.LockedController import com.nextcloud.talk.controllers.LockedController
import com.nextcloud.talk.controllers.ServerSelectionController import com.nextcloud.talk.controllers.ServerSelectionController
@ -56,7 +57,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACTIVE_CONVERSATION
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_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.bundle.BundleKeys.KEY_USER_ENTITY import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USER_ENTITY
import com.nextcloud.talk.utils.remapchat.ConductorRemapping.remapChatController
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.SingleObserver import io.reactivex.SingleObserver
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
@ -93,16 +93,22 @@ class MainActivity : BaseActivity(), ActionBarProvider {
router = Conductor.attachRouter(this, binding.controllerContainer, savedInstanceState) router = Conductor.attachRouter(this, binding.controllerContainer, savedInstanceState)
// TODO: delete this. open chats directly via intent
if (intent.getBooleanExtra(BundleKeys.KEY_OPEN_CHAT, false)) { if (intent.getBooleanExtra(BundleKeys.KEY_OPEN_CHAT, false)) {
logRouterBackStack(router!!) logRouterBackStack(router!!)
remapChatController( // remapChatController(
router!!, // router!!,
intent.getParcelableExtra<User>(KEY_USER_ENTITY)!!.id!!, // intent.getParcelableExtra<User>(KEY_USER_ENTITY)!!.id!!,
intent.getStringExtra(KEY_ROOM_TOKEN)!!, // intent.getStringExtra(KEY_ROOM_TOKEN)!!,
intent.extras!!, // intent.extras!!,
true, // true,
true // true
) // )
val intent = Intent(context, ChatActivity::class.java)
intent.putExtras(intent.extras!!)
startActivity(intent)
logRouterBackStack(router!!) logRouterBackStack(router!!)
} }
@ -306,13 +312,17 @@ class MainActivity : BaseActivity(), ActionBarProvider {
KEY_ACTIVE_CONVERSATION, KEY_ACTIVE_CONVERSATION,
Parcels.wrap(roomOverall.ocs!!.data) Parcels.wrap(roomOverall.ocs!!.data)
) )
remapChatController( // remapChatController(
router!!, // router!!,
currentUser!!.id!!, // currentUser!!.id!!,
roomOverall.ocs!!.data!!.token!!, // roomOverall.ocs!!.data!!.token!!,
bundle, // bundle,
true // true
) // )
val intent = Intent(context, ChatActivity::class.java)
intent.putExtras(bundle)
startActivity(intent)
} }
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
@ -367,14 +377,19 @@ class MainActivity : BaseActivity(), ActionBarProvider {
if (intent.getBooleanExtra(BundleKeys.KEY_SWITCH_TO_ROOM_AND_START_CALL, false)) { if (intent.getBooleanExtra(BundleKeys.KEY_SWITCH_TO_ROOM_AND_START_CALL, false)) {
logRouterBackStack(router!!) logRouterBackStack(router!!)
remapChatController( // remapChatController(
router!!, // router!!,
intent.getParcelableExtra<User>(KEY_USER_ENTITY)!!.id!!, // intent.getParcelableExtra<User>(KEY_USER_ENTITY)!!.id!!,
intent.getStringExtra(KEY_ROOM_TOKEN)!!, // intent.getStringExtra(KEY_ROOM_TOKEN)!!,
intent.extras!!, // intent.extras!!,
true, // true,
true // true
) // )
val intent = Intent(context, ChatActivity::class.java)
intent.putExtras(intent.extras!!)
startActivity(intent)
logRouterBackStack(router!!) logRouterBackStack(router!!)
} }
@ -388,14 +403,19 @@ class MainActivity : BaseActivity(), ActionBarProvider {
startActivity(callNotificationIntent) startActivity(callNotificationIntent)
} else { } else {
logRouterBackStack(router!!) logRouterBackStack(router!!)
remapChatController( // remapChatController(
router!!, // router!!,
intent.getParcelableExtra<User>(KEY_USER_ENTITY)!!.id!!, // intent.getParcelableExtra<User>(KEY_USER_ENTITY)!!.id!!,
intent.getStringExtra(KEY_ROOM_TOKEN)!!, // intent.getStringExtra(KEY_ROOM_TOKEN)!!,
intent.extras!!, // intent.extras!!,
true, // true,
true // true
) // )
val intent = Intent(context, ChatActivity::class.java)
intent.putExtras(intent.extras!!)
startActivity(intent)
logRouterBackStack(router!!) logRouterBackStack(router!!)
} }
} }

6
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
View File

@ -40,7 +40,7 @@ import coil.load
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding import com.nextcloud.talk.databinding.ItemCustomIncomingTextMessageBinding
import com.nextcloud.talk.extensions.loadBotsAvatar import com.nextcloud.talk.extensions.loadBotsAvatar
import com.nextcloud.talk.extensions.loadChangelogBotAvatar import com.nextcloud.talk.extensions.loadChangelogBotAvatar
@ -201,8 +201,8 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : MessageHolde
} }
binding.messageQuote.quotedChatMessageView.setOnClickListener() { binding.messageQuote.quotedChatMessageView.setOnClickListener() {
val chatController = commonMessageInterface as ChatController val chatActivity = commonMessageInterface as ChatActivity
chatController.jumpToQuotedMessage(parentChatMessage) chatActivity.jumpToQuotedMessage(parentChatMessage)
} }
} }

6
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
View File

@ -38,7 +38,7 @@ import com.google.android.flexbox.FlexboxLayout
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.databinding.ItemCustomOutcomingTextMessageBinding import com.nextcloud.talk.databinding.ItemCustomOutcomingTextMessageBinding
import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.chat.ReadStatus import com.nextcloud.talk.models.json.chat.ReadStatus
@ -172,8 +172,8 @@ class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewH
binding.messageQuote.quoteColoredView.setBackgroundColor(textColor) binding.messageQuote.quoteColoredView.setBackgroundColor(textColor)
binding.messageQuote.quotedChatMessageView.setOnClickListener() { binding.messageQuote.quotedChatMessageView.setOnClickListener() {
val chatController = commonMessageInterface as ChatController val chatActivity = commonMessageInterface as ChatActivity
chatController.jumpToQuotedMessage(parentChatMessage) chatActivity.jumpToQuotedMessage(parentChatMessage)
} }
} }

32
app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java
View File

@ -20,7 +20,7 @@
package com.nextcloud.talk.adapters.messages; package com.nextcloud.talk.adapters.messages;
import com.nextcloud.talk.controllers.ChatController; import com.nextcloud.talk.chat.ChatActivity;
import com.stfalcon.chatkit.commons.ImageLoader; import com.stfalcon.chatkit.commons.ImageLoader;
import com.stfalcon.chatkit.commons.ViewHolder; import com.stfalcon.chatkit.commons.ViewHolder;
import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IMessage;
@ -30,15 +30,15 @@ import com.stfalcon.chatkit.messages.MessagesListAdapter;
import java.util.List; import java.util.List;
public class TalkMessagesListAdapter<M extends IMessage> extends MessagesListAdapter<M> { public class TalkMessagesListAdapter<M extends IMessage> extends MessagesListAdapter<M> {
private final ChatController chatController; private final ChatActivity chatActivity;
public TalkMessagesListAdapter( public TalkMessagesListAdapter(
String senderId, String senderId,
MessageHolders holders, MessageHolders holders,
ImageLoader imageLoader, ImageLoader imageLoader,
ChatController chatController) { ChatActivity chatActivity) {
super(senderId, holders, imageLoader); super(senderId, holders, imageLoader);
this.chatController = chatController; this.chatActivity = chatActivity;
} }
public List<MessagesListAdapter.Wrapper> getItems() { public List<MessagesListAdapter.Wrapper> getItems() {
@ -50,30 +50,30 @@ public class TalkMessagesListAdapter<M extends IMessage> extends MessagesListAda
super.onBindViewHolder(holder, position); super.onBindViewHolder(holder, position);
if (holder instanceof IncomingTextMessageViewHolder) { if (holder instanceof IncomingTextMessageViewHolder) {
((IncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((IncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof OutcomingTextMessageViewHolder) { } else if (holder instanceof OutcomingTextMessageViewHolder) {
((OutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((OutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof IncomingLocationMessageViewHolder) { } else if (holder instanceof IncomingLocationMessageViewHolder) {
((IncomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((IncomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof OutcomingLocationMessageViewHolder) { } else if (holder instanceof OutcomingLocationMessageViewHolder) {
((OutcomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((OutcomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof IncomingLinkPreviewMessageViewHolder) { } else if (holder instanceof IncomingLinkPreviewMessageViewHolder) {
((IncomingLinkPreviewMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((IncomingLinkPreviewMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof OutcomingLinkPreviewMessageViewHolder) { } else if (holder instanceof OutcomingLinkPreviewMessageViewHolder) {
((OutcomingLinkPreviewMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((OutcomingLinkPreviewMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof IncomingVoiceMessageViewHolder) { } else if (holder instanceof IncomingVoiceMessageViewHolder) {
((IncomingVoiceMessageViewHolder) holder).assignVoiceMessageInterface(chatController); ((IncomingVoiceMessageViewHolder) holder).assignVoiceMessageInterface(chatActivity);
((IncomingVoiceMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((IncomingVoiceMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof OutcomingVoiceMessageViewHolder) { } else if (holder instanceof OutcomingVoiceMessageViewHolder) {
((OutcomingVoiceMessageViewHolder) holder).assignVoiceMessageInterface(chatController); ((OutcomingVoiceMessageViewHolder) holder).assignVoiceMessageInterface(chatActivity);
((OutcomingVoiceMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((OutcomingVoiceMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} else if (holder instanceof PreviewMessageViewHolder) { } else if (holder instanceof PreviewMessageViewHolder) {
((PreviewMessageViewHolder) holder).assignPreviewMessageInterface(chatController); ((PreviewMessageViewHolder) holder).assignPreviewMessageInterface(chatActivity);
((PreviewMessageViewHolder) holder).assignCommonMessageInterface(chatController); ((PreviewMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
} }
} }
} }

798
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt → app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

File diff suppressed because it is too large Load Diff

25
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.kt
View File

@ -75,6 +75,7 @@ import com.nextcloud.talk.adapters.items.MessagesTextHeaderItem
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.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.contacts.ContactsActivity import com.nextcloud.talk.contacts.ContactsActivity
import com.nextcloud.talk.controllers.base.BaseController import com.nextcloud.talk.controllers.base.BaseController
import com.nextcloud.talk.controllers.util.viewBinding import com.nextcloud.talk.controllers.util.viewBinding
@ -87,7 +88,6 @@ import com.nextcloud.talk.jobs.AccountRemovalWorker
import com.nextcloud.talk.jobs.ContactAddressBookWorker.Companion.run import com.nextcloud.talk.jobs.ContactAddressBookWorker.Companion.run
import com.nextcloud.talk.jobs.DeleteConversationWorker import com.nextcloud.talk.jobs.DeleteConversationWorker
import com.nextcloud.talk.jobs.UploadAndShareFilesWorker import com.nextcloud.talk.jobs.UploadAndShareFilesWorker
import com.nextcloud.talk.jobs.UploadAndShareFilesWorker.Companion.requestStoragePermission
import com.nextcloud.talk.messagesearch.MessageSearchHelper import com.nextcloud.talk.messagesearch.MessageSearchHelper
import com.nextcloud.talk.messagesearch.MessageSearchHelper.MessageSearchResults import com.nextcloud.talk.messagesearch.MessageSearchHelper.MessageSearchResults
import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.Conversation
@ -120,7 +120,6 @@ import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isServerEOL
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUnifiedSearchAvailable import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUnifiedSearchAvailable
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUserStatusAvailable import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUserStatusAvailable
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
import com.nextcloud.talk.utils.remapchat.ConductorRemapping.remapChatController
import com.nextcloud.talk.utils.rx.SearchViewObservable.Companion.observeSearchView import com.nextcloud.talk.utils.rx.SearchViewObservable.Companion.observeSearchView
import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
@ -996,7 +995,8 @@ class ConversationsListController(bundle: Bundle) :
) )
} }
} else { } else {
requestStoragePermission(this@ConversationsListController) // TODO
// requestStoragePermission(this@ConversationsListController)
} }
} }
@ -1132,13 +1132,18 @@ class ConversationsListController(bundle: Bundle) :
bundle.putString(BundleKeys.KEY_MESSAGE_ID, selectedMessageId) bundle.putString(BundleKeys.KEY_MESSAGE_ID, selectedMessageId)
selectedMessageId = null selectedMessageId = null
} }
remapChatController( // remapChatController(
router, // router,
currentUser!!.id!!, // currentUser!!.id!!,
selectedConversation!!.token!!, // selectedConversation!!.token!!,
bundle, // bundle,
false // false
) // )
val intent = Intent(context, ChatActivity::class.java)
intent.putExtras(bundle)
startActivity(intent)
clearIntentAction() clearIntentAction()
} }

10
app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt
View File

@ -21,6 +21,7 @@
package com.nextcloud.talk.jobs package com.nextcloud.talk.jobs
import android.Manifest import android.Manifest
import android.app.Activity
import android.app.Notification import android.app.Notification
import android.app.NotificationManager import android.app.NotificationManager
import android.app.PendingIntent import android.app.PendingIntent
@ -39,7 +40,6 @@ import androidx.work.WorkManager
import androidx.work.Worker import androidx.work.Worker
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import autodagger.AutoInjector import autodagger.AutoInjector
import com.bluelinelabs.conductor.Controller
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.MainActivity import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
@ -288,11 +288,11 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
private const val ZERO_PERCENT = 0 private const val ZERO_PERCENT = 0
const val REQUEST_PERMISSION = 3123 const val REQUEST_PERMISSION = 3123
fun requestStoragePermission(controller: Controller) { fun requestStoragePermission(activity: Activity) {
when { when {
Build.VERSION Build.VERSION
.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> { .SDK_INT >= Build.VERSION_CODES.TIRAMISU -> {
controller.requestPermissions( activity.requestPermissions(
arrayOf( arrayOf(
Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.READ_MEDIA_VIDEO, Manifest.permission.READ_MEDIA_VIDEO,
@ -302,7 +302,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
) )
} }
Build.VERSION.SDK_INT > Build.VERSION_CODES.Q -> { Build.VERSION.SDK_INT > Build.VERSION_CODES.Q -> {
controller.requestPermissions( activity.requestPermissions(
arrayOf( arrayOf(
Manifest.permission.READ_EXTERNAL_STORAGE Manifest.permission.READ_EXTERNAL_STORAGE
), ),
@ -310,7 +310,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa
) )
} }
else -> { else -> {
controller.requestPermissions( activity.requestPermissions(
arrayOf( arrayOf(
Manifest.permission.WRITE_EXTERNAL_STORAGE Manifest.permission.WRITE_EXTERNAL_STORAGE
), ),

20
app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt
View File

@ -28,7 +28,6 @@ import android.util.Log
import com.afollestad.materialdialogs.LayoutMode import com.afollestad.materialdialogs.LayoutMode
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet import com.afollestad.materialdialogs.bottomsheets.BottomSheet
import com.bluelinelabs.conductor.Router
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage
@ -42,7 +41,6 @@ import com.nextcloud.talk.ui.bottom.sheet.ProfileBottomSheet.AllowedAppIds.PROFI
import com.nextcloud.talk.ui.bottom.sheet.ProfileBottomSheet.AllowedAppIds.SPREED import com.nextcloud.talk.ui.bottom.sheet.ProfileBottomSheet.AllowedAppIds.SPREED
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys
import com.nextcloud.talk.utils.remapchat.ConductorRemapping
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
@ -51,7 +49,7 @@ import org.parceler.Parcels
private const val TAG = "ProfileBottomSheet" private const val TAG = "ProfileBottomSheet"
class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Router) { class ProfileBottomSheet(val ncApi: NcApi, val userModel: User) {
private val allowedAppIds = listOf(SPREED.stringValue, PROFILE.stringValue, EMAIL.stringValue) private val allowedAppIds = listOf(SPREED.stringValue, PROFILE.stringValue, EMAIL.stringValue)
@ -170,13 +168,15 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout
BundleKeys.KEY_ACTIVE_CONVERSATION, BundleKeys.KEY_ACTIVE_CONVERSATION,
Parcels.wrap(roomOverall.ocs!!.data) Parcels.wrap(roomOverall.ocs!!.data)
) )
ConductorRemapping.remapChatController(
router, // TODO
userModel.id!!, // ConductorRemapping.remapChatController(
roomOverall.ocs!!.data!!.token!!, // router,
bundle, // userModel.id!!,
true // roomOverall.ocs!!.data!!.token!!,
) // bundle,
// true
// )
} }
override fun onError(e: Throwable) { override fun onError(e: Throwable) {

28
app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt
View File

@ -32,14 +32,14 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.databinding.DialogAttachmentBinding import com.nextcloud.talk.databinding.DialogAttachmentBinding
import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
import javax.inject.Inject import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class AttachmentDialog(val activity: Activity, var chatController: ChatController) : BottomSheetDialog(activity) { class AttachmentDialog(val activity: Activity, var chatActivity: ChatActivity) : BottomSheetDialog(activity) {
@Inject @Inject
lateinit var viewThemeUtils: ViewThemeUtils lateinit var viewThemeUtils: ViewThemeUtils
@ -61,8 +61,8 @@ class AttachmentDialog(val activity: Activity, var chatController: ChatControlle
} }
private fun initItemsStrings() { private fun initItemsStrings() {
var serverName = CapabilitiesUtilNew.getServerName(chatController.conversationUser) var serverName = CapabilitiesUtilNew.getServerName(chatActivity.conversationUser)
dialogAttachmentBinding.txtAttachFileFromCloud.text = chatController.resources?.let { dialogAttachmentBinding.txtAttachFileFromCloud.text = chatActivity.resources?.let {
if (serverName.isNullOrEmpty()) { if (serverName.isNullOrEmpty()) {
serverName = it.getString(R.string.nc_server_product_name) serverName = it.getString(R.string.nc_server_product_name)
} }
@ -72,15 +72,15 @@ class AttachmentDialog(val activity: Activity, var chatController: ChatControlle
private fun initItemsVisibility() { private fun initItemsVisibility() {
if (!CapabilitiesUtilNew.hasSpreedFeatureCapability( if (!CapabilitiesUtilNew.hasSpreedFeatureCapability(
chatController.conversationUser, chatActivity.conversationUser,
"geo-location-sharing" "geo-location-sharing"
) )
) { ) {
dialogAttachmentBinding.menuShareLocation.visibility = View.GONE dialogAttachmentBinding.menuShareLocation.visibility = View.GONE
} }
if (!CapabilitiesUtilNew.hasSpreedFeatureCapability(chatController.conversationUser, "talk-polls") || if (!CapabilitiesUtilNew.hasSpreedFeatureCapability(chatActivity.conversationUser, "talk-polls") ||
chatController.isOneToOneConversation() chatActivity.isOneToOneConversation()
) { ) {
dialogAttachmentBinding.menuAttachPoll.visibility = View.GONE dialogAttachmentBinding.menuAttachPoll.visibility = View.GONE
} }
@ -92,37 +92,37 @@ class AttachmentDialog(val activity: Activity, var chatController: ChatControlle
private fun initItemsClickListeners() { private fun initItemsClickListeners() {
dialogAttachmentBinding.menuShareLocation.setOnClickListener { dialogAttachmentBinding.menuShareLocation.setOnClickListener {
chatController.showShareLocationScreen() chatActivity.showShareLocationScreen()
dismiss() dismiss()
} }
dialogAttachmentBinding.menuAttachFileFromLocal.setOnClickListener { dialogAttachmentBinding.menuAttachFileFromLocal.setOnClickListener {
chatController.sendSelectLocalFileIntent() chatActivity.sendSelectLocalFileIntent()
dismiss() dismiss()
} }
dialogAttachmentBinding.menuAttachPictureFromCam.setOnClickListener { dialogAttachmentBinding.menuAttachPictureFromCam.setOnClickListener {
chatController.sendPictureFromCamIntent() chatActivity.sendPictureFromCamIntent()
dismiss() dismiss()
} }
dialogAttachmentBinding.menuAttachVideoFromCam.setOnClickListener { dialogAttachmentBinding.menuAttachVideoFromCam.setOnClickListener {
chatController.sendVideoFromCamIntent() chatActivity.sendVideoFromCamIntent()
dismiss() dismiss()
} }
dialogAttachmentBinding.menuAttachPoll.setOnClickListener { dialogAttachmentBinding.menuAttachPoll.setOnClickListener {
chatController.createPoll() chatActivity.createPoll()
dismiss() dismiss()
} }
dialogAttachmentBinding.menuAttachFileFromCloud.setOnClickListener { dialogAttachmentBinding.menuAttachFileFromCloud.setOnClickListener {
chatController.showBrowserScreen() chatActivity.showBrowserScreen()
dismiss() dismiss()
} }
dialogAttachmentBinding.menuAttachContact.setOnClickListener { dialogAttachmentBinding.menuAttachContact.setOnClickListener {
chatController.sendChooseContactIntent() chatActivity.sendChooseContactIntent()
dismiss() dismiss()
} }
} }

22
app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
View File

@ -37,7 +37,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.controllers.ChatController import com.nextcloud.talk.chat.ChatActivity
import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.DialogMessageActionsBinding import com.nextcloud.talk.databinding.DialogMessageActionsBinding
import com.nextcloud.talk.models.domain.ReactionAddedModel import com.nextcloud.talk.models.domain.ReactionAddedModel
@ -59,13 +59,13 @@ import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class MessageActionsDialog( class MessageActionsDialog(
private val chatController: ChatController, private val chatActivity: ChatActivity,
private val message: ChatMessage, private val message: ChatMessage,
private val user: User?, private val user: User?,
private val currentConversation: Conversation?, private val currentConversation: Conversation?,
private val showMessageDeletionButton: Boolean, private val showMessageDeletionButton: Boolean,
private val hasChatPermission: Boolean private val hasChatPermission: Boolean
) : BottomSheetDialog(chatController.activity!!) { ) : BottomSheetDialog(chatActivity) {
@Inject @Inject
lateinit var viewThemeUtils: ViewThemeUtils lateinit var viewThemeUtils: ViewThemeUtils
@ -233,7 +233,7 @@ class MessageActionsDialog(
private fun initMenuMarkAsUnread(visible: Boolean) { private fun initMenuMarkAsUnread(visible: Boolean) {
if (visible) { if (visible) {
dialogMessageActionsBinding.menuMarkAsUnread.setOnClickListener { dialogMessageActionsBinding.menuMarkAsUnread.setOnClickListener {
chatController.markAsUnread(message) chatActivity.markAsUnread(message)
dismiss() dismiss()
} }
} }
@ -244,7 +244,7 @@ class MessageActionsDialog(
private fun initMenuForwardMessage(visible: Boolean) { private fun initMenuForwardMessage(visible: Boolean) {
if (visible) { if (visible) {
dialogMessageActionsBinding.menuForwardMessage.setOnClickListener { dialogMessageActionsBinding.menuForwardMessage.setOnClickListener {
chatController.forwardMessage(message) chatActivity.forwardMessage(message)
dismiss() dismiss()
} }
} }
@ -255,7 +255,7 @@ class MessageActionsDialog(
private fun initMenuDeleteMessage(visible: Boolean) { private fun initMenuDeleteMessage(visible: Boolean) {
if (visible) { if (visible) {
dialogMessageActionsBinding.menuDeleteMessage.setOnClickListener { dialogMessageActionsBinding.menuDeleteMessage.setOnClickListener {
chatController.deleteMessage(message) chatActivity.deleteMessage(message)
dismiss() dismiss()
} }
} }
@ -266,7 +266,7 @@ class MessageActionsDialog(
private fun initMenuReplyPrivately(visible: Boolean) { private fun initMenuReplyPrivately(visible: Boolean) {
if (visible) { if (visible) {
dialogMessageActionsBinding.menuReplyPrivately.setOnClickListener { dialogMessageActionsBinding.menuReplyPrivately.setOnClickListener {
chatController.replyPrivately(message) chatActivity.replyPrivately(message)
dismiss() dismiss()
} }
} }
@ -277,7 +277,7 @@ class MessageActionsDialog(
private fun initMenuReplyToMessage(visible: Boolean) { private fun initMenuReplyToMessage(visible: Boolean) {
if (visible) { if (visible) {
dialogMessageActionsBinding.menuReplyToMessage.setOnClickListener { dialogMessageActionsBinding.menuReplyToMessage.setOnClickListener {
chatController.replyToMessage(message) chatActivity.replyToMessage(message)
dismiss() dismiss()
} }
} }
@ -288,7 +288,7 @@ class MessageActionsDialog(
private fun initMenuItemCopy(visible: Boolean) { private fun initMenuItemCopy(visible: Boolean) {
if (visible) { if (visible) {
dialogMessageActionsBinding.menuCopyMessage.setOnClickListener { dialogMessageActionsBinding.menuCopyMessage.setOnClickListener {
chatController.copyMessage(message) chatActivity.copyMessage(message)
dismiss() dismiss()
} }
} }
@ -325,7 +325,7 @@ class MessageActionsDialog(
override fun onNext(reactionAddedModel: ReactionAddedModel) { override fun onNext(reactionAddedModel: ReactionAddedModel) {
if (reactionAddedModel.success) { if (reactionAddedModel.success) {
chatController.updateUiToAddReaction( chatActivity.updateUiToAddReaction(
reactionAddedModel.chatMessage, reactionAddedModel.chatMessage,
reactionAddedModel.emoji reactionAddedModel.emoji
) )
@ -348,7 +348,7 @@ class MessageActionsDialog(
override fun onNext(reactionDeletedModel: ReactionDeletedModel) { override fun onNext(reactionDeletedModel: ReactionDeletedModel) {
if (reactionDeletedModel.success) { if (reactionDeletedModel.success) {
chatController.updateUiToDeleteReaction( chatActivity.updateUiToDeleteReaction(
reactionDeletedModel.chatMessage, reactionDeletedModel.chatMessage,
reactionDeletedModel.emoji reactionDeletedModel.emoji
) )

228
app/src/main/java/com/nextcloud/talk/utils/remapchat/ConductorRemapping.kt
View File

@ -20,128 +20,118 @@
package com.nextcloud.talk.utils.remapchat package com.nextcloud.talk.utils.remapchat
import android.os.Bundle
import android.util.Log
import com.bluelinelabs.conductor.Router
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler
import com.nextcloud.talk.controllers.ChatController
import com.nextcloud.talk.controllers.ConversationsListController
import com.nextcloud.talk.controllers.LockedController
object ConductorRemapping { object ConductorRemapping {
private val TAG = ConductorRemapping::class.simpleName private val TAG = ConductorRemapping::class.simpleName
fun remapChatController( // fun remapChatController(
router: Router, // router: Router,
internalUserId: Long, // internalUserId: Long,
roomTokenOrId: String, // roomTokenOrId: String,
bundle: Bundle, // bundle: Bundle,
replaceTop: Boolean // replaceTop: Boolean
) { // ) {
remapChatController(router, internalUserId, roomTokenOrId, bundle, replaceTop, false) // remapChatController(router, internalUserId, roomTokenOrId, bundle, replaceTop, false)
} // }
fun remapChatController( // fun remapChatController(
router: Router, // router: Router,
internalUserId: Long, // internalUserId: Long,
roomTokenOrId: String, // roomTokenOrId: String,
bundle: Bundle, // bundle: Bundle,
replaceTop: Boolean, // replaceTop: Boolean,
pushImmediately: Boolean // pushImmediately: Boolean
) { // ) {
val chatControllerTag = "$internalUserId@$roomTokenOrId" // val chatControllerTag = "$internalUserId@$roomTokenOrId"
//
if (router.getControllerWithTag(chatControllerTag) != null) { // if (router.getControllerWithTag(chatControllerTag) != null) {
moveControllerToTop(router, chatControllerTag) // moveControllerToTop(router, chatControllerTag)
} else { // } else {
val pushChangeHandler = if (pushImmediately) { // val pushChangeHandler = if (pushImmediately) {
SimpleSwapChangeHandler() // SimpleSwapChangeHandler()
} else { // } else {
HorizontalChangeHandler() // HorizontalChangeHandler()
} // }
//
if (router.hasRootController()) { // if (router.hasRootController()) {
val backstack = router.backstack // val backstack = router.backstack
val topController = backstack[router.backstackSize - 1].controller // val topController = backstack[router.backstackSize - 1].controller
//
val remapChatModel = RemapChatModel( // val remapChatModel = RemapChatModel(
router, // router,
pushChangeHandler, // pushChangeHandler,
chatControllerTag, // chatControllerTag,
bundle // bundle
) // )
//
if (topController is ChatController) { // if (topController is ChatActivity) {
if (replaceTop) { // if (replaceTop) {
topController.leaveRoom(remapChatModel, this::replaceTopController) // topController.leaveRoom(remapChatModel, this::replaceTopController)
} else { // } else {
topController.leaveRoom(remapChatModel, this::pushController) // topController.leaveRoom(remapChatModel, this::pushController)
} // }
} else { // } else {
if (replaceTop) { // if (replaceTop) {
replaceTopController(remapChatModel) // replaceTopController(remapChatModel)
} else { // } else {
pushController(remapChatModel) // pushController(remapChatModel)
} // }
} // }
} else { // } else {
Log.d(TAG, "router has no RootController. creating backstack with ConversationsListController") // Log.d(TAG, "router has no RootController. creating backstack with ConversationsListController")
val newBackstack = listOf( // val newBackstack = listOf(
RouterTransaction.with(ConversationsListController(Bundle())) // RouterTransaction.with(ConversationsListController(Bundle()))
.pushChangeHandler(HorizontalChangeHandler()) // .pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()), // .popChangeHandler(HorizontalChangeHandler()),
RouterTransaction.with(ChatController(bundle)) // RouterTransaction.with(ChatActivity(bundle))
.pushChangeHandler(HorizontalChangeHandler()) // .pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()) // .popChangeHandler(HorizontalChangeHandler())
.tag(chatControllerTag) // .tag(chatControllerTag)
) // )
router.setBackstack(newBackstack, SimpleSwapChangeHandler()) // router.setBackstack(newBackstack, SimpleSwapChangeHandler())
} // }
} // }
//
if (router.getControllerWithTag(LockedController.TAG) != null) { // if (router.getControllerWithTag(LockedController.TAG) != null) {
moveControllerToTop(router, LockedController.TAG) // moveControllerToTop(router, LockedController.TAG)
} // }
} // }
//
fun pushController(remapChatModel: RemapChatModel) { // fun pushController(remapChatModel: RemapChatModel) {
Log.d(TAG, "pushController") // Log.d(TAG, "pushController")
remapChatModel.router.pushController( // remapChatModel.router.pushController(
RouterTransaction.with(ChatController(remapChatModel.bundle)) // RouterTransaction.with(ChatActivity(remapChatModel.bundle))
.pushChangeHandler(remapChatModel.controllerChangeHandler) // .pushChangeHandler(remapChatModel.controllerChangeHandler)
.popChangeHandler(HorizontalChangeHandler()) // .popChangeHandler(HorizontalChangeHandler())
.tag(remapChatModel.chatControllerTag) // .tag(remapChatModel.chatControllerTag)
) // )
} // }
//
private fun replaceTopController(remapChatModel: RemapChatModel) { // private fun replaceTopController(remapChatModel: RemapChatModel) {
Log.d(TAG, "replaceTopController") // Log.d(TAG, "replaceTopController")
remapChatModel.router.replaceTopController( // remapChatModel.router.replaceTopController(
RouterTransaction.with(ChatController(remapChatModel.bundle)) // RouterTransaction.with(ChatActivity(remapChatModel.bundle))
.pushChangeHandler(remapChatModel.controllerChangeHandler) // .pushChangeHandler(remapChatModel.controllerChangeHandler)
.popChangeHandler(HorizontalChangeHandler()) // .popChangeHandler(HorizontalChangeHandler())
.tag(remapChatModel.chatControllerTag) // .tag(remapChatModel.chatControllerTag)
) // )
} // }
//
private fun moveControllerToTop(router: Router, controllerTag: String) { // private fun moveControllerToTop(router: Router, controllerTag: String) {
Log.d(TAG, "moving $controllerTag to top...") // Log.d(TAG, "moving $controllerTag to top...")
val backstack = router.backstack // val backstack = router.backstack
var routerTransaction: RouterTransaction? = null // var routerTransaction: RouterTransaction? = null
for (i in 0 until router.backstackSize) { // for (i in 0 until router.backstackSize) {
if (controllerTag == backstack[i].tag()) { // if (controllerTag == backstack[i].tag()) {
routerTransaction = backstack[i] // routerTransaction = backstack[i]
backstack.remove(routerTransaction) // backstack.remove(routerTransaction)
Log.d(TAG, "removed controller: " + routerTransaction.controller) // Log.d(TAG, "removed controller: " + routerTransaction.controller)
break // break
} // }
} // }
//
backstack.add(routerTransaction) // backstack.add(routerTransaction)
Log.d(TAG, "added controller to top: " + routerTransaction!!.controller) // Log.d(TAG, "added controller to top: " + routerTransaction!!.controller)
router.setBackstack(backstack, HorizontalChangeHandler()) // router.setBackstack(backstack, HorizontalChangeHandler())
} // }
} }

17
app/src/main/res/layout/controller_chat.xml
View File

@ -32,6 +32,23 @@
android:background="@color/bg_default" android:background="@color/bg_default"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/chat_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/chat_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/appbar"
android:theme="?attr/actionBarPopupTheme"
app:layout_scrollFlags="scroll|enterAlways"
app:navigationIconTint="@color/fontAppbar"
app:popupTheme="@style/appActionBarPopupMenu"
app:titleTextColor="@color/fontAppbar"
tools:title="@string/nc_app_product_name" />
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"