From 642b48f28030144519f167357d86dcea29db19cb Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 20 Feb 2022 12:30:11 +0100
Subject: [PATCH] chore: Follow up fix sso on android

---
 android/app/src/main/AndroidManifest.xml      | 25 +++++++++----------
 .../homeserver_picker/homeserver_picker.dart  |  4 ++-
 scripts/enable-android-google-services.patch  | 19 --------------
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ee40b78d..b0154ca3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -51,14 +51,6 @@
                 <action android:name="FLUTTER_NOTIFICATION_CLICK" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                android:scheme="im.fluffychat" />
-            </intent-filter>
             <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -77,7 +69,7 @@
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
-               <data android:scheme="im.fluffychat" />
+               <data android:scheme="im.fluffychat" android:host="chat" />
             </intent-filter>
             <intent-filter>
                <action android:name="android.intent.action.SEND" />
@@ -99,16 +91,23 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="video/*" />
             </intent-filter>
-
-
         </activity>
 
-        <!-- <service android:name=".FcmPushService"
+        <activity android:name="com.linusu.flutter_web_auth.CallbackActivity" >
+            <intent-filter android:label="flutter_web_auth">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="im.fluffychat" android:host="login"/>
+            </intent-filter>
+        </activity>
+
+        <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/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
index 254bc889..cf01587c 100644
--- a/lib/pages/homeserver_picker/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -170,7 +170,9 @@ class HomeserverPickerController extends State<HomeserverPicker> {
         '${Matrix.of(context).getLoginClient().homeserver?.toString()}/_matrix/client/r0/login/sso/redirect/${Uri.encodeComponent(id)}?redirectUrl=${Uri.encodeQueryComponent(redirectUrl)}';
     final urlScheme = Uri.parse(redirectUrl).scheme;
     final result = await FlutterWebAuth.authenticate(
-        url: url, callbackUrlScheme: urlScheme);
+      url: url,
+      callbackUrlScheme: urlScheme,
+    );
     final token = Uri.parse(result).queryParameters['loginToken'];
     if (token != null) _loginWithToken(token);
   }
diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch
index ca875d0a..b646dd1d 100644
--- a/scripts/enable-android-google-services.patch
+++ b/scripts/enable-android-google-services.patch
@@ -26,25 +26,6 @@ index 4e018b38..eebf7582 100644
  
 -//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 ee40b78d..ec7dd1a9 100644
---- a/android/app/src/main/AndroidManifest.xml
-+++ b/android/app/src/main/AndroidManifest.xml
-@@ -103,12 +103,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