Merge branch 'master' into 831-room

# Conflicts:
#	app/build.gradle

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;