Strings update

app/build.gradle

@@ -88,7 +88,6 @@ android {
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "USER_AGENT", "\"OWA\""
-        buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
         resourceConfigurations += []
 

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

@@ -35,14 +35,12 @@
 import androidx.lifecycle.ProcessLifecycleOwner;
 
 import org.conscrypt.Conscrypt;
-import org.session.libsession.avatars.AvatarHelper;
 import org.session.libsession.database.MessageDataProvider;
 import org.session.libsession.messaging.MessagingModuleConfiguration;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPollerV2;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
 import org.session.libsession.snode.SnodeModule;
-import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.ConfigFactoryUpdateListener;
 import org.session.libsession.utilities.Device;
 import org.session.libsession.utilities.Environment;
@@ -51,8 +49,6 @@
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.WindowDebouncer;
-import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
-import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
 import org.session.libsignal.utilities.HTTP;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsignal.utilities.Log;
@@ -91,17 +87,14 @@
 import org.thoughtcrime.securesms.sskenvironment.TypingStatusRepository;
 import org.thoughtcrime.securesms.util.Broadcaster;
 import org.thoughtcrime.securesms.util.VersionDataFetcher;
-import org.thoughtcrime.securesms.util.dynamiclanguage.LocaleParseHelper;
 import org.thoughtcrime.securesms.webrtc.CallMessageProcessor;
 import org.webrtc.PeerConnectionFactory;
 import org.webrtc.PeerConnectionFactory.InitializationOptions;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.Security;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Timer;
 import java.util.concurrent.Executors;
@@ -110,7 +103,6 @@
 
 import dagger.hilt.EntryPoints;
 import dagger.hilt.android.HiltAndroidApp;
-import kotlin.Unit;
 import network.loki.messenger.BuildConfig;
 import network.loki.messenger.R;
 import network.loki.messenger.libsession_util.ConfigBase;
@@ -320,10 +312,6 @@ public void onTerminate() {
         super.onTerminate();
     }
 
-    public void initializeLocaleParser() {
-        LocaleParser.Companion.configure(new LocaleParseHelper());
-    }
-
     public ExpiringMessageManager getExpiringMessageManager() {
         return expiringMessageManager;
     }
@@ -424,12 +412,6 @@ private void initializeBlobProvider() {
         });
     }
 
-    @Override
-    protected void attachBaseContext(Context base) {
-        initializeLocaleParser();
-        super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
-    }
-
     private static class ProviderInitializationException extends RuntimeException { }
     private void setUpPollingIfNeeded() {
         String userPublicKey = TextSecurePreferences.getLocalNumber(this);

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

@@ -17,8 +17,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.session.libsession.utilities.TextSecurePreferences;
-import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageActivityHelper;
-import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.thoughtcrime.securesms.conversation.v2.WindowUtil;
 import org.thoughtcrime.securesms.util.ActivityUtilitiesKt;
 import org.thoughtcrime.securesms.util.ThemeState;
@@ -97,7 +95,6 @@ protected void onCreate(Bundle savedInstanceState) {
   protected void onResume() {
     super.onResume();
     initializeScreenshotSecurity(true);
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
     String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
     int color = getResources().getColor(R.color.app_icon_background);
@@ -137,9 +134,4 @@ private void initializeScreenshotSecurity(boolean isResume) {
       }
     }
   }
-
-  @Override
-  protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
-  }
 }

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

@@ -1,31 +1,20 @@
 package org.thoughtcrime.securesms;
 
 import android.app.ActivityManager;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
 import androidx.fragment.app.FragmentActivity;
 
-import org.session.libsession.utilities.TextSecurePreferences;
-import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageActivityHelper;
-import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
-
 import network.loki.messenger.R;
 
 public abstract class BaseActivity extends FragmentActivity {
   @Override
   protected void onResume() {
     super.onResume();
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
     String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
     int color = getResources().getColor(R.color.app_icon_background);
     setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));
   }
-
-  @Override
-  protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
-  }
 }

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

@@ -10,7 +10,7 @@ class DeleteMediaDialog {
             iconAttribute(R.attr.dialog_alert_icon)
             title(context.resources.getQuantityString(R.plurals.deleteMessage, recordCount, recordCount))
             text(context.resources.getString(R.string.deleteMessageDescriptionEveryone))
-            button(R.string.delete) { doDelete.run() }
+            dangerButton(R.string.delete) { doDelete.run() }
             cancelButton()
         }
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt

@@ -11,26 +11,21 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.tabs.TabLayoutMediator
-import com.squareup.phrase.Phrase
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlin.time.Duration.Companion.milliseconds
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewConversationActionBarBinding
 import network.loki.messenger.databinding.ViewConversationSettingBinding
 import network.loki.messenger.libsession_util.util.ExpiryMode.AfterRead
-import org.session.libsession.LocalisedTimeUtil
 import org.session.libsession.messaging.messages.ExpirationConfiguration
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.utilities.ExpirationUtil
-import org.session.libsession.utilities.StringSubstitutionConstants.DISAPPEARING_MESSAGES_TYPE_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.TIME_KEY
-import org.session.libsession.utilities.StringSubstitutionConstants.TIME_LARGE_KEY
 import org.session.libsession.utilities.modifyLayoutParams
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.database.GroupDatabase
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.ui.getSubbedString
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class ConversationActionBarView @JvmOverloads constructor(
@@ -125,7 +120,7 @@ class ConversationActionBarView @JvmOverloads constructor(
             settings += ConversationSetting(
                 recipient.mutedUntil.takeUnless { it == Long.MAX_VALUE }
                     ?.let {
-                        context.getString(R.string.notificationsHeaderMute)
+                        context.getString(R.string.notificationsMuted)
                     }
                     ?: context.getString(R.string.notificationsMuted),
                 ConversationSettingType.NOTIFICATION,

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

@@ -2084,7 +2084,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             showSessionDialog {
                 title(resources.getQuantityString(R.plurals.deleteMessage, messages.count(), messages.count()))
                 text(resources.getString(R.string.deleteMessageDescriptionEveryone))
-                button(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
+                dangerButton(R.string.delete) { messages.forEach(viewModel::deleteForEveryone); endActionMode() }
                 cancelButton { endActionMode() }
             }
         // Otherwise if this is a 1-on-1 conversation we may decided to delete just for ourselves or delete for everyone

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

@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.conversation.v2
 
-import android.Manifest
 import android.content.Context
-import android.content.Intent
 import android.database.Cursor
-import android.net.Uri
 import android.util.SparseArray
 import android.util.SparseBooleanArray
 import android.view.MotionEvent
@@ -14,33 +11,22 @@ import androidx.core.util.getOrDefault
 import androidx.core.util.set
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import java.util.concurrent.atomic.AtomicLong
-import kotlin.math.min
+import com.bumptech.glide.RequestManager
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
-import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
 import org.thoughtcrime.securesms.conversation.v2.messages.ControlMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageViewDelegate
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
-import com.bumptech.glide.RequestManager
-import com.squareup.phrase.Phrase
-import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
-import org.session.libsession.utilities.TextSecurePreferences
-import org.thoughtcrime.securesms.MissingMicrophonePermissionDialog
-import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
-import org.thoughtcrime.securesms.showSessionDialog
-import org.thoughtcrime.securesms.ui.getSubbedCharSequence
-import org.thoughtcrime.securesms.ui.getSubbedString
+import java.util.concurrent.atomic.AtomicLong
+import kotlin.math.min
 
 class ConversationAdapter(
     context: Context,

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

@@ -5,7 +5,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
-import android.net.Uri
 import android.os.AsyncTask
 import android.view.Menu
 import android.view.MenuInflater
@@ -19,7 +18,6 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.squareup.phrase.Phrase
-import java.io.IOException
 import network.loki.messenger.R
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.leave
@@ -31,8 +29,6 @@ import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.toHexString
-import org.thoughtcrime.securesms.MissingMicrophonePermissionDialog
-import org.thoughtcrime.securesms.media.MediaOverviewActivity
 import org.thoughtcrime.securesms.ShortcutLauncherActivity
 import org.thoughtcrime.securesms.calls.WebRtcCallActivity
 import org.thoughtcrime.securesms.contacts.SelectContactsActivity
@@ -41,12 +37,16 @@ import org.thoughtcrime.securesms.conversation.v2.utilities.NotificationUtils
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.groups.EditClosedGroupActivity
 import org.thoughtcrime.securesms.groups.EditClosedGroupActivity.Companion.groupIDKey
+import org.thoughtcrime.securesms.media.MediaOverviewActivity
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
 import org.thoughtcrime.securesms.service.WebRtcCallService
 import org.thoughtcrime.securesms.showMuteDialog
 import org.thoughtcrime.securesms.showSessionDialog
+import org.thoughtcrime.securesms.ui.findActivity
+import org.thoughtcrime.securesms.ui.getSubbedString
 import org.thoughtcrime.securesms.util.BitmapUtil
+import java.io.IOException
 
 object ConversationMenuHelper {
 
@@ -183,7 +183,15 @@ object ConversationMenuHelper {
         // or if the user has not granted audio/microphone permissions
         else if (!Permissions.hasAll(context, Manifest.permission.RECORD_AUDIO)) {
             Log.d("Loki", "Attempted to make a call without audio permissions")
-            MissingMicrophonePermissionDialog.show(context)
+
+            Permissions.with(context.findActivity())
+                .request(Manifest.permission.RECORD_AUDIO)
+                .withPermanentDenialDialog(
+                    context.getSubbedString(R.string.permissionsMicrophoneAccessRequired,
+                    APP_NAME_KEY to context.getString(R.string.app_name))
+                )
+                .execute()
+
             return
         }
 

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

@@ -18,17 +18,18 @@ import network.loki.messenger.databinding.ViewControlMessageBinding
 import network.loki.messenger.libsession_util.util.ExpiryMode
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.ExpirationConfiguration
+import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.getColorFromAttr
-import org.thoughtcrime.securesms.MissingMicrophonePermissionDialog
 import org.thoughtcrime.securesms.conversation.disappearingmessages.DisappearingMessages
 import org.thoughtcrime.securesms.conversation.disappearingmessages.expiryMode
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
 import org.thoughtcrime.securesms.showSessionDialog
+import org.thoughtcrime.securesms.ui.findActivity
 import org.thoughtcrime.securesms.ui.getSubbedCharSequence
 import org.thoughtcrime.securesms.ui.getSubbedString
 import javax.inject.Inject
@@ -138,7 +139,13 @@ class ControlMessageView : LinearLayout {
                         !Permissions.hasAll(context, Manifest.permission.RECORD_AUDIO) -> {
                             showInfo()
                             setOnClickListener {
-                                MissingMicrophonePermissionDialog.show(context)
+                                Permissions.with(context.findActivity())
+                                    .request(Manifest.permission.RECORD_AUDIO)
+                                    .withPermanentDenialDialog(
+                                        context.getSubbedString(R.string.permissionsMicrophoneAccessRequired,
+                                            APP_NAME_KEY to context.getString(R.string.app_name))
+                                    )
+                                    .execute()
                             }
                         }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java

@@ -254,7 +254,7 @@ public static void selectDocument(Activity activity, int requestCode) {
                        .request(Manifest.permission.READ_MEDIA_IMAGES)
                        .request(Manifest.permission.READ_MEDIA_AUDIO)
                        .withRationaleDialog(
-                               Phrase.from(c, R.string.permissionsStorageSend)
+                               Phrase.from(c, R.string.permissionsMusicAudio)
                                        .put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
                        )
                        .withPermanentDenialDialog(