This commit is contained in:
wchen342
2021-10-20 18:11:32 +03:00
parent 851982d0a9
commit 7c0d912261
4 changed files with 29 additions and 20 deletions
@@ -272,8 +272,7 @@ public class BraveWalletActivity
@Override
protected ActivityWindowAndroid createWindowAndroid() {
return new ActivityWindowAndroid(this, true,
getIntentRequestTracker()) {
return new ActivityWindowAndroid(this, true, getIntentRequestTracker()) {
@Override
public ModalDialogManager getModalDialogManager() {
return mModalDialogManager;
@@ -5,8 +5,8 @@
package org.chromium.chrome.browser.crypto_wallet.fragments;
import android.app.Activity;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
import android.content.Intent;
import android.net.Uri;
@@ -33,16 +33,19 @@ import org.chromium.chrome.browser.crypto_wallet.util.Utils;
import org.chromium.chrome.browser.init.AsyncInitializationActivity;
import org.chromium.ui.base.WindowAndroid;
public class RecoveryPhraseSaveCopyBottomSheetDialogFragment
extends BottomSheetDialogFragment implements View.OnClickListener, WindowAndroid.IntentCallback {
public static final String TAG_FRAGMENT = RecoveryPhraseSaveCopyBottomSheetDialogFragment.class.getName();
public class RecoveryPhraseSaveCopyBottomSheetDialogFragment extends BottomSheetDialogFragment
implements View.OnClickListener, WindowAndroid.IntentCallback {
public static final String TAG_FRAGMENT =
RecoveryPhraseSaveCopyBottomSheetDialogFragment.class.getName();
LinearLayout mCopyLayout;
LinearLayout mSaveLayout;
private String mRecoveryPhrasesText;
public static RecoveryPhraseSaveCopyBottomSheetDialogFragment newInstance(String recoveryPhrasesText) {
RecoveryPhraseSaveCopyBottomSheetDialogFragment recoveryPhraseSaveCopyBottomSheetDialogFragment =
new RecoveryPhraseSaveCopyBottomSheetDialogFragment();
public static RecoveryPhraseSaveCopyBottomSheetDialogFragment newInstance(
String recoveryPhrasesText) {
RecoveryPhraseSaveCopyBottomSheetDialogFragment
recoveryPhraseSaveCopyBottomSheetDialogFragment =
new RecoveryPhraseSaveCopyBottomSheetDialogFragment();
Bundle args = new Bundle();
args.putCharSequence("recoveryPhrasesText", recoveryPhrasesText);
recoveryPhraseSaveCopyBottomSheetDialogFragment.setArguments(args);
@@ -65,10 +65,13 @@ public class RecoveryPhraseFragment extends CryptoOnboardingFragment {
TextView copyButton = view.findViewById(R.id.btn_copy);
assert getActivity() != null;
copyButton.setOnClickListener(v -> {
RecoveryPhraseSaveCopyBottomSheetDialogFragment recoveryPhraseSaveCopyBottomSheetDialogFragment =
RecoveryPhraseSaveCopyBottomSheetDialogFragment.newInstance(Utils.getRecoveryPhraseFromList(recoveryPhrases));
RecoveryPhraseSaveCopyBottomSheetDialogFragment
recoveryPhraseSaveCopyBottomSheetDialogFragment =
RecoveryPhraseSaveCopyBottomSheetDialogFragment.newInstance(
Utils.getRecoveryPhraseFromList(recoveryPhrases));
recoveryPhraseSaveCopyBottomSheetDialogFragment.show(
((FragmentActivity) getActivity()).getSupportFragmentManager(), RecoveryPhraseSaveCopyBottomSheetDialogFragment.TAG_FRAGMENT);
((FragmentActivity) getActivity()).getSupportFragmentManager(),
RecoveryPhraseSaveCopyBottomSheetDialogFragment.TAG_FRAGMENT);
});
setupRecoveryPhraseRecyclerView(view);
});
@@ -14,9 +14,9 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.content.pm.PackageManager;
import android.content.res.AssetFileDescriptor;
import android.graphics.Bitmap;
import android.net.Uri;
import android.view.inputmethod.InputMethodManager;
@@ -26,8 +26,8 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.chromium.base.Log;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.brave_wallet.mojom.BraveWalletConstants;
import org.chromium.brave_wallet.mojom.TxData;
import org.chromium.chrome.R;
@@ -39,10 +39,10 @@ import org.chromium.chrome.browser.init.AsyncInitializationActivity;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.widget.Toast;
import java.lang.NumberFormatException;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.NumberFormatException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.MathContext;
@@ -113,14 +113,14 @@ public class Utils {
}
}
public static void LaunchBackupFilePicker(AsyncInitializationActivity activity,
WindowAndroid.IntentCallback callback) {
public static void LaunchBackupFilePicker(
AsyncInitializationActivity activity, WindowAndroid.IntentCallback callback) {
// Check if READ_EXTERNAL_STORAGE permission is granted.
String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
WindowAndroid window = activity.getWindowAndroid();
assert window != null;
if (!window.hasPermission(storagePermission)) {
String[] requestPermissions = new String[]{storagePermission};
String[] requestPermissions = new String[] {storagePermission};
window.requestPermissions(requestPermissions, (permissions, grantResults) -> {
assert permissions.length == 1 && grantResults.length == 1;
if (grantResults[0] == PackageManager.PERMISSION_DENIED) {
@@ -164,11 +164,15 @@ public class Utils {
}
public static void onFileSaved() {
Toast.makeText(ContextUtils.getApplicationContext(), R.string.text_has_been_saved, Toast.LENGTH_SHORT).show();
Toast.makeText(ContextUtils.getApplicationContext(), R.string.text_has_been_saved,
Toast.LENGTH_SHORT)
.show();
}
public static void onFileNotSelected() {
Toast.makeText(ContextUtils.getApplicationContext(), R.string.text_file_not_saved, Toast.LENGTH_SHORT).show();
Toast.makeText(ContextUtils.getApplicationContext(), R.string.text_file_not_saved,
Toast.LENGTH_SHORT)
.show();
}
public static boolean shouldShowCryptoOnboarding() {