diff options
| -rw-r--r-- | app/build.gradle | 6 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java | 12 | ||||
| -rw-r--r-- | fastlane/metadata/android/en-US/changelogs/3001002.txt | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/app/build.gradle b/app/build.gradle index 9e144ea1..198e2d16 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,14 +7,15 @@ android { compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 + coreLibraryDesugaringEnabled true } defaultConfig { applicationId "it.niedermann.owncloud.notes" minSdkVersion 19 targetSdkVersion 29 - versionCode 3001001 - versionName "3.1.1" + versionCode 3001002 + versionName "3.1.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -79,6 +80,7 @@ dependencies { implementation "com.google.android.material:material:1.2.1" implementation 'androidx.multidex:multidex:2.0.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' // Testing testImplementation 'junit:junit:4.13.1' diff --git a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java index 143ddb64..7d02a1f4 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java @@ -7,17 +7,17 @@ import android.content.res.Configuration; import android.util.Log; import androidx.appcompat.app.AppCompatDelegate; +import androidx.multidex.MultiDexApplication; import androidx.preference.PreferenceManager; import it.niedermann.owncloud.notes.preferences.DarkModeSetting; -import static androidx.multidex.MultiDex.install; import static androidx.preference.PreferenceManager.getDefaultSharedPreferences; -public class NotesApplication extends Application { +public class NotesApplication extends MultiDexApplication { private static final String TAG = NotesApplication.class.getSimpleName(); - private static final long LOCK_TIME = 30 * 1000; + private static final long LOCK_TIME = 30_000; private static boolean lockedPreference = false; private static boolean isLocked = true; private static long lastInteraction = 0; @@ -34,12 +34,6 @@ public class NotesApplication extends Application { super.onCreate(); } - @Override - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - install(this); - } - public static void setAppTheme(DarkModeSetting setting) { AppCompatDelegate.setDefaultNightMode(setting.getModeId()); } diff --git a/fastlane/metadata/android/en-US/changelogs/3001002.txt b/fastlane/metadata/android/en-US/changelogs/3001002.txt new file mode 100644 index 00000000..0b8258c3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/3001002.txt @@ -0,0 +1 @@ +- 🐞 Fix crash for Android < 7 when open a note in preview mode (#1056)
\ No newline at end of file |