awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into adb/issue-3963

Browse Source
This commit is contained in:
adb
2025-10-28 22:59:41 +01:00
committed by GitHub
parent 882aa30e5f cccd6ae225
commit c4e04cbc71
4 changed files with 8 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
-1
View File
@@ -151,7 +151,6 @@ public class DcHelper {
dcContext.setStockTranslation(11, context.getString(R.string.audio));
dcContext.setStockTranslation(12, context.getString(R.string.file));
dcContext.setStockTranslation(23, context.getString(R.string.gif));
dcContext.setStockTranslation(29, context.getString(R.string.systemmsg_cannot_decrypt));
dcContext.setStockTranslation(35, context.getString(R.string.contact_verified));
dcContext.setStockTranslation(40, context.getString(R.string.chat_archived_label));
dcContext.setStockTranslation(60, context.getString(R.string.login_error_cannot_login));
src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
+1 -9
View File
@@ -210,16 +210,8 @@ public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceF
notificationController = null;
progressDialog.dismiss();
progressDialog = null;
String msg = "";
if (progressWhat == DcContext.DC_IMEX_EXPORT_BACKUP) {
msg = context.getString(R.string.pref_backup_written_to_x, pathAsDisplayedToUser);
} else if (progressWhat == DcContext.DC_IMEX_EXPORT_SELF_KEYS) {
msg = context.getString(R.string.pref_managekeys_secret_keys_exported_to_x, pathAsDisplayedToUser);
} else if (progressWhat == DcContext.DC_IMEX_IMPORT_SELF_KEYS) {
msg = context.getString(R.string.pref_managekeys_secret_keys_imported_from_x, pathAsDisplayedToUser);
}
new AlertDialog.Builder(context)
.setMessage(msg)
.setMessage(context.getString(R.string.pref_backup_written_to_x, pathAsDisplayedToUser))
.setPositiveButton(android.R.string.ok, null)
.show();
}
src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
-9
View File
@@ -109,15 +109,6 @@ public class QrCodeHandler {
builder.setCancelable(false);
break;
case DcContext.DC_QR_WEBRTC:
builder.setMessage(activity.getString(R.string.videochat_instance_from_qr, qrParsed.getText1()));
builder.setPositiveButton(R.string.ok, (dialog, which) -> {
dcContext.setConfigFromQr(rawString);
});
builder.setNegativeButton(R.string.cancel, null);
builder.setCancelable(false);
break;
case DcContext.DC_QR_WITHDRAW_VERIFYCONTACT:
case DcContext.DC_QR_WITHDRAW_VERIFYGROUP:
String message = qrParsed.getState() == DcContext.DC_QR_WITHDRAW_VERIFYCONTACT ? activity.getString(R.string.withdraw_verifycontact_explain)