Skip to content

Commit

Permalink
Merge pull request #1238 from cyb3rko/startactivityforesult-deprecation
Browse files Browse the repository at this point in the history 
Replace deprecated startActivityForResult
  • Loading branch information
@alexbakker
alexbakker authored Dec 22, 2023
2 parents 52abb08 + ca530f2 commit a1d00b4
Show file tree
Hide file tree
Showing 8 changed files with 206 additions and 176 deletions.
52 changes: 26 additions & 26 deletions app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import android.widget.RelativeLayout;

import androidx.activity.OnBackPressedCallback;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
Expand Down Expand Up @@ -89,8 +91,6 @@
import de.hdodenhof.circleimageview.CircleImageView;

public class EditEntryActivity extends AegisActivity {
private static final int PICK_IMAGE_REQUEST = 0;

private boolean _isNew = false;
private boolean _isManual = false;
private VaultEntry _origEntry;
Expand Down Expand Up @@ -128,6 +128,29 @@ public class EditEntryActivity extends AegisActivity {
private BackPressHandler _backPressHandler;
private IconBackPressHandler _iconBackPressHandler;

private final ActivityResultLauncher<Intent> pickImageResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
Intent data = activityResult.getData();
if (activityResult.getResultCode() != RESULT_OK || data == null || data.getData() == null) {
return;
}
String fileType = SafHelper.getMimeType(this, data.getData());
if (fileType != null && fileType.equals(IconType.SVG.toMimeType())) {
ImportFileTask.Params params = new ImportFileTask.Params(data.getData(), "icon", null);
ImportFileTask task = new ImportFileTask(this, result -> {
if (result.getError() == null) {
CustomSvgIcon icon = new CustomSvgIcon(result.getFile());
selectIcon(icon);
} else {
Dialogs.showErrorDialog(this, R.string.reading_file_error, result.getError());
}
});
task.execute(getLifecycle(), params);
} else {
startEditingIcon(data.getData());
}
});

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -489,7 +512,7 @@ private void startImageSelectionActivity() {

Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.select_icon));
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { fileIntent });
_vaultManager.startActivityForResult(this, chooserIntent, PICK_IMAGE_REQUEST);
_vaultManager.fireIntentLauncher(this, chooserIntent, pickImageResultLauncher);
}

private void resetUsageCount() {
Expand Down Expand Up @@ -618,29 +641,6 @@ private void saveAndFinish(VaultEntry entry, boolean delete) {
}
}

@Override
protected void onActivityResult(int requestCode, final int resultCode, Intent data) {
if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getData() != null) {
String fileType = SafHelper.getMimeType(this, data.getData());
if (fileType != null && fileType.equals(IconType.SVG.toMimeType())) {
ImportFileTask.Params params = new ImportFileTask.Params(data.getData(), "icon", null);
ImportFileTask task = new ImportFileTask(this, result -> {
if (result.getError() == null) {
CustomSvgIcon icon = new CustomSvgIcon(result.getFile());
selectIcon(icon);
} else {
Dialogs.showErrorDialog(this, R.string.reading_file_error, result.getError());
}
});
task.execute(getLifecycle(), params);
} else {
startEditingIcon(data.getData());
}
}

super.onActivityResult(requestCode, resultCode, data);
}

private int parsePeriod() throws ParseException {
try {
return Integer.parseInt(_textPeriodCounter.getText().toString());
Expand Down
156 changes: 84 additions & 72 deletions app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import android.widget.Toast;

import androidx.activity.OnBackPressedCallback;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.view.ActionMode;
Expand Down Expand Up @@ -68,17 +70,6 @@
import java.util.stream.Collectors;

public class MainActivity extends AegisActivity implements EntryListView.Listener {
// activity request codes
private static final int CODE_SCAN = 0;
private static final int CODE_ADD_ENTRY = 1;
private static final int CODE_EDIT_ENTRY = 2;
private static final int CODE_DO_INTRO = 3;
private static final int CODE_DECRYPT = 4;
private static final int CODE_PREFERENCES = 5;
private static final int CODE_SCAN_IMAGE = 6;
private static final int CODE_ASSIGN_ICONS = 7;


// Permission request codes
private static final int CODE_PERM_CAMERA = 0;

Expand Down Expand Up @@ -108,6 +99,69 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
private SearchViewBackPressHandler _searchViewBackPressHandler;
private ActionModeBackPressHandler _actionModeBackPressHandler;

private final ActivityResultLauncher<Intent> authResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
_isAuthenticating = false;
if (activityResult.getResultCode() == RESULT_OK) {
onDecryptResult();
}
});

private final ActivityResultLauncher<Intent> introResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
_isDoingIntro = false;
if (activityResult.getResultCode() == RESULT_OK) {
onIntroResult();
}
});

private final ActivityResultLauncher<Intent> scanResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
return;
}
onScanResult(activityResult.getData());
});

private final ActivityResultLauncher<Intent> assignIconsResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
return;
}
onAssignEntriesResult(activityResult.getData());
});

private final ActivityResultLauncher<Intent> preferenceResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
return;
}
onPreferencesResult(activityResult.getData());
});

private final ActivityResultLauncher<Intent> editEntryResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
return;
}
onEditEntryResult(activityResult.getData());
});

private final ActivityResultLauncher<Intent> addEntryResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() != RESULT_OK || activityResult.getData() == null) {
return;
}
onAddEntryResult(activityResult.getData());
});

private final ActivityResultLauncher<Intent> codeScanResultLauncher =
registerForActivityResult(new StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() == RESULT_OK && activityResult.getData() != null) {
onScanImageResult(activityResult.getData());
}
});

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -155,7 +209,7 @@ protected void onCreate(Bundle savedInstanceState) {

view.findViewById(R.id.fab_enter).setOnClickListener(v1 -> {
dialog.dismiss();
startEditEntryActivityForManual(CODE_ADD_ENTRY);
startEditEntryActivityForManual();
});
view.findViewById(R.id.fab_scan_image).setOnClickListener(v2 -> {
dialog.dismiss();
Expand Down Expand Up @@ -201,48 +255,6 @@ protected void onSaveInstanceState(@NonNull Bundle instance) {
instance.putBoolean("isAuthenticating", _isAuthenticating);
}

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == CODE_DECRYPT) {
_isAuthenticating = false;
}
if (requestCode == CODE_DO_INTRO) {
_isDoingIntro = false;
}
if (resultCode != RESULT_OK) {
return;
}

switch (requestCode) {
case CODE_SCAN:
onScanResult(data);
break;
case CODE_ADD_ENTRY:
onAddEntryResult(data);
break;
case CODE_EDIT_ENTRY:
onEditEntryResult(data);
break;
case CODE_DO_INTRO:
onIntroResult();
break;
case CODE_DECRYPT:
onDecryptResult();
break;
case CODE_PREFERENCES:
onPreferencesResult(data);
break;
case CODE_SCAN_IMAGE:
onScanImageResult(data);
break;
case CODE_ASSIGN_ICONS:
onAssignEntriesResult(data);
break;
}

super.onActivityResult(requestCode, resultCode, data);
}

@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (!PermissionHelper.checkResults(grantResults)) {
Expand Down Expand Up @@ -303,41 +315,41 @@ private void onPreferencesResult(Intent data) {
}
}

private void startEditEntryActivityForNew(int requestCode, VaultEntry entry) {
private void startEditEntryActivityForNew(VaultEntry entry) {
Intent intent = new Intent(this, EditEntryActivity.class);
intent.putExtra("newEntry", entry);
intent.putExtra("isManual", false);
startActivityForResult(intent, requestCode);
addEntryResultLauncher.launch(intent);
}

private void startEditEntryActivityForManual(int requestCode) {
private void startEditEntryActivityForManual() {
Intent intent = new Intent(this, EditEntryActivity.class);
intent.putExtra("newEntry", VaultEntry.getDefault());
intent.putExtra("isManual", true);
startActivityForResult(intent, requestCode);
addEntryResultLauncher.launch(intent);
}

private void startEditEntryActivity(int requestCode, VaultEntry entry) {
private void startEditEntryActivity(VaultEntry entry) {
Intent intent = new Intent(this, EditEntryActivity.class);
intent.putExtra("entryUUID", entry.getUUID());
startActivityForResult(intent, requestCode);
editEntryResultLauncher.launch(intent);
}

private void startAssignIconsActivity(int requestCode, List<VaultEntry> entries) {
private void startAssignIconsActivity(List<VaultEntry> entries) {
ArrayList<UUID> assignIconEntriesIds = new ArrayList<>();
Intent assignIconIntent = new Intent(getBaseContext(), AssignIconsActivity.class);
for (VaultEntry entry : entries) {
assignIconEntriesIds.add(entry.getUUID());
}

assignIconIntent.putExtra("entries", assignIconEntriesIds);
startActivityForResult(assignIconIntent, requestCode);
assignIconsResultLauncher.launch(assignIconIntent);
}

private void startIntroActivity() {
if (!_isDoingIntro) {
Intent intro = new Intent(this, IntroActivity.class);
startActivityForResult(intro, CODE_DO_INTRO);
introResultLauncher.launch(intro);
_isDoingIntro = true;
}
}
Expand Down Expand Up @@ -473,7 +485,7 @@ private void startDecodeQrCodeImages(List<Uri> uris) {

private void importScannedEntries(List<VaultEntry> entries) {
if (entries.size() == 1) {
startEditEntryActivityForNew(CODE_ADD_ENTRY, entries.get(0));
startEditEntryActivityForNew(entries.get(0));
} else if (entries.size() > 1) {
for (VaultEntry entry: entries) {
_vaultManager.getVault().addEntry(entry);
Expand Down Expand Up @@ -517,7 +529,7 @@ private void startScanActivity() {
}

Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class);
startActivityForResult(scannerActivity, CODE_SCAN);
scanResultLauncher.launch(scannerActivity);
}

private void startScanImageActivity() {
Expand All @@ -531,7 +543,7 @@ private void startScanImageActivity() {

Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.select_picture));
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { fileIntent });
_vaultManager.startActivityForResult(this, chooserIntent, CODE_SCAN_IMAGE);
_vaultManager.fireIntentLauncher(this, chooserIntent, codeScanResultLauncher);
}

private void startPreferencesActivity() {
Expand All @@ -542,7 +554,7 @@ private void startPreferencesActivity(Class<? extends PreferencesFragment> fragm
Intent intent = new Intent(this, PreferencesActivity.class);
intent.putExtra("fragment", fragmentType);
intent.putExtra("pref", preference);
startActivityForResult(intent, CODE_PREFERENCES);
preferenceResultLauncher.launch(intent);
}

private void doShortcutActions() {
Expand Down Expand Up @@ -589,7 +601,7 @@ private void handleIncomingIntent() {
}

VaultEntry entry = new VaultEntry(info);
startEditEntryActivityForNew(CODE_ADD_ENTRY, entry);
startEditEntryActivityForNew(entry);
}
break;
case Intent.ACTION_SEND:
Expand Down Expand Up @@ -617,7 +629,7 @@ private void handleIncomingIntent() {
}

VaultEntry entry = new VaultEntry(info);
startEditEntryActivityForNew(CODE_ADD_ENTRY, entry);
startEditEntryActivityForNew(entry);
}
}
break;
Expand Down Expand Up @@ -826,7 +838,7 @@ private void startAuthActivity(boolean inhibitBioPrompt) {
if (!_isAuthenticating) {
Intent intent = new Intent(this, AuthActivity.class);
intent.putExtra("inhibitBioPrompt", inhibitBioPrompt);
startActivityForResult(intent, CODE_DECRYPT);
authResultLauncher.launch(intent);
_isAuthenticating = true;
}
}
Expand Down Expand Up @@ -1120,7 +1132,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
copyEntryCode(_selectedEntries.get(0));
mode.finish();
} else if (itemId == R.id.action_edit) {
startEditEntryActivity(CODE_EDIT_ENTRY, _selectedEntries.get(0));
startEditEntryActivity(_selectedEntries.get(0));
mode.finish();
} else if (itemId == R.id.action_toggle_favorite) {
for (VaultEntry entry : _selectedEntries) {
Expand Down Expand Up @@ -1154,7 +1166,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
setFavoriteMenuItemVisiblity();
setIsMultipleSelected(_selectedEntries.size() > 1);
} else if (itemId == R.id.action_assign_icons) {
startAssignIconsActivity(CODE_ASSIGN_ICONS, _selectedEntries);
startAssignIconsActivity(_selectedEntries);
mode.finish();
} else {
return false;
Expand Down
Loading

0 comments on commit a1d00b4

Please sign in to comment.