diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-04-20 09:32:18 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-04-20 09:32:39 +0300 |
commit | e8e350e99cb322ad0dc3da2eb9493ae7ed21e2a7 (patch) | |
tree | be768b055b660da1f12b6433e6beb51b1af7e045 /app/src/main/java/it/niedermann | |
parent | 20b4163ea014968f5daa95117b4217f2e286580d (diff) | |
parent | 1cb9573c8d16bcac3e21e551bad9c6f9d3d3ebd9 (diff) |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
Diffstat (limited to 'app/src/main/java/it/niedermann')
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 ef31acfc..7299bc59 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java @@ -1,19 +1,19 @@ package it.niedermann.owncloud.notes; +import android.app.Application; import android.content.Context; import android.content.SharedPreferences; 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.preference.PreferenceManager.getDefaultSharedPreferences; -public class NotesApplication extends MultiDexApplication { +public class NotesApplication extends Application { private static final String TAG = NotesApplication.class.getSimpleName(); private static final long LOCK_TIME = 30_000; |