Merge pull request #1179 from session-foundation/release/1.24.0

Network Page > Master

Author: ThomasSession

app/build.gradle

@@ -15,8 +15,8 @@ configurations.configureEach {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 408
-def canonicalVersionName = "1.23.2"
+def canonicalVersionCode = 409
+def canonicalVersionName = "1.24.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -55,7 +55,6 @@ android {
         }
     }
 
-
     splits {
         abi {
             enable !project.hasProperty('huawei') // huawei builds do not need the split variants

app/src/main/AndroidManifest.xml

@@ -81,7 +81,7 @@
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:supportsRtl="true"
         android:theme="@style/Theme.Session.DayNight"
-        tools:replace="android:allowBackup,android:label" >
+        tools:replace="android:allowBackup,android:label">
 
         <!-- Disable all analytics -->
         <meta-data
@@ -133,10 +133,16 @@
             android:exported="false"
             android:label="@string/sessionMessageRequests"
             android:screenOrientation="portrait" />
+
         <activity
             android:name="org.thoughtcrime.securesms.preferences.SettingsActivity"
             android:screenOrientation="portrait"
-            android:label="@string/sessionSettings" />
+            android:label="@string/sessionSettings" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.home.HomeActivity" />
+        </activity>
+
         <activity
             android:name="org.thoughtcrime.securesms.debugmenu.DebugActivity"
             android:screenOrientation="portrait"
@@ -318,6 +324,15 @@
         <activity android:name="org.thoughtcrime.securesms.migration.DatabaseMigrationStateActivity" />
         <activity android:name="org.thoughtcrime.securesms.preferences.appearance.AppDisguiseSettingsActivity" />
 
+        <activity
+            android:name="org.thoughtcrime.securesms.tokenpage.TokenPageActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.preferences.SettingsActivity" />
+        </activity>
+
         <service
             android:name="org.thoughtcrime.securesms.service.KeyCachingService"
             android:enabled="true"

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt

@@ -102,6 +102,7 @@ import org.thoughtcrime.securesms.service.ExpiringMessageManager
 import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.sskenvironment.ReadReceiptManager
 import org.thoughtcrime.securesms.sskenvironment.TypingStatusRepository
+import org.thoughtcrime.securesms.tokenpage.TokenDataManager
 import org.thoughtcrime.securesms.util.AppVisibilityManager
 import org.thoughtcrime.securesms.util.Broadcaster
 import org.thoughtcrime.securesms.util.VersionDataFetcher
@@ -163,6 +164,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
     @Inject lateinit var adminStateSync: Lazy<AdminStateSync>
     @Inject lateinit var destroyedGroupSync: Lazy<DestroyedGroupSync>
     @Inject lateinit var removeGroupMemberHandler: Lazy<RemoveGroupMemberHandler> // Exists here only to start upon app starts
+    @Inject lateinit var tokenDataManager: Lazy<TokenDataManager> // Exists here only to start upon app starts
     @Inject lateinit var snodeClock: Lazy<SnodeClock>
     @Inject lateinit var migrationManager: Lazy<DatabaseMigrationManager>
     @Inject lateinit var appDisguiseManager: Lazy<AppDisguiseManager>
@@ -318,6 +320,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         destroyedGroupSync.get().start()
         adminStateSync.get().start()
         cleanupInvitationHandler.get().start()
+        tokenDataManager.get().getTokenDataWhenLoggedIn()
 
         // Start our migration process as early as possible so we can show the user a progress UI
         migrationManager.get().requestMigration(fromRetry = false)

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -95,6 +95,7 @@
 import network.loki.messenger.databinding.MediaPreviewActivityBinding;
 import network.loki.messenger.databinding.MediaViewPageBinding;
 
+
 /**
  * Activity for displaying media attachments in-app
  */
@@ -103,7 +104,6 @@ public class MediaPreviewActivity extends ScreenLockActionBarActivity implements
                                                                                  LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
                                                                                  MediaRailAdapter.RailItemListener
 {
-
   private final static String TAG = MediaPreviewActivity.class.getSimpleName();
 
   private static final int UI_ANIMATION_DELAY     = 300;
@@ -132,6 +132,9 @@ public class MediaPreviewActivity extends ScreenLockActionBarActivity implements
 
   private boolean isFullscreen = false;
   private final Handler hideHandler = new Handler(Looper.myLooper());
+
+  @Inject DateUtils dateUtils;
+
   private final Runnable showRunnable = () -> {
     getSupportActionBar().show();
   };
@@ -229,7 +232,7 @@ private void updateActionBar() {
       CharSequence relativeTimeSpan;
 
       if (mediaItem.date > 0) {
-        relativeTimeSpan = DateUtils.INSTANCE.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), mediaItem.date);
+        relativeTimeSpan = dateUtils.getDisplayFormattedTimeSpanString(Locale.getDefault(), mediaItem.date);
       } else {
         relativeTimeSpan = getString(R.string.draft);
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageViewModel.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import java.util.concurrent.TimeoutException
 import javax.inject.Inject
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.BufferOverflow

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -251,6 +251,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
     @Inject lateinit var reactionDb: ReactionDatabase
     @Inject lateinit var viewModelFactory: ConversationViewModel.AssistedFactory
     @Inject lateinit var mentionViewModelFactory: MentionViewModel.AssistedFactory
+    @Inject lateinit var dateUtils: DateUtils
     @Inject lateinit var configFactory: ConfigFactory
     @Inject lateinit var groupManagerV2: GroupManagerV2
     @Inject lateinit var typingStatusRepository: TypingStatusRepository
@@ -2244,7 +2245,6 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         }
     }
 
-
     override fun sendVoiceMessage() {
         Log.i(TAG, "Sending voice message at: ${System.currentTimeMillis()}")
 
@@ -2368,7 +2368,10 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
             if (TextUtils.isEmpty(body)) { continue }
             if (messageSize > 1) {
-                val formattedTimestamp = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), message.timestamp)
+                val formattedTimestamp = dateUtils.getDisplayFormattedTimeSpanString(
+                    Locale.getDefault(),
+                    message.timestamp
+                )
                 builder.append("$formattedTimestamp: ")
             }
             builder.append(body)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt

@@ -4,6 +4,7 @@ import android.animation.Animator
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.graphics.PointF
@@ -25,6 +26,9 @@ import androidx.core.view.isVisible
 import androidx.vectordrawable.graphics.drawable.AnimatorInflaterCompat
 import com.squareup.phrase.Phrase
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.Locale
+import javax.inject.Inject
+import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -55,9 +59,6 @@ import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.repository.ConversationRepository
 import org.thoughtcrime.securesms.util.AnimationCompleteListener
 import org.thoughtcrime.securesms.util.DateUtils
-import java.util.Locale
-import javax.inject.Inject
-import kotlin.time.Duration.Companion.milliseconds
 
 @AndroidEntryPoint
 class ConversationReactionOverlay : FrameLayout {
@@ -99,6 +100,7 @@ class ConversationReactionOverlay : FrameLayout {
 
     @Inject lateinit var mmsSmsDatabase: MmsSmsDatabase
     @Inject lateinit var repository: ConversationRepository
+    @Inject lateinit var dateUtils: DateUtils
     @Inject lateinit var lokiThreadDatabase: LokiThreadDatabase
     @Inject lateinit var threadDatabase: ThreadDatabase
     @Inject lateinit var textSecurePreferences: TextSecurePreferences
@@ -154,7 +156,10 @@ class ConversationReactionOverlay : FrameLayout {
         val conversationItemSnapshot = selectedConversationModel.bitmap
         conversationBubble.layoutParams = LinearLayout.LayoutParams(conversationItemSnapshot.width, conversationItemSnapshot.height)
         conversationBubble.background = BitmapDrawable(resources, conversationItemSnapshot)
-        conversationTimestamp.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), messageRecord.timestamp)
+        conversationTimestamp.text = dateUtils.getDisplayFormattedTimeSpanString(
+            Locale.getDefault(),
+            messageRecord.timestamp
+        )
         updateConversationTimestamp(messageRecord)
         val isMessageOnLeft = selectedConversationModel.isOutgoing xor ViewUtil.isLtr(this)
         conversationItem.scaleX = LONG_PRESS_SCALE_FACTOR
@@ -369,7 +374,6 @@ class ConversationReactionOverlay : FrameLayout {
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-
         hide()
     }
 
@@ -642,6 +646,7 @@ class ConversationReactionOverlay : FrameLayout {
         })
     }
 
+    @SuppressLint("RestrictedApi")
     private fun initAnimators() {
         val revealDuration = context.resources.getInteger(R.integer.reaction_scrubber_reveal_duration)
         val revealOffset = context.resources.getInteger(R.integer.reaction_scrubber_reveal_offset)

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt

@@ -91,6 +91,7 @@ class ConversationViewModel(
     private val groupManagerV2: GroupManagerV2,
     private val callManager: CallManager,
     val legacyGroupDeprecationManager: LegacyGroupDeprecationManager,
+    val dateUtils: DateUtils,
     private val expiredGroupManager: ExpiredGroupManager,
     private val usernameUtils: UsernameUtils
 
@@ -241,7 +242,7 @@ class ConversationViewModel(
                 Phrase.from(application, if (admin) R.string.legacyGroupBeforeDeprecationAdmin else R.string.legacyGroupBeforeDeprecationMember)
                 .put(DATE_KEY,
                     time.withZoneSameInstant(ZoneId.systemDefault())
-                        .format(DateUtils.getMediumDateTimeFormatter())
+                        .format(dateUtils.getMediumDateTimeFormatter())
                 )
                 .format()
 
@@ -1148,6 +1149,7 @@ class ConversationViewModel(
         private val groupManagerV2: GroupManagerV2,
         private val callManager: CallManager,
         private val legacyGroupDeprecationManager: LegacyGroupDeprecationManager,
+        private val dateUtils: DateUtils,
         private val expiredGroupManager: ExpiredGroupManager,
         private val usernameUtils: UsernameUtils,
     ) : ViewModelProvider.Factory {
@@ -1169,6 +1171,7 @@ class ConversationViewModel(
                 groupManagerV2 = groupManagerV2,
                 callManager = callManager,
                 legacyGroupDeprecationManager = legacyGroupDeprecationManager,
+                dateUtils = dateUtils,
                 expiredGroupManager = expiredGroupManager,
                 usernameUtils = usernameUtils
             ) as T

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt

@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.showSessionDialog
 import org.thoughtcrime.securesms.ui.findActivity
 import org.thoughtcrime.securesms.ui.getSubbedCharSequence
 import org.thoughtcrime.securesms.ui.getSubbedString
+import org.thoughtcrime.securesms.util.DateUtils
 import javax.inject.Inject
 
 
@@ -66,6 +67,7 @@ class ControlMessageView : LinearLayout {
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
 
     @Inject lateinit var disappearingMessages: DisappearingMessages
+    @Inject lateinit var dateUtils: DateUtils
 
     val controlContentView: View get() = binding.controlContentView
 
@@ -74,7 +76,7 @@ class ControlMessageView : LinearLayout {
     }
 
     fun bind(message: MessageRecord, previous: MessageRecord?, longPress: (() -> Unit)? = null) {
-        binding.dateBreakTextView.showDateBreak(message, previous)
+        binding.dateBreakTextView.showDateBreak(message, previous, dateUtils)
         binding.iconImageView.isGone = true
         binding.expirationTimerView.isGone = true
         binding.followSetting.isGone = true

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageUtilities.kt

@@ -2,14 +2,18 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 
 import android.widget.TextView
 import androidx.core.view.isVisible
+import java.util.Locale
+import kotlin.time.Duration.Companion.minutes
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.util.DateUtils
-import java.util.Locale
 
-private const val maxTimeBetweenBreaks = 5 * 60 * 1000L // 5 minutes
+private val maxTimeBetweenBreaksMS =  5.minutes.inWholeMilliseconds
 
-fun TextView.showDateBreak(message: MessageRecord, previous: MessageRecord?) {
-    val showDateBreak = previous == null || message.timestamp - previous.timestamp > maxTimeBetweenBreaks
+fun TextView.showDateBreak(message: MessageRecord, previous: MessageRecord?, dateUtils: DateUtils) {
+    val showDateBreak = (previous == null || message.timestamp - previous.timestamp > maxTimeBetweenBreaksMS)
     isVisible = showDateBreak
-    text = if (showDateBreak) DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), message.timestamp) else ""
-}
+    text = if (showDateBreak) dateUtils.getDisplayFormattedTimeSpanString(
+        Locale.getDefault(),
+        message.timestamp
+    ) else ""
+}