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

Cleaning up straggler strings

Browse Source
This commit is contained in:
Al Lansley
2024-07-29 08:29:12 +10:00
parent d0e87c64b5
commit 08b8a84309
106 changed files with 21 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt
View File

@@ -52,7 +52,7 @@ class DisappearingMessagesActivity: PassphraseRequiredActionBarActivity() {
viewModel.event.collect {
when (it) {
Event.SUCCESS -> finish()
Event.FAIL -> showToast(getString(R.string.DisappearingMessagesActivity_settings_not_updated))
Event.FAIL -> showToast(getString(R.string.communityErrorDescription))
}
}
}

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

@@ -1,5 +1,7 @@
package org.thoughtcrime.securesms.database.helpers;
import static org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
@@ -8,6 +10,8 @@ import android.database.Cursor;
import androidx.annotation.NonNull;
import androidx.core.app.NotificationCompat;
import com.squareup.phrase.Phrase;
import net.zetetic.database.sqlcipher.SQLiteConnection;
import net.zetetic.database.sqlcipher.SQLiteDatabase;
import net.zetetic.database.sqlcipher.SQLiteDatabaseHook;
@@ -258,12 +262,16 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
notificationManager.createNotificationChannel(channel);
}
CharSequence errorTxt = Phrase.from(context, R.string.databaseErrorGeneric)
.put(APP_NAME_KEY, R.string.app_name)
.format();
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId)
.setSmallIcon(R.drawable.ic_notification)
.setColor(context.getResources().getColor(R.color.textsecure_primary))
.setCategory(NotificationCompat.CATEGORY_ERROR)
.setContentTitle(context.getString(R.string.ErrorNotifier_migration))
.setContentText(context.getString(R.string.ErrorNotifier_migration_downgrade))
.setContentTitle(context.getString(R.string.errorDatabase))
.setContentText(errorTxt)
.setAutoCancel(true);
if (!NotificationChannels.supported()) {

2
app/src/main/res/layout/activity_conversation_v2.xml
View File

@@ -145,7 +145,7 @@
<TextView
android:id="@+id/textSendAfterApproval"
android:text="@string/ConversationActivity_send_after_approval"
android:text="@string/messageRequestPendingDescription"
android:visibility="gone"
tools:visibility="visible"
android:textAlignment="center"