Merge branch 'dev' into feature/pro-settings-non-originating

Author: ThomasSession

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

@@ -23,6 +23,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
+import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
 import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.RecipientData
@@ -91,6 +92,9 @@ class ShareViewModel @Inject constructor(
             .filter { thread ->
                 val recipient = thread.recipient
                 when {
+                    // if the recipient is hidden or not approved, ignore it
+                    recipient.priority == PRIORITY_HIDDEN || !recipient.approved -> false
+
                     // If the recipient is blocked, ignore it
                     recipient.blocked -> false
 

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsHomeScreen.kt

@@ -260,7 +260,7 @@ fun ProStats(
                 ProStatItem(
                     modifier = Modifier.weight(1f),
                     title = pluralStringResource(
-                        R.plurals.temp_pro_stats_groups,
+                        R.plurals.proGroupsUpgraded,
                         data.groupsUpdated,
                         NumberUtil.getFormattedNumber(data.groupsUpdated.toLong())
                     ),
@@ -272,7 +272,7 @@ fun ProStats(
                 ProStatItem(
                     modifier = Modifier.weight(1f),
                     title = pluralStringResource(
-                        R.plurals.temp_pro_stats_pins,
+                        R.plurals.proPinnedConversations,
                         data.pinnedConversations,
                         NumberUtil.getFormattedNumber(data.pinnedConversations.toLong())
                     ),
@@ -287,7 +287,7 @@ fun ProStats(
                 ProStatItem(
                     modifier = Modifier.weight(1f),
                     title = pluralStringResource(
-                        R.plurals.temp_pro_stats_badges,
+                        R.plurals.proBadgesSent,
                         data.proBadges,
                         NumberUtil.getFormattedNumber(data.proBadges.toLong())
                     ),
@@ -299,7 +299,7 @@ fun ProStats(
                 ProStatItem(
                     modifier = Modifier.weight(1f),
                     title = pluralStringResource(
-                        R.plurals.temp_pro_stats_long,
+                        R.plurals.proLongerMessagesSent,
                         data.longMessages,
                         NumberUtil.getFormattedNumber(data.longMessages.toLong())
                     ),

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsViewModel.kt

@@ -24,6 +24,7 @@ import org.session.libsession.utilities.StringSubstitutionConstants.PRICE_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.PRO_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.RELATIVE_TIME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.SELECTED_PLAN_KEY
+import org.session.libsession.utilities.StringSubstitutionConstants.TIME_KEY
 import org.thoughtcrime.securesms.pro.SubscriptionState
 import org.thoughtcrime.securesms.pro.ProStatusManager
 import org.thoughtcrime.securesms.pro.subscription.ProSubscriptionDuration
@@ -71,14 +72,16 @@ class ProSettingsViewModel @Inject constructor(
                 else SubscriptionState.NeverSubscribed,
                 subscriptionExpiryLabel = when(subscriptionState){
                     is SubscriptionState.Active.AutoRenewing ->
-                        Phrase.from(context, R.string.proAutoRenew)
-                        .put(RELATIVE_TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
-                        .format()
+                        Phrase.from(context, R.string.proAutoRenewTime)
+                            .put(PRO_KEY, NonTranslatableStringConstants.PRO)
+                            .put(TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
+                            .format()
 
                     is SubscriptionState.Active.Expiring ->
-                        Phrase.from(context, R.string.proExpiring)
-                        .put(RELATIVE_TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
-                        .format()
+                        Phrase.from(context, R.string.proExpiringTime)
+                            .put(PRO_KEY, NonTranslatableStringConstants.PRO)
+                            .put(TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
+                            .format()
 
                     else -> ""
                 },

app/src/main/java/org/thoughtcrime/securesms/tokenpage/TokenPageViewModel.kt

@@ -11,11 +11,14 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import network.loki.messenger.R
+import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
 import nl.komponents.kovenant.Promise
 import org.session.libsession.LocalisedTimeUtil.toShortSinglePartString
 import org.session.libsession.snode.OnionRequestAPI
@@ -37,6 +40,7 @@ import org.thoughtcrime.securesms.util.NumberUtil.formatAbbreviated
 import org.thoughtcrime.securesms.util.NumberUtil.formatWithDecimalPlaces
 import javax.inject.Inject
 import kotlin.math.min
+import kotlin.sequences.filter
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 
@@ -255,7 +259,11 @@ class TokenPageViewModel @Inject constructor(
             var numGroupV2Convos = 0
 
             // Grab the database and reader details we need to count the conversations / groups
-            val convoList = conversationRepository.observeConversationList().first()
+            val convoList = conversationRepository.observeConversationList()
+                .map{ convo ->
+                    convo.filter { it.recipient.approved }
+                }
+                .first()
             val result = mutableSetOf<Recipient>()
 
             // Look through the database to build up our conversation & group counts (still on Dispatchers.IO not the main thread)

app/src/main/res/values-b+af+ZA/strings.xml

@@ -705,7 +705,6 @@
     <string name="recoveryPasswordHideRecoveryPassword">Versteek Herstel Wagwoord</string>
     <string name="recoveryPasswordHideRecoveryPasswordDescription">Versteek jou herstel wagwoord permanent op hierdie toestel.</string>
     <string name="recoveryPasswordRestoreDescription">Voer jou herstel wagwoord in om jou rekening te laai. As jy dit nie gestoor het nie, kan jy dit in jou app-instellings kry.</string>
-    <string name="recoveryPasswordView">Kyk Wagwoord</string>
     <string name="recoveryPasswordWarningSendDescription">Hierdie is jou Herwinningswagwoord. As jy dit aan iemand stuur, sal hulle volle toegang tot jou rekening hê.</string>
     <string name="redo">Herdoen</string>
     <string name="remove">Verwyder</string>

app/src/main/res/values-b+ar+SA/strings.xml

@@ -858,7 +858,6 @@
     <string name="recoveryPasswordHideRecoveryPassword">إخفاء كلمة مرور الاسترداد</string>
     <string name="recoveryPasswordHideRecoveryPasswordDescription">قم بإخفاء كلمة مرور الاسترداد بشكل دائم على هذا الجهاز.</string>
     <string name="recoveryPasswordRestoreDescription">أدخل كلمة مرور الاسترجاع لتحميل حسابك. إذا لم تقم بحفظها، يمكنك العثور عليها في إعدادات التطبيق.</string>
-    <string name="recoveryPasswordView">عرض كلمة المرور</string>
     <string name="recoveryPasswordWarningSendDescription">هذه هي عبارة الاسترداد الخاصة بك. إذا قمت بإرساله إلى شخص ما ، فسيكون لديه حق الوصول الكامل إلى حسابك.</string>
     <string name="recreateGroup">إعادة إنشاء المجموعة</string>
     <string name="redo">إعادة</string>

app/src/main/res/values-b+az+AZ/strings.xml

@@ -890,7 +890,6 @@
     <string name="recoveryPasswordHideRecoveryPassword">Geri qaytarma parolunu gizlət</string>
     <string name="recoveryPasswordHideRecoveryPasswordDescription">Geri qaytarma parolunuzu bu cihazda həmişəlik gizlədin.</string>
     <string name="recoveryPasswordRestoreDescription">Hesabınızı yükləmək üçün geri qaytarma parolunuzu daxil edin. Saxlamamısınızsa, onu tətbiq ayarlarınızda tapa bilərsiniz.</string>
-    <string name="recoveryPasswordView">Parolu göstər</string>
     <string name="recoveryPasswordWarningSendDescription">Bu, sizin geri qaytarma parolunuzdur. Kiməsə göndərsəniz, hesabınıza tam erişə bilər.</string>
     <string name="recreateGroup">Qrupu yenidən yarat</string>
     <string name="redo">Təkrar et</string>

app/src/main/res/values-b+bal+BA/strings.xml

@@ -704,7 +704,6 @@
     <string name="recoveryPasswordHideRecoveryPassword">ریکوری پاسورڈ ۏرپڑانی پاہ</string>
     <string name="recoveryPasswordHideRecoveryPasswordDescription">شُمسا بازیابی رمز نا ایی دستگاهء بازگہد ثبت دائمی گماہ بکنیں.</string>
     <string name="recoveryPasswordRestoreDescription">اپنا اکاؤنٹ لوڈ کرنے کیلئے اپنا ریکوری پاسورڈ درج بکنا۔ اگر آپ نے اسے محفوظ نہیں کیا ہے، تو آپ اسے اپنی ایپ کی سیٹنگز میں پا سکتے ہیں۔</string>
-    <string name="recoveryPasswordView">پاس ورڈ دیکھیں</string>
     <string name="recoveryPasswordWarningSendDescription">یہ آپ کا ریکوری پاسورڈ ہی۔ اگے آپ اسے کسی کو بھیجتے ہوت، تو انہیں آپکے حساب تک پورا رسائی ہووستی.</string>
     <string name="redo">دوبارہ ک</string>
     <string name="remove">برس ک</string>

app/src/main/res/values-b+be+BY/strings.xml

@@ -728,7 +728,6 @@
     <string name="recoveryPasswordHideRecoveryPassword">Схаваць Recovery Password</string>
     <string name="recoveryPasswordHideRecoveryPasswordDescription">Схавайце ваш пароль для аднаўлення на гэтай прыладзе назаўжды.</string>
     <string name="recoveryPasswordRestoreDescription">Увядзіце recovery password для загрузкі Вашага ўліковага запісу. Калі вы не захавалі гэта, то можаце знайсці ў наладах праграмы.</string>
-    <string name="recoveryPasswordView">Паказаць пароль</string>
     <string name="recoveryPasswordWarningSendDescription">This is your recovery password. If you send it to someone they\'ll have full access to your account.</string>
     <string name="redo">Паўтарыць</string>
     <string name="remove">Выдаліць</string>

app/src/main/res/values-b+bg+BG/strings.xml

@@ -704,7 +704,6 @@
     <string name="recoveryPasswordHideRecoveryPassword">Скрыть Пароль за Восстановление</string>
     <string name="recoveryPasswordHideRecoveryPasswordDescription">Перманентно скриване на възстановителната парола на това устройство.</string>
     <string name="recoveryPasswordRestoreDescription">Въведете паролата за възстановяване, за да заредите своя профил. Ако не сте я запазили, може да я намерите в настройките на приложението.</string>
-    <string name="recoveryPasswordView">Преглед на паролата</string>
     <string name="recoveryPasswordWarningSendDescription">Това е вашата възстановителна парола. Ако я изпратите на някого, той ще има пълен достъп до вашия акаунт.</string>
     <string name="redo">Вернуть</string>
     <string name="remove">Премахни</string>