diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1666c7278..b43af6ce2 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 89f49875c..5a63940c2 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 5fab39d57..da99e5171 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
applicationId = 'com.wagerrwallet'
minSdkVersion 23
targetSdkVersion 28
- versionCode 248
- versionName "248"
+ versionCode 249
+ versionName "249"
multiDexEnabled true
// Similar to other properties in the defaultConfig block,
diff --git a/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java b/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java
index c6310e62f..d82777497 100644
--- a/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java
+++ b/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java
@@ -294,12 +294,6 @@ public void onClick(View v) {
BRDialog.showSimpleDialog(this, getString(R.string.Dialog_screenAlteringTitle), getString(R.string.Dialog_screenAlteringMessage));
}
- WalletsMaster.getInstance(this).getCurrentWallet(this).addBalanceChangedListener(new OnBalanceChangedListener() {
- @Override
- public void onBalanceChanged(String iso, long newBalance) {
- updateBalance();
- }
- });
}
public boolean isSearchActive() {
diff --git a/app/src/main/java/com/wagerrwallet/presenter/activities/settings/BetSettings.java b/app/src/main/java/com/wagerrwallet/presenter/activities/settings/BetSettings.java
index 188a788f9..d68aa4305 100644
--- a/app/src/main/java/com/wagerrwallet/presenter/activities/settings/BetSettings.java
+++ b/app/src/main/java/com/wagerrwallet/presenter/activities/settings/BetSettings.java
@@ -40,7 +40,7 @@ public class BetSettings extends BRActivity {
private AppCompatCheckBox chkDisplayOdds;
private static BetSettings app;
-
+ private ImageButton mBackButton;
public static BetSettings getApp() {
return app;
@@ -65,6 +65,16 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
BRSharedPrefs.putFeatureEnabled(app, isChecked, FEATURE_DISPLAY_ODDS);
}
});
+
+ mBackButton = findViewById(R.id.back_button);
+
+ mBackButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ onBackPressed();
+ }
+ });
+
}
@Override
diff --git a/app/src/main/java/com/wagerrwallet/tools/manager/SyncManager.java b/app/src/main/java/com/wagerrwallet/tools/manager/SyncManager.java
index 315f264ab..776a5f4d7 100644
--- a/app/src/main/java/com/wagerrwallet/tools/manager/SyncManager.java
+++ b/app/src/main/java/com/wagerrwallet/tools/manager/SyncManager.java
@@ -119,7 +119,7 @@ public void run() {
Thread.sleep(DELAY_MILLIS);
}
} catch (InterruptedException e) {
- Log.e(TAG, "run: " + getName(), e);
+ //Log.e(TAG, "run: " + getName(), e);
final double syncProgress = mCurrentWallet.getPeerManager().getSyncProgress(BRSharedPrefs.getStartHeight(mApp, mCurrentWallet.getIso(mApp)));
BRExecutor.getInstance().forMainThreadTasks().execute(new Runnable() {
@Override
diff --git a/app/src/main/java/com/wagerrwallet/tools/util/Utils.java b/app/src/main/java/com/wagerrwallet/tools/util/Utils.java
index f2de0edc6..255cc9068 100644
--- a/app/src/main/java/com/wagerrwallet/tools/util/Utils.java
+++ b/app/src/main/java/com/wagerrwallet/tools/util/Utils.java
@@ -160,6 +160,7 @@ public static byte[] hexToBytes(String s) {
}
public static boolean isFingerprintEnrolled(Context app) {
+ //return true;
FingerprintManager fingerprintManager = (FingerprintManager) app.getSystemService(FINGERPRINT_SERVICE);
if (fingerprintManager==null) { // Device doesn't support fingerprint authentication
return false;
@@ -167,9 +168,11 @@ public static boolean isFingerprintEnrolled(Context app) {
else {
return ActivityCompat.checkSelfPermission(app, Manifest.permission.USE_FINGERPRINT) == PackageManager.PERMISSION_GRANTED && fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints();
}
+
}
public static boolean isFingerprintAvailable(Context app) {
+ //return true;
FingerprintManager fingerprintManager = (FingerprintManager) app.getSystemService(FINGERPRINT_SERVICE);
if (fingerprintManager == null) return false;
// Device doesn't support fingerprint authentication
diff --git a/app/src/main/jni/breadwallet-core b/app/src/main/jni/breadwallet-core
index 7ec79402b..70dd580d6 160000
--- a/app/src/main/jni/breadwallet-core
+++ b/app/src/main/jni/breadwallet-core
@@ -1 +1 @@
-Subproject commit 7ec79402bd32973ffee14b3bc700d80b8b84ed21
+Subproject commit 70dd580d6599e646ca55566a96b070a62ccbed36
diff --git a/app/src/main/res/layout/activity_betsettings.xml b/app/src/main/res/layout/activity_betsettings.xml
index 428267bbe..d4d5e13c8 100644
--- a/app/src/main/res/layout/activity_betsettings.xml
+++ b/app/src/main/res/layout/activity_betsettings.xml
@@ -8,19 +8,44 @@
android:background="@color/extra_light_blue_background"
tools:context="com.wagerrwallet.presenter.activities.SetPinActivity">
-
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintLeft_toLeftOf="@+id/toolbar"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar" />
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 508e9d003..cde194855 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -36,12 +36,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
-
-
-
-