[stable-20.0] Fixing remind-me-later options

app/build.gradle

@@ -40,8 +40,8 @@ android {
 
         // mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable)
         // xx   .xxx  .xx    .xx
-        versionCode 200000001
-        versionName "20.0.0 Alpha 01"
+        versionCode 200000051
+        versionName "20.0.0 RC1"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt

@@ -232,7 +232,7 @@ class ConversationItem(
 
                 val text =
                     if (
-                        chatMessage?.messageType === MessageType.REGULAR_TEXT_MESSAGE.toString()
+                        chatMessage?.getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE
                     ) {
                         calculateRegularLastMessageText(appContext)
                     } else {
@@ -252,6 +252,8 @@ class ConversationItem(
                 appContext.getString(R.string.nc_formatted_message_you),
                 lastMessageDisplayText
             )
+        } else if (model.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
+            lastMessageDisplayText
         } else {
             val authorDisplayName =
                 if (!TextUtils.isEmpty(chatMessage?.actorDisplayName)) {

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -162,7 +162,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_INTERNAL_USER_ID
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_BREAKOUT_ROOM
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_IS_MODERATOR
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_RECORDING_STATE
-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_START_CALL_AFTER_ROOM_SWITCH
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SWITCH_TO_ROOM
@@ -187,7 +186,6 @@ import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import retrofit2.HttpException
-import retrofit2.Response
 import java.io.File
 import java.io.IOException
 import java.net.HttpURLConnection
@@ -333,6 +331,8 @@ class ChatActivity :
         }
     }
 
+    private lateinit var messageInputFragment: MessageInputFragment
+
     val typingParticipants = HashMap<String, TypingParticipant>()
 
     var callStarted = false
@@ -399,6 +399,8 @@ class ChatActivity :
         setContentView(binding.root)
         setupSystemColors()
 
+        messageInputFragment = MessageInputFragment()
+
         conversationUser = currentUserProvider.currentUser.blockingGet()
 
         handleIntent(intent)
@@ -580,7 +582,7 @@ class ChatActivity :
 
                     supportFragmentManager.commit {
                         setReorderingAllowed(true) // optimizes out redundant replace operations
-                        replace(R.id.fragment_container_activity_chat, MessageInputFragment())
+                        replace(R.id.fragment_container_activity_chat, messageInputFragment)
                     }
 
                     joinRoomWithPassword()

app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt

@@ -136,9 +136,13 @@ class MessageInputFragment : Fragment() {
         return binding.root
     }
 
+    override fun onPause() {
+        super.onPause()
+        saveState()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
-        saveState()
         if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
             mentionAutocomplete?.dismissPopup()
         }
@@ -189,7 +193,7 @@ class MessageInputFragment : Fragment() {
                 animation.duration = 3000
                 animation.interpolator = LinearInterpolator()
                 binding.fragmentConnectionLost.setBackgroundColor(resources.getColor(R.color.hwSecurityGreen))
-                binding.fragmentConnectionLost.text = getString(R.string.connection_gained)
+                binding.fragmentConnectionLost.text = getString(R.string.connection_established)
                 binding.fragmentConnectionLost.startAnimation(animation)
                 binding.fragmentConnectionLost.animation.setAnimationListener(object : AnimationListener {
                     override fun onAnimationStart(animation: Animation?) {

app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt

@@ -407,7 +407,9 @@ data class ChatMessage(
         BREAKOUT_ROOMS_STARTED,
         BREAKOUT_ROOMS_STOPPED,
         AVATAR_SET,
-        AVATAR_REMOVED
+        AVATAR_REMOVED,
+        FEDERATED_USER_ADDED,
+        FEDERATED_USER_REMOVED
     }
 
     companion object {

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -374,7 +374,8 @@ class ConversationsListActivity :
             conversationsListViewModel.getRoomsFlow
                 .onEach { list ->
                     // Update Conversations
-                    conversationItems.clear()
+                    conversationItemsWithHeader.clear()
+                    conversationItems.clear() // fixme remove this
                     for (conversation in list) {
                         addToConversationItems(conversation)
                     }
@@ -539,6 +540,12 @@ class ConversationsListActivity :
             if (searchManager != null) {
                 searchView!!.setSearchableInfo(searchManager.getSearchableInfo(componentName))
             }
+            initSearchDisposable()
+        }
+    }
+
+    private fun initSearchDisposable() {
+        if (searchViewDisposable == null || searchViewDisposable?.isDisposed == true) {
             searchViewDisposable = observeSearchView(searchView!!)
                 .debounce { query: String? ->
                     if (TextUtils.isEmpty(query)) {
@@ -619,17 +626,31 @@ class ConversationsListActivity :
                 showSearchView(searchView, searchItem)
                 viewThemeUtils.platform.themeStatusBar(this)
             }
-            searchView!!.setOnCloseListener {
+            searchView!!.findViewById<View>(R.id.search_close_btn).setOnClickListener {
                 if (TextUtils.isEmpty(searchView!!.query.toString())) {
                     searchView!!.onActionViewCollapsed()
                     viewThemeUtils.platform.resetStatusBar(this)
                 } else {
-                    searchView!!.post { searchView!!.setQuery(TAG, true) }
+                    resetSearchResults()
+                    searchView!!.setQuery("", false)
                 }
-                true
             }
+
+            searchView!!.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(p0: String?): Boolean {
+                    initSearchDisposable()
+                    return true
+                }
+
+                override fun onQueryTextChange(p0: String?): Boolean {
+                    this@ConversationsListActivity.onQueryTextChange(p0)
+                    return true
+                }
+            })
+
             searchItem!!.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
                 override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                    initSearchDisposable()
                     adapter!!.setHeadersShown(true)
                     if (!filterState.containsValue(true)) filterableConversationItems = searchableConversationItems
                     adapter!!.updateDataSet(filterableConversationItems, false)

app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt

@@ -31,6 +31,8 @@ import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.CONVERSA
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DESCRIPTION_REMOVED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DESCRIPTION_SET
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.DUMMY
+import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FEDERATED_USER_ADDED
+import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FEDERATED_USER_REMOVED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.FILE_SHARED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.GROUP_ADDED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.GROUP_REMOVED
@@ -136,6 +138,8 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
             "breakout_rooms_stopped" -> BREAKOUT_ROOMS_STOPPED
             "avatar_set" -> AVATAR_SET
             "avatar_removed" -> AVATAR_REMOVED
+            "federated_user_added" -> FEDERATED_USER_ADDED
+            "federated_user_removed" -> FEDERATED_USER_REMOVED
             else -> DUMMY
         }
     }
@@ -203,6 +207,8 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
             BREAKOUT_ROOMS_STOPPED -> "breakout_rooms_stopped"
             AVATAR_SET -> "avatar_set"
             AVATAR_REMOVED -> "avatar_removed"
+            FEDERATED_USER_ADDED -> "federated_user_added"
+            FEDERATED_USER_REMOVED -> "federated_user_removed"
             else -> ""
         }
     }

app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt

@@ -102,22 +102,20 @@ class DateTimePickerFragment : DialogFragment() {
             tomorrowTimeStamp = getTimeFromCalendar(
                 hour = HOUR_EIGHT_AM,
                 minute = 0,
-                daysToAdd = 1,
-                weekInYear =
-                currentWeekInYear + 1
+                daysToAdd = 1
             )
 
             binding.dateTimePickerWeekend.visibility = View.GONE // because today is the weekend
         } else {
             tomorrowTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, minute = 0, daysToAdd = 1)
-            weekendTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, day = Calendar.SATURDAY, minute = 0)
+            weekendTimeStamp = getTimeFromCalendar(hour = HOUR_EIGHT_AM, weekDay = Calendar.SATURDAY, minute = 0)
         }
         binding.dateTimePickerTomorrowTextview.text = getTimeFromTimeStamp(tomorrowTimeStamp)
         binding.dateTimePickerWeekendTextview.text = getTimeFromTimeStamp(weekendTimeStamp)
 
         nextWeekTimeStamp = getTimeFromCalendar(
             hour = HOUR_EIGHT_AM,
-            day = Calendar.MONDAY,
+            weekDay = Calendar.MONDAY,
             minute = 0,
             weekInYear =
             currentWeekInYear + 1
@@ -251,22 +249,25 @@ class DateTimePickerFragment : DialogFragment() {
         timePicker.show(this.parentFragmentManager, TAG)
     }
 
+    /**
+     * You can use `weekDay` or `daysToAdd` or neither but don't use both b/c it messes up the calendar
+     */
     @Suppress("LongParameterList")
     private fun getTimeFromCalendar(
         year: Int = Calendar.getInstance().get(Calendar.YEAR),
         month: Int = Calendar.getInstance().get(Calendar.MONTH),
-        day: Int = Calendar.getInstance().get(Calendar.DAY_OF_WEEK),
+        day: Int = Calendar.getInstance().get(Calendar.DAY_OF_YEAR),
         hour: Int = Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
         minute: Int = Calendar.getInstance().get(Calendar.MINUTE),
         daysToAdd: Int = 0,
-        weekInYear: Int = Calendar.getInstance().get(Calendar.WEEK_OF_YEAR)
+        weekInYear: Int = Calendar.getInstance().get(Calendar.WEEK_OF_YEAR),
+        weekDay: Int = -1
     ): Long {
         val calendar: Calendar = Calendar.getInstance().apply {
             set(Calendar.YEAR, year)
             set(Calendar.MONTH, month)
-            set(Calendar.DAY_OF_WEEK, day)
-            add(Calendar.DAY_OF_WEEK, daysToAdd)
-            set(Calendar.WEEK_OF_YEAR, weekInYear)
+            if (weekDay > -1) set(Calendar.DAY_OF_WEEK, weekDay) else set(Calendar.DAY_OF_YEAR, day)
+            if (daysToAdd > 0) add(Calendar.DAY_OF_YEAR, daysToAdd) else set(Calendar.WEEK_OF_YEAR, weekInYear)
             set(Calendar.HOUR_OF_DAY, hour)
             set(Calendar.MINUTE, minute)
             set(Calendar.SECOND, 0)

app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt

@@ -71,7 +71,7 @@ class FilterConversationFragment : DialogFragment() {
                 unreadFilterChip,
                 mentionedFilterChip
             )
-        }.forEach(viewThemeUtils.material::themeChipFilter)
+        }.forEach(viewThemeUtils.talk::themeChipFilter)
 
         setUpChips()
     }

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

@@ -87,12 +87,18 @@ class MessageActionsDialog(
         .before(Date(System.currentTimeMillis() - AGE_THRESHOLD_FOR_EDIT_MESSAGE))
 
     private val isUserAllowedToEdit = chatActivity.userAllowedByPrivilages(message)
-
-    private val isMessageEditable = hasSpreedFeatureCapability(
+    private var isNoTimeLimitOnNoteToSelf = hasSpreedFeatureCapability(
+        spreedCapabilities,
+        SpreedFeatures
+            .EDIT_MESSAGES_NOTE_TO_SELF
+    ) && currentConversation?.type == ConversationEnums.ConversationType.NOTE_TO_SELF
+    private var messageIsEditable = hasSpreedFeatureCapability(
         spreedCapabilities,
         SpreedFeatures.EDIT_MESSAGES
     ) && messageHasRegularText && !isOlderThanTwentyFourHours && isUserAllowedToEdit
 
+    private val isMessageEditable = isNoTimeLimitOnNoteToSelf || messageIsEditable
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         NextcloudTalkApplication.sharedApplication?.componentApplication?.inject(this)

app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt

@@ -7,6 +7,7 @@
  */
 package com.nextcloud.talk.ui.theme
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.res.ColorStateList
@@ -36,10 +37,12 @@ import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.ViewCompat
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
+import com.google.android.material.chip.Chip
 import com.google.android.material.materialswitch.MaterialSwitch
 import com.nextcloud.android.common.ui.theme.MaterialSchemes
 import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase
 import com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils
+import com.nextcloud.android.common.ui.util.buildColorStateList
 import com.nextcloud.talk.R
 import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
 import com.nextcloud.talk.ui.MicInputCloud
@@ -50,6 +53,7 @@ import com.nextcloud.talk.utils.DrawableUtils
 import com.nextcloud.talk.utils.message.MessageUtils
 import com.vanniktech.emoji.EmojiTextView
 import com.wooplr.spotlight.SpotlightView
+import dynamiccolor.DynamicScheme
 import dynamiccolor.MaterialDynamicColors
 import eu.davidea.flexibleadapter.utils.FlexibleUtils
 import javax.inject.Inject
@@ -214,6 +218,7 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         return drawable
     }
 
+    @SuppressLint("RestrictedApi")
     fun themeSearchView(searchView: SearchView) {
         withScheme(searchView) { scheme ->
             // hacky as no default way is provided
@@ -376,6 +381,48 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         }
     }
 
+    private fun chipOutlineFilterColorList(scheme: DynamicScheme) =
+        buildColorStateList(
+            android.R.attr.state_checked to dynamicColor.secondaryContainer().getArgb(scheme),
+            -android.R.attr.state_checked to dynamicColor.outline().getArgb(scheme)
+        )
+
+    fun themeChipFilter(chip: Chip) {
+        withScheme(chip.context) { scheme ->
+            val backgroundColors =
+                buildColorStateList(
+                    android.R.attr.state_checked to dynamicColor.secondaryContainer().getArgb(scheme),
+                    -android.R.attr.state_checked to dynamicColor.surface().getArgb(scheme),
+                    android.R.attr.state_focused to dynamicColor.secondaryContainer().getArgb(scheme),
+                    android.R.attr.state_hovered to dynamicColor.secondaryContainer().getArgb(scheme),
+                    android.R.attr.state_pressed to dynamicColor.secondaryContainer().getArgb(scheme)
+                )
+
+            val iconColors =
+                buildColorStateList(
+                    android.R.attr.state_checked to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    -android.R.attr.state_checked to dynamicColor.surfaceVariant().getArgb(scheme),
+                    android.R.attr.state_focused to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    android.R.attr.state_hovered to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    android.R.attr.state_pressed to dynamicColor.onSecondaryContainer().getArgb(scheme)
+                )
+
+            val textColors =
+                buildColorStateList(
+                    android.R.attr.state_checked to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    -android.R.attr.state_checked to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    android.R.attr.state_hovered to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    android.R.attr.state_focused to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                    android.R.attr.state_pressed to dynamicColor.onSecondaryContainer().getArgb(scheme)
+                )
+
+            chip.chipBackgroundColor = backgroundColors
+            chip.chipStrokeColor = chipOutlineFilterColorList(scheme)
+            chip.setTextColor(textColors)
+            chip.checkedIconTint = iconColors
+        }
+    }
+
     companion object {
         private val THEMEABLE_PLACEHOLDER_IDS = listOf(
             R.drawable.ic_mimetype_package_x_generic,

app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt

@@ -54,7 +54,8 @@ enum class SpreedFeatures(val value: String) {
     CONVERSATION_PERMISSION("conversation-permissions"),
     FEDERATION_V1("federation-v1"),
     DELETE_MESSAGES_UNLIMITED("delete-messages-unlimited"),
-    BAN_V1("ban-v1")
+    BAN_V1("ban-v1"),
+    EDIT_MESSAGES_NOTE_TO_SELF("edit-messages-note-to-self")
 }
 
 @Suppress("TooManyFunctions")

app/src/main/res/values-ar/strings.xml

@@ -26,6 +26,9 @@
     <string name="clear_status_message_after">إمسح رسالة الحالة فيما بعدٌ</string>
     <string name="close">إغلاق</string>
     <string name="close_icon">أيقونة الإغلاق</string>
+    <string name="connection_established">تم الاتصال</string>
+    <string name="connection_lost">انقطع الاتصال</string>
+    <string name="connection_lost_sent_messages_are_queued">انقطع الاتصال - الرسالة المطلوب إرسالها تمّ تحضيرها للإرسال في قائمة بحسب الأولوية</string>
     <string name="continuous_voice_message_recording">قَفْل التسجيل للتسجيل المستمر للرسالة الصوتية</string>
     <string name="conversation_is_read_only">المحادثة للقراءة فقط</string>
     <string name="conversations">محادثات</string>
@@ -71,6 +74,7 @@
     <string name="menu_item_sort_by_name_z_a">ي - أ</string>
     <string name="menu_item_sort_by_size_biggest_first">الأعلى حجماً أولاً</string>
     <string name="menu_item_sort_by_size_smallest_first">الأقل حجماً أولاً</string>
+    <string name="message_deleted_by_you">مُسحت الرسالة بواسطتك</string>
     <string name="message_expiration_title">نهاية صلاحية الرسالة</string>
     <string name="message_last_edited_by">تمّ التعديل من قِبَل %1$s</string>
     <string name="message_poll_tap_to_open">أنقُر لفتح الاستبيان</string>