Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up code

Browse Source 
rebase
This commit is contained in:
Deep
2021-06-15 14:11:02 -04:00
parent 1a857f4e95
commit 859720ff3f
10 changed files with 58 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletNativeWorker.java
-2
View File
@@ -8,7 +8,6 @@ package org.chromium.chrome.browser.crypto_wallet;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.base.Log;
@JNINamespace("chrome::android")
public class BraveWalletNativeWorker {
@@ -58,7 +57,6 @@ public class BraveWalletNativeWorker {
}
public boolean isWalletLocked() {
Log.e("NTP", "isWalletLocked : "+BraveWalletNativeWorkerJni.get().isWalletLocked(mNativeBraveWalletNativeWorker));
return BraveWalletNativeWorkerJni.get().isWalletLocked(mNativeBraveWalletNativeWorker);
}
android/java/org/chromium/chrome/browser/crypto_wallet/CryptoWalletActivity.java
+4 -8
View File
@@ -21,7 +21,9 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.crypto_wallet.BraveWalletNativeWorker;
import org.chromium.chrome.browser.crypto_wallet.adapters.WalletNavigationFragmentPageAdapter;
import org.chromium.chrome.browser.crypto_wallet.fragments.CardsFragment;
import org.chromium.chrome.browser.crypto_wallet.fragments.CryptoFragment;
@@ -29,8 +31,6 @@ import org.chromium.chrome.browser.crypto_wallet.fragments.RewardsFragment;
import org.chromium.chrome.browser.crypto_wallet.fragments.SwapBottomSheetDialogFragment;
import org.chromium.chrome.browser.crypto_wallet.listeners.OnFinishOnboarding;
import org.chromium.chrome.browser.crypto_wallet.util.NavigationItem;
import org.chromium.chrome.browser.crypto_wallet.BraveWalletNativeWorker;
import org.chromium.base.Log;
import java.util.ArrayList;
import java.util.List;
@@ -56,6 +56,8 @@ public class CryptoWalletActivity extends AppCompatActivity {
getMenuInflater().inflate(R.menu.wallet_search, menu);
final MenuItem searchItem = menu.findItem(R.id.search);
SearchView searchView = (SearchView) searchItem.getActionView();
// TODO below code will get updated in follow up issue.
// EditText searchEditText =
// searchView.findViewById(androidx.appcompat.R.id.search_src_text);
// searchEditText.setTextColor(getResources().getColor(android.R.color.black));
@@ -115,12 +117,6 @@ public class CryptoWalletActivity extends AppCompatActivity {
BraveWalletNativeWorker.getInstance().lockWallet();
}
@Override
protected void onResume() {
super.onResume();
Log.e("NTP", "OnResume");
}
private void setNavigationFragments() {
List<NavigationItem> navigationItems = new ArrayList<>();
int navigationMenu;
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/CryptoFragment.java
+21 -20
View File
@@ -24,6 +24,7 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.crypto_wallet.BraveWalletNativeWorker;
import org.chromium.chrome.browser.crypto_wallet.CryptoWalletActivity;
import org.chromium.chrome.browser.crypto_wallet.adapters.CryptoFragmentPageAdapter;
import org.chromium.chrome.browser.crypto_wallet.adapters.CryptoWalletOnboardingPagerAdapter;
@@ -36,7 +37,6 @@ import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.
import org.chromium.chrome.browser.crypto_wallet.fragments.onboarding_fragments.VerifyRecoveryPhraseFragment;
import org.chromium.chrome.browser.crypto_wallet.listeners.OnFinishOnboarding;
import org.chromium.chrome.browser.crypto_wallet.listeners.OnNextPage;
import org.chromium.chrome.browser.crypto_wallet.BraveWalletNativeWorker;
import org.chromium.chrome.browser.crypto_wallet.util.NavigationItem;
import java.util.ArrayList;
@@ -93,34 +93,35 @@ public class CryptoFragment extends Fragment {
onboardingBackButton.setVisibility(View.GONE);
onboardingBackButton.setOnClickListener(v -> {
if (cryptoWalletOnboardingViewPager != null) {
cryptoWalletOnboardingViewPager.setCurrentItem(cryptoWalletOnboardingViewPager.getCurrentItem() - 1);
cryptoWalletOnboardingViewPager.setCurrentItem(
cryptoWalletOnboardingViewPager.getCurrentItem() - 1);
}
});
cryptoWalletOnboardingViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
cryptoWalletOnboardingViewPager.addOnPageChangeListener(
new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(
int position, float positionOffset, int positionOffsetPixels) {}
}
@Override
public void onPageSelected(int position) {
if (position == 0 || position == 2) {
onboardingBackButton.setVisibility(View.GONE);
} else {
onboardingBackButton.setVisibility(View.VISIBLE);
}
}
@Override
public void onPageSelected(int position) {
if (position == 0 || position == 2) {
onboardingBackButton.setVisibility(View.GONE);
} else {
onboardingBackButton.setVisibility(View.VISIBLE);
}
}
@Override
public void onPageScrollStateChanged(int state) {}
});
// TODO below code commented out for logic, it will get updated in follow up issue.
@Override
public void onPageScrollStateChanged(int state) {
}
});
// if (BraveWalletNativeWorker.getInstance().isWalletLocked()) {
// setNavigationFragments(UNLOCK_WALLET_ACTION);
// } else {
setNavigationFragments(ONBOARDING_ACTION);
setNavigationFragments(ONBOARDING_ACTION);
// }
}
}
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/SwapBottomSheetDialogFragment.java
+2 -1
View File
@@ -18,6 +18,7 @@ import androidx.fragment.app.FragmentTransaction;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import org.chromium.base.Log;
import org.chromium.chrome.R;
public class SwapBottomSheetDialogFragment extends BottomSheetDialogFragment {
@@ -40,7 +41,7 @@ public class SwapBottomSheetDialogFragment extends BottomSheetDialogFragment {
transaction.add(this, tag);
transaction.commitAllowingStateLoss();
} catch (IllegalStateException e) {
// Log.e("SwapBottomSheetDialogFragment", e.getMessage());
Log.e("SwapBottomSheetDialogFragment", e.getMessage());
}
}
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/RecoveryPhraseFragment.java
+2 -3
View File
@@ -23,14 +23,13 @@ import org.chromium.chrome.browser.crypto_wallet.adapters.RecoveryPhraseAdapter;
import org.chromium.chrome.browser.crypto_wallet.util.ItemOffsetDecoration;
import org.chromium.chrome.browser.crypto_wallet.util.Utils;
import java.util.HashMap;
import java.util.Map;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RecoveryPhraseFragment extends CryptoOnboardingFragment {
private List<String> recoveryPhrases;
@Override
public void onCreate(Bundle savedInstanceState) {
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/RestoreWalletFragment.java
+6 -3
View File
@@ -59,10 +59,13 @@ public class RestoreWalletFragment extends CryptoOnboardingFragment {
String passwordInput = passwordEdittext.getText().toString().trim();
String retypePasswordInput = retypePasswordEdittext.getText().toString().trim();
if (passwordInput.isEmpty() || !Utils.PASSWORD_PATTERN.matcher(passwordInput).matches()) {
if (passwordInput.isEmpty()
|| !Utils.PASSWORD_PATTERN.matcher(passwordInput).matches()) {
passwordEdittext.setError(getResources().getString(R.string.password_text));
} else if (retypePasswordInput.isEmpty() || !passwordInput.equals(retypePasswordInput)) {
retypePasswordEdittext.setError(getResources().getString(R.string.retype_password_error));
} else if (retypePasswordInput.isEmpty()
|| !passwordInput.equals(retypePasswordInput)) {
retypePasswordEdittext.setError(
getResources().getString(R.string.retype_password_error));
} else {
// Restore button
}
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/SecurePasswordFragment.java
+14 -7
View File
@@ -23,9 +23,8 @@ import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.crypto_wallet.util.Utils;
import org.chromium.chrome.browser.crypto_wallet.BraveWalletNativeWorker;
import org.chromium.chrome.browser.crypto_wallet.util.Utils;
import java.util.concurrent.Executor;
@@ -54,15 +53,20 @@ public class SecurePasswordFragment extends CryptoOnboardingFragment {
String passwordInput = passwordEdittext.getText().toString().trim();
String retypePasswordInput = retypePasswordEdittext.getText().toString().trim();
if (passwordInput.isEmpty() || !Utils.PASSWORD_PATTERN.matcher(passwordInput).matches()) {
if (passwordInput.isEmpty()
|| !Utils.PASSWORD_PATTERN.matcher(passwordInput).matches()) {
passwordEdittext.setError(getResources().getString(R.string.password_text));
} else if (retypePasswordInput.isEmpty() || !passwordInput.equals(retypePasswordInput)) {
retypePasswordEdittext.setError(getResources().getString(R.string.retype_password_error));
} else if (retypePasswordInput.isEmpty()
|| !passwordInput.equals(retypePasswordInput)) {
retypePasswordEdittext.setError(
getResources().getString(R.string.retype_password_error));
} else {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
showFingerprintDialog(authenticationCallback);
} else {
Utils.recoveryPhrase = BraveWalletNativeWorker.getInstance().createWallet(passwordInput).trim();
Utils.recoveryPhrase = BraveWalletNativeWorker.getInstance()
.createWallet(passwordInput)
.trim();
onNextPage.gotoNextPage(false);
}
}
@@ -93,7 +97,10 @@ public class SecurePasswordFragment extends CryptoOnboardingFragment {
public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) {
super.onAuthenticationSucceeded(result);
// Go to next Page
Utils.recoveryPhrase = BraveWalletNativeWorker.getInstance().createWallet(passwordEdittext.getText().toString().trim()).trim();
Utils.recoveryPhrase =
BraveWalletNativeWorker.getInstance()
.createWallet(passwordEdittext.getText().toString().trim())
.trim();
onNextPage.gotoNextPage(false);
}
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/onboarding_fragments/UnlockWalletFragment.java
+2 -2
View File
@@ -18,7 +18,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.crypto_wallet.BraveWalletNativeWorker;
public class UnlockWalletFragment extends CryptoOnboardingFragment {
@@ -45,7 +44,8 @@ public class UnlockWalletFragment extends CryptoOnboardingFragment {
return;
}
if (BraveWalletNativeWorker.getInstance().unlockWallet(unlockWalletPassword.getText().toString())) {
if (BraveWalletNativeWorker.getInstance().unlockWallet(
unlockWalletPassword.getText().toString())) {
onNextPage.gotoNextPage(true);
} else {
unlockWalletPassword.setError(getString(R.string.password_error));
android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
+7 -12
View File
@@ -19,18 +19,13 @@ import java.util.Map;
import java.util.regex.Pattern;
public class Utils {
public static final Pattern PASSWORD_PATTERN =
Pattern.compile("^" +
"(?=.*[0-9])" + //at least 1 digit
"(?=.*[a-zA-Z])" + //any letter
"(?=.*[$&+,:;=?@#|'<>.^*()%!-])" + //at least 1 special character
"(?=\\S+$)" + //no white spaces
".{7,}" + //at least 7 characters
"$");
// public static final List<String> recoveryPhrases =
// new ArrayList<>(Arrays.asList("Tomato", "Green", "Velvet", "Span", "Celery", "Atoms",
// "Parent", "Stop", "Bowl", "Wishful", "Stone", "Exercise"));
public static final Pattern PASSWORD_PATTERN = Pattern.compile("^"
+ "(?=.*[0-9])" + // at least 1 digit
"(?=.*[a-zA-Z])" + // any letter
"(?=.*[$&+,:;=?@#|'<>.^*()%!-])" + // at least 1 special character
"(?=\\S+$)" + // no white spaces
".{7,}" + // at least 7 characters
"$");
public static String recoveryPhrase = "";