From 10265ad69744cf3f378764d2e34eb9d91db97808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 10 Sep 2022 23:06:02 +0100
Subject: [PATCH] Remove multidex dependency

---
 app/build.gradle                                          | 4 ----
 .../freeyourgadget/gadgetbridge/GBApplication.java        | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3da0e819f..9875bc086 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,13 +53,11 @@ android {
         applicationId "nodomain.freeyourgadget.gadgetbridge"
         minSdkVersion 21
         targetSdkVersion 29
-        multiDexEnabled true
 
         // Note: always bump BOTH versionCode and versionName!
         versionName "0.70.0"
         versionCode 215
         vectorDrawables.useSupportLibrary = true
-        multiDexEnabled true
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"
         resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
@@ -235,7 +233,6 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation "androidx.multidex:multidex:2.0.1"
     implementation "androidx.palette:palette:1.0.0"
 
     implementation "com.google.android.material:material:1.4.0"
@@ -260,7 +257,6 @@ dependencies {
 //    implementation project(":DaoCore")
     implementation 'com.github.wax911:android-emojify:0.1.7'
     implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
-    implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.android.volley:volley:1.2.1'
 
     // Android SDK bundles org.json, but we need an actual implementation to replace the stubs in tests
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 9e9d31e4c..cc79aec6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -99,8 +99,6 @@ import static nodomain.freeyourgadget.gadgetbridge.model.DeviceType.fromKey;
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_CHANNEL_HIGH_PRIORITY_ID;
 import static nodomain.freeyourgadget.gadgetbridge.util.GB.NOTIFICATION_ID_ERROR;
 
-import androidx.multidex.MultiDex;
-
 /**
  * Main Application class that initializes and provides access to certain things like
  * logging and DB access.
@@ -168,12 +166,6 @@ public class GBApplication extends Application {
         // don't do anything here, add it to onCreate instead
     }
 
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        MultiDex.install(this);
-    }
-
     public static Logging getLogging() {
         return logging;
     }