fluffychat/scripts/enable-android-google-services.patch

105 lines
4.1 KiB
Diff
Raw Normal View History

diff --git a/android/app/build.gradle b/android/app/build.gradle
2021-09-26 09:31:46 +02:00
index 63136570..3f33ea05 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
2021-09-26 09:31:46 +02:00
@@ -80,11 +80,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'
2021-09-26 09:31:46 +02:00
implementation 'com.github.UnifiedPush:android-connector:1.2.0' // needed for unifiedpush
}
-//apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 9cbecc16..1709ddc6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -82,12 +82,12 @@
</activity>
- <!-- <service android:name=".FcmPushService"
+ <service android:name=".FcmPushService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
- </service> -->
+ </service>
<receiver android:exported="true" android:enabled="true" android:name=".UnifiedPushReceiver">
<intent-filter>
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/build.gradle b/android/build.gradle
index 4ce5c41d..be58d662 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'
}
}
diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart
2021-10-26 19:00:00 +02:00
index baf2b444..306da934 100644
--- a/lib/utils/background_push.dart
+++ b/lib/utils/background_push.dart
2021-10-26 19:00:00 +02:00
@@ -39,8 +39,7 @@ import 'famedlysdk_store.dart';
import 'matrix_sdk_extensions.dart/matrix_locals.dart';
import 'platform_infos.dart';
-//import 'package:fcm_shared_isolate/fcm_shared_isolate.dart';
2021-10-26 19:00:00 +02:00
-
+import 'package:fcm_shared_isolate/fcm_shared_isolate.dart';
2021-10-26 19:00:00 +02:00
class NoTokenException implements Exception {
String get cause => 'Cannot get firebase token';
@@ -117,7 +116,7 @@ class BackgroundPush {
setupPush();
}
- final _fcmSharedIsolate = null; //FcmSharedIsolate();
+ final _fcmSharedIsolate = FcmSharedIsolate();
StreamSubscription<LoginState> onLogin;
StreamSubscription<SyncUpdate> onRoomSync;
diff --git a/pubspec.yaml b/pubspec.yaml
2021-10-26 19:00:00 +02:00
index e1670a32..7e3238b0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,8 +16,8 @@ dependencies:
desktop_notifications: ">=0.4.0 <0.5.0" # Version 0.5.0 breaks web builds: https://github.com/canonical/dbus.dart/issues/250
email_validator: ^2.0.1
emoji_picker_flutter: ^1.0.7
- #fcm_shared_isolate:
- # git: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git
+ fcm_shared_isolate:
+ git: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git
2021-10-09 08:13:10 +02:00
file_picker_cross: ^4.5.0
flutter:
2021-10-14 17:26:20 +02:00
sdk: flutter