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

Browse Source
This commit is contained in:
adb
2025-11-15 23:12:52 +01:00
committed by GitHub
parent 572932e92d f924a407b3
commit 8f401e2a09
8 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/b44t/messenger/DcContext.java
+2
View File
@@ -68,8 +68,10 @@ public class DcContext {
public final static int DC_QR_ERROR = 400;
public final static int DC_QR_WITHDRAW_VERIFYCONTACT = 500;
public final static int DC_QR_WITHDRAW_VERIFYGROUP = 502;
public final static int DC_QR_WITHDRAW_JOINBROADCAST = 504;
public final static int DC_QR_REVIVE_VERIFYCONTACT = 510;
public final static int DC_QR_REVIVE_VERIFYGROUP = 512;
public final static int DC_QR_REVIVE_JOINBROADCAST = 514;
public final static int DC_QR_LOGIN = 520;
public final static int DC_SOCKET_AUTO = 0;
src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(
isConfigured? R.string.pref_password_and_account_settings : R.string.manual_account_setup_option
isConfigured? R.string.edit_transport : R.string.manual_account_setup_option
);
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+1 -1
View File
@@ -223,7 +223,7 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
Preference passwordAndAccount = this.findPreference("password_account_settings_button");
if (passwordAndAccount != null) {
passwordAndAccount.setOnPreferenceClickListener(((preference) -> {
boolean result = ScreenLockUtil.applyScreenLock(requireActivity(), getString(R.string.pref_password_and_account_settings), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT);
boolean result = ScreenLockUtil.applyScreenLock(requireActivity(), getString(R.string.edit_transport), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT);
if (!result) {
openRegistrationActivity();
}
src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
+4 -1
View File
@@ -112,8 +112,10 @@ public class QrCodeHandler {
case DcContext.DC_QR_WITHDRAW_VERIFYCONTACT:
case DcContext.DC_QR_WITHDRAW_VERIFYGROUP:
case DcContext.DC_QR_WITHDRAW_JOINBROADCAST:
String message = qrParsed.getState() == DcContext.DC_QR_WITHDRAW_VERIFYCONTACT ? activity.getString(R.string.withdraw_verifycontact_explain)
: activity.getString(R.string.withdraw_verifygroup_explain, qrParsed.getText1());
: qrParsed.getState() == DcContext.DC_QR_WITHDRAW_VERIFYCONTACT ? activity.getString(R.string.withdraw_verifygroup_explain, qrParsed.getText1())
: activity.getString(R.string.withdraw_joinbroadcast_explain, qrParsed.getText1());
builder.setTitle(R.string.qrshow_title);
builder.setMessage(message);
builder.setNeutralButton(R.string.reset, (dialog, which) -> {
@@ -126,6 +128,7 @@ public class QrCodeHandler {
case DcContext.DC_QR_REVIVE_VERIFYCONTACT:
case DcContext.DC_QR_REVIVE_VERIFYGROUP:
case DcContext.DC_QR_REVIVE_JOINBROADCAST:
builder.setTitle(R.string.qrshow_title);
builder.setMessage(activity.getString(R.string.revive_verifycontact_explain));
builder.setNeutralButton(R.string.revive_qr_code, (dialog, which) -> {
src/main/java/org/thoughtcrime/securesms/qr/QrShowFragment.java
+12 -2
View File
@@ -17,6 +17,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.b44t.messenger.DcChat;
import com.b44t.messenger.DcContext;
import com.b44t.messenger.DcEvent;
import com.caverock.androidsvg.SVG;
@@ -143,8 +144,17 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
public void withdrawQr() {
Activity activity = getActivity();
String message = chatId == 0 ? activity.getString(R.string.withdraw_verifycontact_explain)
: activity.getString(R.string.withdraw_verifygroup_explain, dcContext.getChat(chatId).getName());
String message;
if (chatId == 0) {
message = activity.getString(R.string.withdraw_verifycontact_explain);
} else {
DcChat chat = dcContext.getChat(chatId);
if (chat.getType() == DcChat.DC_CHAT_TYPE_GROUP) {
message = activity.getString(R.string.withdraw_verifygroup_explain, chat.getName());
} else {
message = activity.getString(R.string.withdraw_joinbroadcast_explain, chat.getName());
}
}
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(R.string.withdraw_qr_code);
builder.setMessage(message);