TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-05 09:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up a leftover plural & changed 'app_name' to use 'sessionMessenger' string

Browse Source
This commit is contained in:
alansley
2024-07-30 10:27:55 +10:00
parent 79cd87878c
commit bc90d18c91
119 changed files with 60 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View File

@@ -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 -->

2
app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
View File

@@ -98,7 +98,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
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));

2
app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
View File

@@ -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));

4
app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
View File

@@ -334,11 +334,11 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
.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(() -> {

4
app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
View File

@@ -415,11 +415,11 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
.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();
})

2
app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View File

@@ -158,7 +158,7 @@ public class PassphrasePromptActivity extends BaseActionBarActivity {
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);
}

2
app/src/main/java/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
View File

@@ -45,7 +45,7 @@ public class SwitchPreferenceCompat extends CheckBoxPreference {
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);
}

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

@@ -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()
}

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

@@ -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) {

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

@@ -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() }

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

@@ -254,10 +254,10 @@ public class AttachmentManager {
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 class AttachmentManager {
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 class AttachmentManager {
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)

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

@@ -263,7 +263,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
}
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)

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

@@ -120,7 +120,7 @@ public class ThreadRecord extends DisplayRecord {
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)) {

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

@@ -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,

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

@@ -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

4
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
View File

@@ -363,10 +363,10 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
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)

2
app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
View File

@@ -34,7 +34,7 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
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);

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

@@ -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)

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

@@ -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)),

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

@@ -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
)

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

@@ -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,

8
app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt
View File

@@ -48,13 +48,13 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() {
// String sub the summary text of the `export_logs` element in preferences_help.xml
var exportPref = preferenceScreen.findPreference<Preference>(EXPORT_LOGS)
exportPref?.summary = Phrase.from(context, R.string.helpReportABugExportLogsDescription)
.put(APP_NAME_KEY, getString(R.string.app_name))
.put(APP_NAME_KEY, getString(R.string.sessionMessenger))
.format()
// String sub the summary text of the `translate_session` element in preferences_help.xml
var translatePref = preferenceScreen.findPreference<Preference>(TRANSLATE)
translatePref?.title = Phrase.from(context, R.string.helpHelpUsTranslateSession)
.put(APP_NAME_KEY, getString(R.string.app_name))
.put(APP_NAME_KEY, getString(R.string.sessionMessenger))
.format()
}
@@ -102,11 +102,11 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() {
.request(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 {
val txt = 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.makeText(requireActivity(), txt, Toast.LENGTH_LONG).show()
}

2
app/src/main/java/org/thoughtcrime/securesms/preferences/ShareLogsDialog.kt
View File

@@ -42,7 +42,7 @@ class ShareLogsDialog(private val updateCallback: (Boolean)->Unit): DialogFragme
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog = createSessionDialog {
title(R.string.helpReportABugExportLogs)
val appName = context.getString(R.string.app_name)
val appName = context.getString(R.string.sessionMessenger)
val txt = Phrase.from(context, R.string.helpReportABugDescription)
.put(APP_NAME_KEY, appName)
.format().toString()

2
app/src/main/java/org/thoughtcrime/securesms/preferences/Util.kt
View File

@@ -17,7 +17,7 @@ fun Context.sendInvitationToUseSession() {
val DOWNLOAD_URL = "https://getsession.org/download"
val txt = Phrase.from(getString(R.string.accountIdShare))
.put(APP_NAME_KEY, getString(R.string.app_name))
.put(APP_NAME_KEY, getString(R.string.sessionMessenger))
.put(ACCOUNT_ID_KEY, TextSecurePreferences.getLocalNumber(this@sendInvitationToUseSession))
.put(DOWNLOAD_URL_KEY, DOWNLOAD_URL)
.format().toString()

2
app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@@ -244,7 +244,7 @@ public class KeyCachingService extends Service {
// Replace app name in title string
Context c = getApplicationContext();
String unlockedTxt = Phrase.from(c, R.string.lockAppUnlocked)
.put(APP_NAME_KEY, c.getString(R.string.app_name))
.put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
.format().toString();
builder.setContentTitle(unlockedTxt);

2
app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java
View File

@@ -53,7 +53,7 @@ public class QuickResponseService extends IntentService {
Log.w(TAG, "Got quick response request when locked...");
Context c = getApplicationContext();
String txt = Phrase.from(c, R.string.lockAppQuickResponse)
.put(APP_NAME_KEY, c.getString(R.string.app_name))
.put(APP_NAME_KEY, c.getString(R.string.sessionMessenger))
.format().toString();
Toast.makeText(this, txt, Toast.LENGTH_LONG).show();
return;

4
app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
View File

@@ -68,10 +68,10 @@ public class UpdateApkReadyListener extends BroadcastReceiver {
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
CharSequence title = Phrase.from(context, R.string.updateSession)
.put(APP_NAME_KEY, context.getString(R.string.app_name)).format();
.put(APP_NAME_KEY, context.getString(R.string.sessionMessenger)).format();
CharSequence txt = Phrase.from(context, R.string.updateNewVersion)
.put(APP_NAME_KEY, context.getString(R.string.app_name)).format();
.put(APP_NAME_KEY, context.getString(R.string.sessionMessenger)).format();
Notification notification = new NotificationCompat.Builder(context, NotificationChannels.APP_UPDATES)

5
app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
View File

@@ -58,7 +58,6 @@ import kotlinx.coroutines.launch
import network.loki.messenger.R
import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.ui.theme.LocalColors
import org.thoughtcrime.securesms.ui.theme.LocalDimensions
import org.thoughtcrime.securesms.ui.theme.LocalType
import java.util.concurrent.Executors
@@ -95,7 +94,7 @@ fun MaybeScanQrCode(
Text(
stringResource(R.string.cameraGrantAccessDenied).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,
textAlign = TextAlign.Center
@@ -118,7 +117,7 @@ fun MaybeScanQrCode(
Text(
stringResource(R.string.cameraGrantAccessQr).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.xl,
textAlign = TextAlign.Center

2
app/src/main/java/org/thoughtcrime/securesms/util/LongClickCopySpan.java
View File

@@ -49,7 +49,7 @@ public class LongClickCopySpan extends URLSpan {
private void copyUriSdk11(Context context, String url) {
android.content.ClipboardManager clipboard =
(android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(context.getString(R.string.app_name), url);
ClipData clip = ClipData.newPlainText(context.getString(R.string.sessionMessenger), url);
clipboard.setPrimaryClip(clip);
}

2
app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt
View File

@@ -24,7 +24,7 @@ class ScanQRCodePlaceholderFragment: Fragment() {
binding.grantCameraAccessButton.setOnClickListener { delegate?.requestCameraAccess() }
binding.needCameraPermissionsTV.text = Phrase.from(context, R.string.cameraGrantAccessQr)
.put(APP_NAME_KEY, getString(R.string.app_name))
.put(APP_NAME_KEY, getString(R.string.sessionMessenger))
.format()
}
}