From 2cfb24f3dbe8d706e033b8f141b9372eaba3fb96 Mon Sep 17 00:00:00 2001 From: TheOneWithTheBraid Date: Thu, 26 May 2022 11:09:10 +0200 Subject: [PATCH] Revert "Revert "fix: remove proprietary classes from build"" This reverts commit 054a56ae18a04fc64f09756958c8217c7284c984...b36156a2d4c9b46911afecda56400b20c36f2946. In total, this is the reverted reverted reverted reverted commit. Hopefully the last time to revert... Signed-off-by: TheOneWithTheBraid --- android/app/build.gradle | 7 - android/app/proguard-rules.pro | 41 ---- .../chat/fluffy/fluffychat/MainActivity.kt | 2 + pubspec.lock | 8 +- scripts/enable-android-google-services.patch | 187 ++++++++++-------- 5 files changed, 110 insertions(+), 135 deletions(-) delete mode 100644 android/app/proguard-rules.pro diff --git a/android/app/build.gradle b/android/app/build.gradle index 3a1f9293..001fbd72 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -68,10 +68,6 @@ android { } release { signingConfig signingConfigs.release - minifyEnabled false - shrinkResources false - - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } @@ -83,9 +79,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation 'androidx.multidex:multidex:2.0.1' } diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro deleted file mode 100644 index 40570865..00000000 --- a/android/app/proguard-rules.pro +++ /dev/null @@ -1,41 +0,0 @@ --optimizationpasses 5 -## Flutter wrapper --keep class io.flutter.app.** { *; } --keep class io.flutter.plugin.** { *; } --keep class io.flutter.util.** { *; } --keep class io.flutter.view.** { *; } --keep class io.flutter.** { *; } --keep class io.flutter.plugins.** { *; } --dontwarn io.flutter.embedding.** - -##---------------Begin: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- -# Gson uses generic type information stored in a class file when working with fields. Proguard -# removes such information by default, so configure it to keep all of it. --keepattributes Signature - -# For using GSON @Expose annotation --keepattributes *Annotation* - -# Gson specific classes --dontwarn sun.misc.** - -# Application classes that will be serialized/deserialized over Gson --keep class com.google.gson.examples.android.model.** { ; } - -# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, -# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) --keep class * extends com.google.gson.TypeAdapter --keep class * implements com.google.gson.TypeAdapterFactory --keep class * implements com.google.gson.JsonSerializer --keep class * implements com.google.gson.JsonDeserializer - -# Prevent R8 from leaving Data object members always null --keepclassmembers,allowobfuscation class * { - @com.google.gson.annotations.SerializedName ; -} - -# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. --keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken --keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken - -##---------------End: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- \ No newline at end of file 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 894d1571..1afc4606 100644 --- a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt +++ b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt @@ -7,11 +7,13 @@ 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) } diff --git a/pubspec.lock b/pubspec.lock index 3e6c42df..9bb85c04 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1592,9 +1592,11 @@ packages: snapping_sheet: dependency: "direct main" description: - name: snapping_sheet - url: "https://pub.dartlang.org" - source: hosted + path: "." + ref: listenable + resolved-ref: "2d9f2a40590c13aadfd226c2e41b08e155e6a92e" + url: "https://github.com/TheOneWithTheBraid/snapping_sheet.git" + source: git version: "3.1.0" source_map_stack_trace: dependency: transitive diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index 31a2f21b..56a355a4 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -1,91 +1,110 @@ -diff --git a/android/app/build.gradle b/android/app/build.gradle -index ad9ffb87..37baafb1 100644 ---- a/android/app/build.gradle -+++ b/android/app/build.gradle -@@ -44,7 +44,7 @@ android { - - defaultConfig { - applicationId "chat.fluffy.fluffychat" -- minSdkVersion 16 -+ minSdkVersion 19 - targetSdkVersion 30 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName -@@ -82,11 +82,11 @@ flutter { - - dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -- //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 -+ implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - implementation 'androidx.multidex:multidex:2.0.1' - } - --//apply plugin: 'com.google.gms.google-services' -+apply plugin: 'com.google.gms.google-services' -diff --git a/android/app/src/main/kotlin/chat/fluffy/fluffychat/FcmPushService.kt b/android/app/src/main/kotlin/chat/fluffy/fluffychat/FcmPushService.kt -index d9930f55..510e9845 100644 ---- a/android/app/src/main/kotlin/chat/fluffy/fluffychat/FcmPushService.kt -+++ b/android/app/src/main/kotlin/chat/fluffy/fluffychat/FcmPushService.kt -@@ -1,4 +1,4 @@ --/*package chat.fluffy.fluffychat -+package chat.fluffy.fluffychat - - import com.famedly.fcm_shared_isolate.FcmSharedIsolateService - -@@ -33,4 +33,3 @@ class FcmPushService : FcmSharedIsolateService() { +diff --git b/android/app/build.gradle a/android/app/build.gradle +index 001fbd72..3a1f9293 100644 +--- b/android/app/build.gradle ++++ a/android/app/build.gradle +@@ -68,6 +68,10 @@ android { + } + release { + signingConfig signingConfigs.release ++ minifyEnabled false ++ shrinkResources false ++ ++ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } --*/ -\ No newline at end of file -diff --git a/android/build.gradle b/android/build.gradle -index 85aa8647..3b7e09e7 100644 ---- a/android/build.gradle -+++ b/android/build.gradle -@@ -8,7 +8,7 @@ buildscript { - dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" -- //classpath 'com.google.gms:google-services:4.3.8' -+ classpath 'com.google.gms:google-services:4.3.8' - } +@@ -79,6 +83,9 @@ flutter { + dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 ++ testImplementation 'junit:junit:4.12' ++ androidTestImplementation 'androidx.test:runner:1.1.1' ++ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + implementation 'androidx.multidex:multidex:2.0.1' } -diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart -index 00ca2aaa..8bb8a156 100644 ---- a/lib/utils/background_push.dart -+++ b/lib/utils/background_push.dart -@@ -39,7 +39,7 @@ import '../config/setting_keys.dart'; - import 'famedlysdk_store.dart'; - import 'platform_infos.dart'; +diff --git b/android/app/proguard-rules.pro a/android/app/proguard-rules.pro +new file mode 100644 +index 00000000..40570865 +--- /dev/null ++++ a/android/app/proguard-rules.pro +@@ -0,0 +1,41 @@ ++-optimizationpasses 5 ++## Flutter wrapper ++-keep class io.flutter.app.** { *; } ++-keep class io.flutter.plugin.** { *; } ++-keep class io.flutter.util.** { *; } ++-keep class io.flutter.view.** { *; } ++-keep class io.flutter.** { *; } ++-keep class io.flutter.plugins.** { *; } ++-dontwarn io.flutter.embedding.** ++ ++##---------------Begin: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- ++# Gson uses generic type information stored in a class file when working with fields. Proguard ++# removes such information by default, so configure it to keep all of it. ++-keepattributes Signature ++ ++# For using GSON @Expose annotation ++-keepattributes *Annotation* ++ ++# Gson specific classes ++-dontwarn sun.misc.** ++ ++# Application classes that will be serialized/deserialized over Gson ++-keep class com.google.gson.examples.android.model.** { ; } ++ ++# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, ++# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) ++-keep class * extends com.google.gson.TypeAdapter ++-keep class * implements com.google.gson.TypeAdapterFactory ++-keep class * implements com.google.gson.JsonSerializer ++-keep class * implements com.google.gson.JsonDeserializer ++ ++# Prevent R8 from leaving Data object members always null ++-keepclassmembers,allowobfuscation class * { ++ @com.google.gson.annotations.SerializedName ; ++} ++ ++# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. ++-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken ++-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken ++ ++##---------------End: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- +\ No newline at end of file +diff --git b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt +index 1afc4606..894d1571 100644 +--- b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt ++++ a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt +@@ -7,13 +7,11 @@ import android.content.Context + import androidx.multidex.MultiDex --//import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; -+import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; + class MainActivity : FlutterActivity() { +- + override fun attachBaseContext(base: Context) { + super.attachBaseContext(base) + MultiDex.install(this) + } - class NoTokenException implements Exception { - String get cause => 'Cannot get firebase token'; -@@ -65,7 +65,7 @@ class BackgroundPush { - - final pendingTests = >{}; - -- final dynamic firebase = null; //FcmSharedIsolate(); -+ final dynamic firebase = FcmSharedIsolate(); - - DateTime? lastReceivedPush; - -diff --git a/pubspec.yaml b/pubspec.yaml -index c6295788..8dd17ce4 100644 ---- a/pubspec.yaml -+++ b/pubspec.yaml -@@ -24,7 +24,7 @@ dependencies: - email_validator: ^2.0.1 - emoji_picker_flutter: ^1.1.2 - encrypt: ^5.0.1 -- #fcm_shared_isolate: ^0.1.0 -+ fcm_shared_isolate: ^0.1.0 - file_picker_cross: ^4.6.0 - flutter: - sdk: flutter +- + override fun provideFlutterEngine(context: Context): FlutterEngine? { + return provideEngine(this) + } +diff --git b/pubspec.lock a/pubspec.lock +index 9bb85c04..3e6c42df 100644 +--- b/pubspec.lock ++++ a/pubspec.lock +@@ -1592,11 +1592,9 @@ packages: + snapping_sheet: + dependency: "direct main" + description: +- path: "." +- ref: listenable +- resolved-ref: "2d9f2a40590c13aadfd226c2e41b08e155e6a92e" +- url: "https://github.com/TheOneWithTheBraid/snapping_sheet.git" +- source: git ++ name: snapping_sheet ++ url: "https://pub.dartlang.org" ++ source: hosted + version: "3.1.0" + source_map_stack_trace: + dependency: transitive