mirror of
https://github.com/m2049r/xmrwallet
synced 2025-11-09 17:02:29 +01:00
Compare commits
2 Commits
v4.1.6
...
fix/qr_amo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54215138d3 | ||
|
|
1f5ad86b07 |
@@ -108,8 +108,8 @@ android {
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
namespace 'com.m2049r.xmrwallet'
|
||||
buildFeatures {
|
||||
@@ -136,42 +136,42 @@ static def getId(name) {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
|
||||
implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.21'))
|
||||
|
||||
implementation 'androidx.core:core:1.15.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.7.0'
|
||||
implementation 'androidx.core:core:1.16.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.7.1'
|
||||
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.4.0'
|
||||
implementation 'androidx.cardview:cardview:1.0.0'
|
||||
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
|
||||
implementation 'androidx.preference:preference:1.2.1'
|
||||
|
||||
implementation 'com.google.android.material:material:1.12.0'
|
||||
|
||||
implementation "com.google.guava:guava:33.1.0-android"
|
||||
implementation 'com.google.guava:guava:33.4.8-android'
|
||||
|
||||
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
|
||||
implementation "com.squareup.okhttp3:okhttp:4.12.0"
|
||||
implementation "io.github.rburgst:okhttp-digest:3.1.0"
|
||||
implementation 'io.github.rburgst:okhttp-digest:3.1.1'
|
||||
implementation "com.jakewharton.timber:timber:5.0.1"
|
||||
|
||||
implementation 'info.guardianproject.netcipher:netcipher:2.1.0'
|
||||
//implementation 'info.guardianproject.netcipher:netcipher-okhttp3:2.1.0'
|
||||
implementation fileTree(dir: 'libs/classes', include: ['*.jar'])
|
||||
implementation 'com.nulab-inc:zxcvbn:1.8.2'
|
||||
implementation 'com.nulab-inc:zxcvbn:1.9.0'
|
||||
|
||||
implementation 'dnsjava:dnsjava:3.5.3'
|
||||
implementation 'org.slf4j:slf4j-nop:2.0.11'
|
||||
implementation 'dnsjava:dnsjava:3.6.3'
|
||||
implementation 'org.slf4j:slf4j-nop:2.0.17'
|
||||
implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'
|
||||
|
||||
//noinspection GradleDependency
|
||||
testImplementation "junit:junit:4.13.2"
|
||||
testImplementation "org.mockito:mockito-all:1.10.19"
|
||||
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
|
||||
testImplementation 'org.json:json:20231013'
|
||||
testImplementation 'org.json:json:20250517'
|
||||
testImplementation 'net.jodah:concurrentunit:0.4.6'
|
||||
|
||||
compileOnly 'org.projectlombok:lombok:1.18.30'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.30'
|
||||
compileOnly 'org.projectlombok:lombok:1.18.38'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.18.38'
|
||||
}
|
||||
|
||||
@@ -908,7 +908,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
|
||||
BarcodeData bcData = BarcodeData.fromString(qrCode);
|
||||
if (bcData != null) {
|
||||
popFragmentStack(null);
|
||||
Timber.d("AAA");
|
||||
onUriScanned(bcData);
|
||||
return true;
|
||||
} else {
|
||||
|
||||
@@ -160,11 +160,12 @@ public class SendAddressWizardFragment extends SendWizardFragment {
|
||||
public void afterTextChanged(Editable editable) {
|
||||
Timber.d("AFTER: %s", editable.toString());
|
||||
BarcodeData bc = sendListener.getBarcodeData();
|
||||
if ((bc != null) && !bc.getAddress().equals(etAddress.getEditText().getText().toString()))
|
||||
sendListener.setBarcodeData(null); // it's used up now
|
||||
if (bc == null) {
|
||||
final String address = etAddress.getEditText().getText().toString();
|
||||
bc = BarcodeData.fromString(address);
|
||||
}
|
||||
sendListener.setBarcodeData(null); // it's used up now
|
||||
possibleCryptos.clear();
|
||||
selectedCrypto = null;
|
||||
if ((bc != null) && (bc.filter(ShiftService.getPossibleAssets()))) {
|
||||
|
||||
@@ -5,7 +5,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.5.1'
|
||||
classpath 'com.android.tools.build:gradle:8.10.1'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
Reference in New Issue
Block a user