Cleaned up a leftover plural & changed 'app_name' to use 'sessionMess…

…enger' string

app/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools">
 
- <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference" />
+ <uses-sdk
+ tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference" />
 
  <permission
  android:name="network.loki.messenger.ACCESS_SESSION_SECRETS"
@@ -73,12 +74,12 @@
  android:name="org.thoughtcrime.securesms.ApplicationContext"
  android:allowBackup="false"
  android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
+ android:label="@string/sessionMessenger"
  android:largeHeap="true"
  android:networkSecurityConfig="@xml/network_security_configuration"
  android:supportsRtl="true"
  android:theme="@style/Theme.Session.DayNight"
- tools:replace="android:allowBackup">
+ tools:replace="android:allowBackup,android:label" >
 
  <!-- Disable all analytics -->
 

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

@@ -98,7 +98,7 @@ protected void onResume() {
  super.onResume();
  initializeScreenshotSecurity(true);
  DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
- String name = getResources().getString(R.string.app_name);
+ String name = getResources().getString(R.string.sessionMessenger);
  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));

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

@@ -18,7 +18,7 @@ public abstract class BaseActivity extends FragmentActivity {
  protected void onResume() {
  super.onResume();
  DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
- String name = getResources().getString(R.string.app_name);
+ String name = getResources().getString(R.string.sessionMessenger);
  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));

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

@@ -334,11 +334,11 @@ private void handleSaveMedia(@NonNull Collection<MediaDatabase.MediaRecord> medi
  .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
  .maxSdkVersion(Build.VERSION_CODES.P)
  .withPermanentDenialDialog(Phrase.from(context, R.string.permissionsStorageSaveDenied)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString())
  .onAnyDenied(() -> Toast.makeText(getContext(),
  Phrase.from(context, R.string.permissionsStorageSaveDenied)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString(),
  Toast.LENGTH_LONG).show())
  .onAllGranted(() -> {

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

@@ -415,11 +415,11 @@ private void saveToDisk() {
  .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
  .maxSdkVersion(Build.VERSION_CODES.P)
  .withPermanentDenialDialog(Phrase.from(getApplicationContext(), R.string.permissionsStorageSaveDenied)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString())
  .onAnyDenied(() -> {
  String txt = Phrase.from(getApplicationContext(), R.string.permissionsStorageSaveDenied)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString();
  Toast.makeText(this, txt, Toast.LENGTH_LONG).show();
  })

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

@@ -158,7 +158,7 @@ private void initializeResources() {
  if (statusTitle != null) {
  Context c = getApplicationContext();
  String lockedTxt = Phrase.from(c, R.string.lockAppLocked)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
  statusTitle.setText(lockedTxt);
  }

app/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java

@@ -45,7 +45,7 @@ private void setLayoutRes() {
  if (key.equalsIgnoreCase(LOCK_SCREEN_KEY)) {
  Context c = getContext();
  CharSequence substitutedSummaryCS = Phrase.from(c, R.string.lockAppDescriptionAndroid)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format();
  this.setSummary(substitutedSummaryCS);
  }

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

@@ -36,8 +36,6 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.view.drawToBitmap
-import androidx.core.text.set
-import androidx.core.text.toSpannable
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
@@ -188,7 +186,6 @@ import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.NetworkUtils
 import org.thoughtcrime.securesms.util.SaveAttachmentTask
-import org.thoughtcrime.securesms.util.drawToBitmap
 import org.thoughtcrime.securesms.util.isScrolledToBottom
 import org.thoughtcrime.securesms.util.isScrolledToWithin30dpOfBottom
 import org.thoughtcrime.securesms.util.push
@@ -1732,7 +1729,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
  if (!hasSeenGIFMetaDataWarning) {
  showSessionDialog {
  title(R.string.giphyWarning)
- text(Phrase.from(context, R.string.giphyWarningDescription).put(APP_NAME_KEY, getString(R.string.app_name)).format())
+ text(Phrase.from(context, R.string.giphyWarningDescription).put(APP_NAME_KEY, getString(R.string.sessionMessenger)).format())
  button(R.string.theContinue) {
  textSecurePreferences.setHasSeenGIFMetaDataWarning()
  selectGif()
@@ -1865,7 +1862,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
  .request(Manifest.permission.RECORD_AUDIO)
  .withRationaleDialog(getString(R.string.permissionsMicrophoneAccessRequired), R.drawable.ic_baseline_mic_48)
  .withPermanentDenialDialog(Phrase.from(applicationContext, R.string.permissionsMicrophoneAccessRequiredAndroid)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString())
  .execute()
  }
@@ -2160,12 +2157,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
  .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
  .maxSdkVersion(Build.VERSION_CODES.P)
  .withPermanentDenialDialog(Phrase.from(applicationContext, R.string.permissionsStorageSaveDenied)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString())
  .onAnyDenied {
  endActionMode()
  val txt = Phrase.from(applicationContext, R.string.permissionsStorageSaveDenied)
- .put(APP_NAME_KEY, getString(R.string.app_name))
+ .put(APP_NAME_KEY, getString(R.string.sessionMessenger))
  .format().toString()
  Toast.makeText(this@ConversationActivityV2, txt, Toast.LENGTH_LONG).show()
  }

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

@@ -37,7 +37,6 @@ import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.io.UnsupportedEncodingException
 import java.security.SecureRandom
-import java.util.Arrays
 import java.util.Collections
 import java.util.concurrent.TimeUnit
 import kotlin.math.max
@@ -321,7 +320,7 @@ object Util {
  }
 
  fun writeTextToClipboard(context: Context, text: String) {
- writeTextToClipboard(context, context.getString(R.string.app_name), text)
+ writeTextToClipboard(context, context.getString(R.string.sessionMessenger), text)
  }
 
  fun writeTextToClipboard(context: Context, label: String, text: String) {

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

@@ -16,7 +16,7 @@ class LinkPreviewDialog(private val onEnabled: () -> Unit) : DialogFragment() {
  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
  title(R.string.linkPreviewsEnable)
  val txt = Phrase.from(context, R.string.linkPreviewsFirstDescription)
- .put(APP_NAME_KEY, context.getString(R.string.app_name))
+ .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
  .format()
  text(txt)
  button(R.string.enable) { enable() }

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

@@ -254,10 +254,10 @@ public static void selectDocument(Activity activity, int requestCode) {
 
  Context c = activity.getApplicationContext();
  String needStoragePermissionTxt = Phrase.from(c, R.string.permissionsStorageSend)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
  String storagePermissionDeniedTxt = Phrase.from(c, R.string.cameraGrantAccessStorageDenied)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
 
  builder.withPermanentDenialDialog(needStoragePermissionTxt)
@@ -270,10 +270,10 @@ public static void selectGallery(Activity activity, int requestCode, @NonNull Re
 
  Context c = activity.getApplicationContext();
  String needStoragePermissionTxt = Phrase.from(c, R.string.permissionsStorageSend)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
  String cameraPermissionDeniedTxt = Phrase.from(c, R.string.cameraGrantAccessDenied)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
 
  Permissions.PermissionsBuilder builder = Permissions.with(activity);
@@ -310,11 +310,11 @@ public static void selectGif(Activity activity, int requestCode) {
  public void capturePhoto(Activity activity, int requestCode, Recipient recipient) {
 
  String cameraPermissionDeniedTxt = Phrase.from(context, R.string.cameraGrantAccessDenied)
- .put(APP_NAME_KEY, context.getString(R.string.app_name))
+ .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
  .format().toString();
 
  String requireCameraPermissionTxt = Phrase.from(context, R.string.cameraGrantAccessDescription)
- .put(APP_NAME_KEY, context.getString(R.string.app_name))
+ .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
  .format().toString();
 
  Permissions.with(activity)

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -263,7 +263,7 @@ public static void migrateSqlCipher3To4IfNeeded(@NonNull Context context, @NonNu
  }
 
  CharSequence errorTxt = Phrase.from(context, R.string.databaseErrorGeneric)
- .put(APP_NAME_KEY, R.string.app_name)
+ .put(APP_NAME_KEY, R.string.sessionMessenger)
  .format();
 
  NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId)

app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java

@@ -120,7 +120,7 @@ public SpannableString getDisplayBody(@NonNull Context context) {
  return emphasisAdded(context.getString(R.string.communityInvitation));
  } else if (MmsSmsColumns.Types.isLegacyType(type)) {
  String txt = Phrase.from(context, R.string.messageErrorOld)
- .put(APP_NAME_KEY, context.getString(R.string.app_name))
+ .put(APP_NAME_KEY, context.getString(R.string.sessionMessenger))
  .format().toString();
  return emphasisAdded(txt);
  } else if (MmsSmsColumns.Types.isDraftMessageType(type)) {

app/src/main/java/org/thoughtcrime/securesms/home/EmptyView.kt

@@ -49,7 +49,7 @@ internal fun EmptyView(newAccount: Boolean) {
  Text(
  stringResource(R.string.onboardingBubbleWelcomeToSession).let { txt ->
  val c = LocalContext.current
- Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.app_name)).format().toString()
+ Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
  },
  style = LocalType.current.base,
  color = LocalColors.current.primary,

app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt

@@ -54,7 +54,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
  supportActionBar!!.title = resources.getString(R.string.onionRoutingPath)
 
  // Substitute the localised version of "Session" into the layout
- val appName = applicationContext.getString(R.string.app_name)
+ val appName = applicationContext.getString(R.string.sessionMessenger)
  val txt = Phrase.from(applicationContext, R.string.onionRoutingPathDescription).put(APP_NAME_KEY, appName).format().toString()
  binding.pathDescription.text = txt
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java

@@ -363,10 +363,10 @@ private void navigateToCamera() {
 
  Context c = getApplicationContext();
  String permanentDenialTxt = Phrase.from(c, R.string.cameraGrantAccessDenied)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
  String requireCameraPermissionsTxt = Phrase.from(c, R.string.cameraGrantAccessDescription)
- .put(APP_NAME_KEY, c.getString(R.string.app_name))
+ .put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
  .format().toString();
 
  Permissions.with(this)

app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java

@@ -34,7 +34,7 @@ public MultipleRecipientNotificationBuilder(Context context, NotificationPrivacy
 
  setColor(context.getResources().getColor(R.color.textsecure_primary));
  setSmallIcon(R.drawable.ic_notification);
- setContentTitle(context.getString(R.string.app_name));
+ setContentTitle(context.getString(R.string.sessionMessenger));
  setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, HomeActivity.class), PendingIntent.FLAG_IMMUTABLE));
  setCategory(NotificationCompat.CATEGORY_MESSAGE);
  setGroupSummary(true);

app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt

@@ -54,7 +54,7 @@ class PushReceiver @Inject constructor(@ApplicationContext val context: Context)
  val builder = NotificationCompat.Builder(context, NotificationChannels.OTHER)
  .setSmallIcon(R.drawable.ic_notification)
  .setColor(context.getColor(R.color.textsecure_primary))
- .setContentTitle(getString(context, R.string.app_name))
+ .setContentTitle(getString(context, R.string.sessionMessenger))
  .setContentText(getString(context, R.string.messageNewYouveGotA))
  .setPriority(NotificationCompat.PRIORITY_DEFAULT)
  .setAutoCancel(true)

app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt

@@ -2,8 +2,11 @@ package org.thoughtcrime.securesms.onboarding
 
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import com.squareup.phrase.Phrase
 import network.loki.messenger.R
+import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
 import org.thoughtcrime.securesms.ui.AlertDialog
 import org.thoughtcrime.securesms.ui.DialogButtonModel
 import org.thoughtcrime.securesms.ui.GetString
@@ -18,7 +21,10 @@ fun OnboardingBackPressAlertDialog(
  AlertDialog(
  onDismissRequest = dismissDialog,
  title = stringResource(R.string.warning),
- text = stringResource(textId),
+ text = stringResource(textId).let { txt ->
+ val c = LocalContext.current
+ Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString()
+ },
  buttons = listOf(
  DialogButtonModel(
  GetString(stringResource(R.string.quitButton)),

app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt

@@ -136,7 +136,7 @@ internal fun LandingScreen(
  item.stringId == R.string.onboardingBubbleSessionIsEngineered) {
  AnimateMessageText(
  Phrase.from(stringResource(item.stringId))
- .put(APP_NAME_KEY, stringResource(R.string.app_name))
+ .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
  .format().toString(),
  item.isOutgoing
  )

app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt

@@ -62,7 +62,7 @@ internal fun MessageNotificationsScreen(
  Spacer(Modifier.height(LocalDimensions.current.smallSpacing))
  Text(
  Phrase.from(stringResource(R.string.onboardingMessageNotificationExplanation))
- .put(APP_NAME_KEY, stringResource(R.string.app_name))
+ .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
  .format().toString(),
  style = LocalType.current.base
  )
@@ -81,7 +81,7 @@ internal fun MessageNotificationsScreen(
  // spacing between buttons is provided by ripple/downstate of NotificationRadioButton
 
  val txt = Phrase.from(stringResource(R.string.onboardingMessageNotificationExplanation))
- .put(APP_NAME_KEY, stringResource(R.string.app_name))
+ .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
  .format().toString()
  NotificationRadioButton(
  R.string.notificationsSlowMode,
@@ -131,7 +131,7 @@ private fun NotificationRadioButton(
  // If this radio button is the one for slow mode notifications then substitute the app name..
  if (explanation == R.string.notificationsSlowModeDescription) {
  val txt = Phrase.from(stringResource(explanation))
- .put(APP_NAME_KEY, stringResource(R.string.app_name))
+ .put(APP_NAME_KEY, stringResource(R.string.sessionMessenger))
  .format().toString()
  Text(
  txt,