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

avoid deprecated ChatsPreferenceFragment.onActivityResult()

Browse Source 
also remove now unused fields in `ListSummaryPreferenceFragment`
This commit is contained in:
adbenitez
2026-02-19 00:05:39 +01:00
parent cdcb7fab4b
commit 23f6803be9
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+14 -9
View File
@@ -10,6 +10,8 @@ import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
@@ -28,6 +30,8 @@ import org.thoughtcrime.securesms.util.ScreenLockUtil;
import org.thoughtcrime.securesms.util.Util;
public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
private ActivityResultLauncher<Intent> screenLockLauncher;
private ListPreference mediaQuality;
private ListPreference autoDownload;
private CheckBoxPreference readReceiptsCheckbox;
@@ -39,6 +43,15 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
public void onCreate(Bundle paramBundle) {
super.onCreate(paramBundle);
screenLockLauncher = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
result -> {
if (result.getResultCode() == RESULT_OK) {
performBackup();
}
}
);
mediaQuality = (ListPreference) this.findPreference("pref_compression");
if (mediaQuality != null) {
mediaQuality.setOnPreferenceChangeListener((preference, newValue) -> {
@@ -151,14 +164,6 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
}
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK && requestCode == REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP) {
performBackup();
}
}
public static CharSequence getSummary(Context context) {
DcContext dcContext = DcHelper.getContext(context);
final String onRes = context.getString(R.string.on);
@@ -253,7 +258,7 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
private class BackupListener implements Preference.OnPreferenceClickListener {
@Override
public boolean onPreferenceClick(@NonNull Preference preference) {
boolean result = ScreenLockUtil.applyScreenLock(requireActivity(), getString(R.string.pref_backup), getString(R.string.enter_system_secret_to_continue), REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP);
boolean result = ScreenLockUtil.applyScreenLock(requireActivity(), getString(R.string.pref_backup), getString(R.string.enter_system_secret_to_continue), screenLockLauncher);
if (!result) {
performBackup();
}
src/main/java/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
-3
View File
@@ -27,9 +27,6 @@ import java.util.HashMap;
import java.util.Map;
public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceFragment implements DcEventCenter.DcEventDelegate {
protected static final int REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP = ScreenLockUtil.REQUEST_CODE_CONFIRM_CREDENTIALS + 1;
protected static final int REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS = REQUEST_CODE_CONFIRM_CREDENTIALS_BACKUP + 1;
protected static final int REQUEST_CODE_CONFIRM_CREDENTIALS_ACCOUNT = REQUEST_CODE_CONFIRM_CREDENTIALS_KEYS + 1;
protected DcContext dcContext;
private NotificationController notificationController;