fix: add new Play patch

Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
This commit is contained in:
TheOneWithTheBraid 2022-05-26 20:59:52 +02:00
parent 2cfb24f3db
commit f8124e5edd

View File

@ -1,7 +1,16 @@
diff --git b/android/app/build.gradle a/android/app/build.gradle diff --git a/android/app/build.gradle b/android/app/build.gradle
index 001fbd72..3a1f9293 100644 index 001fbd72..339b35af 100644
--- b/android/app/build.gradle --- a/android/app/build.gradle
+++ 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
@@ -68,6 +68,10 @@ android { @@ -68,6 +68,10 @@ android {
} }
release { release {
@ -13,21 +22,25 @@ index 001fbd72..3a1f9293 100644
} }
} }
} }
@@ -79,6 +83,9 @@ flutter { @@ -78,8 +82,11 @@ flutter {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 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
+ 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' + testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test:runner:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
} }
diff --git b/android/app/proguard-rules.pro a/android/app/proguard-rules.pro -//apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
new file mode 100644 new file mode 100644
index 00000000..40570865 index 00000000..40570865
--- /dev/null --- /dev/null
+++ a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+-optimizationpasses 5 +-optimizationpasses 5
+## Flutter wrapper +## Flutter wrapper
@ -71,10 +84,26 @@ index 00000000..40570865
+ +
+##---------------End: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- +##---------------End: proguard configuration for Gson (Needed for flutter_local_notifications) ----------
\ No newline at end of file \ 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 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() {
}
}
}
-*/
\ 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 1afc4606..894d1571 100644 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
+++ a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt +++ b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt
@@ -7,13 +7,11 @@ import android.content.Context @@ -7,13 +7,11 @@ import android.content.Context
import androidx.multidex.MultiDex import androidx.multidex.MultiDex
@ -89,22 +118,51 @@ index 1afc4606..894d1571 100644
override fun provideFlutterEngine(context: Context): FlutterEngine? { override fun provideFlutterEngine(context: Context): FlutterEngine? {
return provideEngine(this) return provideEngine(this)
} }
diff --git b/pubspec.lock a/pubspec.lock diff --git a/android/build.gradle b/android/build.gradle
index 9bb85c04..3e6c42df 100644 index 85aa8647..3b7e09e7 100644
--- b/pubspec.lock --- a/android/build.gradle
+++ a/pubspec.lock +++ b/android/build.gradle
@@ -1592,11 +1592,9 @@ packages: @@ -8,7 +8,7 @@ buildscript {
snapping_sheet: dependencies {
dependency: "direct main" classpath 'com.android.tools.build:gradle:4.2.1'
description: classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- path: "." - //classpath 'com.google.gms:google-services:4.3.8'
- ref: listenable + classpath 'com.google.gms:google-services:4.3.8'
- resolved-ref: "2d9f2a40590c13aadfd226c2e41b08e155e6a92e" }
- url: "https://github.com/TheOneWithTheBraid/snapping_sheet.git" }
- source: git
+ name: snapping_sheet diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart
+ url: "https://pub.dartlang.org" index cd79b0ab..c2db0f1e 100644
+ source: hosted --- a/lib/utils/background_push.dart
version: "3.1.0" +++ b/lib/utils/background_push.dart
source_map_stack_trace: @@ -39,7 +39,7 @@ import '../config/setting_keys.dart';
dependency: transitive import 'famedlysdk_store.dart';
import 'platform_infos.dart';
-//import 'package:fcm_shared_isolate/fcm_shared_isolate.dart';
+import 'package:fcm_shared_isolate/fcm_shared_isolate.dart';
class NoTokenException implements Exception {
String get cause => 'Cannot get firebase token';
@@ -65,7 +65,7 @@ class BackgroundPush {
final pendingTests = <String, Completer<void>>{};
- final dynamic firebase = null; //FcmSharedIsolate();
+ final dynamic firebase = FcmSharedIsolate();
DateTime? lastReceivedPush;
diff --git a/pubspec.yaml b/pubspec.yaml
index 6999d0b8..b2c9144f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,7 +25,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