Fix deep link handling for fragments.

ryanheise · Jul 11, 2024 · 711ff2c · 711ff2c
1 parent edba3e5
commit 711ff2c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/audio_service/CHANGELOG.md b/audio_service/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.18.15
 
-* Add deep link support for FlutterFragmentActivity (@jan-milovanovic)
+* Add deep link support for FlutterFragmentActivity (@jan-milovanovic).
 
 ## 0.18.14
 

diff --git a/...ervice/android/src/main/java/com/ryanheise/audioservice/AudioServiceFragmentActivity.java b/...ervice/android/src/main/java/com/ryanheise/audioservice/AudioServiceFragmentActivity.java
@@ -33,4 +33,16 @@ protected String getCachedEngineId() {
     public boolean shouldDestroyEngineWithHost() {
         return false;
     }
+
+    // Make this protected method public
+    @Override
+    public String getInitialRoute() {
+        return super.getInitialRoute();
+    }
+
+    // Make this protected method public
+    @Override
+    public boolean shouldHandleDeeplinking() {
+        return super.shouldHandleDeeplinking();
+    }
 }
diff --git a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
@@ -88,13 +88,18 @@ public static synchronized FlutterEngine getFlutterEngine(Context context) {
                         }
                     }
                 }
-            } else if (context instanceof FlutterFragmentActivity) {
-                final FlutterFragmentActivity activity = (FlutterFragmentActivity)context;
-                Uri data = activity.getIntent().getData();
-                if (data != null) {
-                    initialRoute = data.getPath();
-                    if (data.getQuery() != null && !data.getQuery().isEmpty()) {
-                        initialRoute += "?" + data.getQuery();
+            } else if (context instanceof AudioServiceFragmentActivity) {
+                final AudioServiceFragmentActivity activity = (AudioServiceFragmentActivity)context;
+                initialRoute = activity.getInitialRoute();
+                if (initialRoute == null) {
+                    if (activity.shouldHandleDeeplinking()) {
+                        Uri data = activity.getIntent().getData();
+                        if (data != null) {
+                            initialRoute = data.getPath();
+                            if (data.getQuery() != null && !data.getQuery().isEmpty()) {
+                                initialRoute += "?" + data.getQuery();
+                            }
+                        }
                     }
                 }
             }

diff --git a/audio_service/example/android/app/build.gradle b/audio_service/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     namespace 'com.ryanheise.audioserviceexample'
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
     defaultConfig {
         applicationId "com.ryanheise.audioserviceexample"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/audio_service/example/android/app/src/main/AndroidManifest.xml b/audio_service/example/android/app/src/main/AndroidManifest.xml
@@ -5,8 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <!-- If targeting SDK 34 -->
-    <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/> -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
 
     <!-- For example_android_songs example -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />