From 3c869ba5644b979a7c2fc451a56522e79ef98fd2 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Sun, 22 Sep 2024 21:51:54 +0200 Subject: [PATCH 1/2] perf: remove unnecessary multidex library --- android/app/build.gradle | 6 ------ .../src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt | 7 ------- 2 files changed, 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7520ff2ab9..1a9b0a7d29 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -47,7 +47,6 @@ android { versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - multiDexEnabled true } signingConfigs { @@ -81,8 +80,3 @@ android { flutter { source '../..' } - -dependencies { - //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 - implementation 'androidx.multidex:multidex:2.0.1' -} diff --git a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt index 1afc460628..e33c73028e 100644 --- a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt +++ b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt @@ -4,16 +4,9 @@ import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.engine.FlutterEngine import android.content.Context -import androidx.multidex.MultiDex class MainActivity : FlutterActivity() { - override fun attachBaseContext(base: Context) { - super.attachBaseContext(base) - MultiDex.install(this) - } - - override fun provideFlutterEngine(context: Context): FlutterEngine? { return provideEngine(this) } From 4b4062996d4fbd40579328bb72da55a2c44eb77a Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 25 Sep 2024 13:30:06 +0200 Subject: [PATCH 2/2] add commented-out firebase-messaging back into build.gradle --- android/app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1a9b0a7d29..702298ddcc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -80,3 +80,7 @@ android { flutter { source '../..' } + +dependencies { + //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 +}