From 9357b35cf95df95c7b6fb0baa5358899d0d380a7 Mon Sep 17 00:00:00 2001 From: mint-chime Date: Fri, 18 Jun 2021 22:45:07 -0500 Subject: [PATCH] Revert "* app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java:" This reverts commit 519c45ae0dfaee556de909bf65cea8c3b38c34ab. --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 7 +------ .../java/io/lbry/browser/ui/wallet/WalletFragment.java | 9 +++++---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8f084e69..6870adc5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -122,9 +122,6 @@ dependencies { implementation 'org.bitcoinj:bitcoinj-tools:0.14.7' implementation 'org.java-websocket:Java-WebSocket:1.5.1' - implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } - implementation 'com.google.zxing:core:3.3.0' - compileOnly 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' @@ -137,6 +134,9 @@ dependencies { __32bitImplementation 'io.lbry:lbrysdk32:0.94.1' __64bitImplementation 'io.lbry:lbrysdk64:0.94.1' + + implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } + implementation 'com.google.zxing:core:3.3.0' } apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f958fdd..da4b5252 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -101,11 +101,6 @@ android:theme="@style/AppTheme.NoActionBarTranslucent" android:windowSoftInputMode="adjustResize" /> - - @@ -124,4 +119,4 @@ android:resource="@xml/filepaths" /> - \ No newline at end of file + diff --git a/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java b/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java index b9a70f93..bcb07f14 100644 --- a/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java @@ -377,7 +377,7 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W buttonQRScanAddress.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - IntentIntegrator.forSupportFragment(WalletFragment.this).setOrientationLocked(false).initiateScan(); + IntentIntegrator.forSupportFragment(WalletFragment.this).initiateScan(); } }); buttonSend.setOnClickListener(new View.OnClickListener() { @@ -727,8 +727,8 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W } else { firstDatasetNotification = false; if (!detailRows.get(0).detailAmount.equals(earnedBalance.detailAmount) - || detailRows.get(0).isInProgress != earnedBalance.isInProgress - || detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) { + || detailRows.get(0).isInProgress != earnedBalance.isInProgress + || detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) { detailRows.set(0, earnedBalance); needNotifyAdapter = true; } @@ -820,4 +820,5 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W inputSendAddress.setText(code); } } -} + +} \ No newline at end of file