diff --git a/app/build.gradle b/app/build.gradle index 0b6ecede..2e1c4e2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,11 +36,6 @@ android { testInstrumentationRunnerArguments clearPackageData: 'true' } - lintOptions { - abortOnError true - disable "MissingTranslation" - checkDependencies true - } testOptions { execution 'ANDROIDX_TEST_ORCHESTRATOR' @@ -105,6 +100,11 @@ android { sourceCompatibility 1.8 coreLibraryDesugaringEnabled true } + lint { + abortOnError true + checkDependencies true + disable 'MissingTranslation' + } } protobuf { @@ -125,11 +125,11 @@ protobuf { dependencies { def androidTestVersion = '1.4.0' def cameraxVersion = '1.0.2' - def glideVersion = '4.12.0' + def glideVersion = '4.13.1' def guavaVersion = '31.0.1' - def hiltVersion = '2.38.1' + def hiltVersion = '2.41' def junitVersion = '4.13.2' - def libsuVersion = '3.2.1' + def libsuVersion = '4.0.3' annotationProcessor 'androidx.annotation:annotation:1.3.0' annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" @@ -166,11 +166,10 @@ dependencies { implementation 'com.google.zxing:core:3.4.1' implementation "com.mikepenz:iconics-core:3.2.5" implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar' - implementation 'com.nulab-inc:zxcvbn:1.5.2' + implementation 'com.nulab-inc:zxcvbn:1.6.0' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0' - // NOTE: this is kept at an old version on purpose (something in newer versions breaks the Authenticator Plus importer) - implementation 'net.lingala.zip4j:zip4j:2.6.0' + implementation 'net.lingala.zip4j:zip4j:2.10.0' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' implementation 'org.bouncycastle:bcprov-jdk15on:1.70' @@ -189,7 +188,7 @@ dependencies { testImplementation "androidx.test:core:${androidTestVersion}" testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" - testImplementation "org.json:json:20211205" + testImplementation "org.json:json:20220320" testImplementation 'org.robolectric:robolectric:4.7.3' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java index 7b6e694e..111d0daf 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java +++ b/app/src/main/java/com/beemdevelopment/aegis/importers/AuthyImporter.java @@ -129,7 +129,7 @@ public class AuthyImporter extends DatabaseImporter { } private JSONArray readFile(SuFile file, String key) throws IOException, XmlPullParserException { - try (SuFileInputStream inStream = new SuFileInputStream(file)) { + try (InputStream inStream = SuFileInputStream.open(file)) { XmlPullParser parser = Xml.newPullParser(); parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false); parser.setInput(inStream, null); diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java b/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java index 63713b83..7adcb534 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java +++ b/app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java @@ -66,7 +66,7 @@ public abstract class DatabaseImporter { public State readFromApp() throws PackageManager.NameNotFoundException, DatabaseImporterException { SuFile file = getAppPath(); - try (SuFileInputStream stream = new SuFileInputStream(file)) { + try (InputStream stream = SuFileInputStream.open(file)) { return read(stream, true); } catch (IOException e) { throw new DatabaseImporterException(e); diff --git a/app/src/main/java/com/beemdevelopment/aegis/importers/SqlImporterHelper.java b/app/src/main/java/com/beemdevelopment/aegis/importers/SqlImporterHelper.java index efb54968..f1403d96 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/importers/SqlImporterHelper.java +++ b/app/src/main/java/com/beemdevelopment/aegis/importers/SqlImporterHelper.java @@ -1,5 +1,7 @@ package com.beemdevelopment.aegis.importers; +import static android.database.sqlite.SQLiteDatabase.OPEN_READONLY; + import android.annotation.SuppressLint; import android.content.Context; import android.database.Cursor; @@ -19,8 +21,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; -import static android.database.sqlite.SQLiteDatabase.OPEN_READONLY; - public class SqlImporterHelper { private Context _context; @@ -36,7 +36,7 @@ public class SqlImporterHelper { for (SuFile file : SqlImporterHelper.findDatabaseFiles(path)) { // create temporary copies of the database files so that SQLiteDatabase can open them File fileCopy = null; - try (SuFileInputStream inStream = new SuFileInputStream(file)) { + try (InputStream inStream = SuFileInputStream.open(file)) { fileCopy = new File(dir, file.getName()); try (FileOutputStream out = new FileOutputStream(fileCopy)) { IOUtils.copy(inStream, out); diff --git a/build.gradle b/build.gradle index 8b020737..d33e3504 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1' + classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.41' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 86d01faf..652d74c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip