Merge branch 'master' into identity_sign_in

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 1

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
           distribution: "temurin"
           java-version: "17"
       - name: "Gradle Wrapper validation"
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
       - name: "Setup Gradle"
         uses: gradle/actions/setup-gradle@v3
       - name: "Setup matchers"

firebase-dynamic-links/build.gradle

@@ -1,6 +1,6 @@
 /*
- * SPDX-FileCopyrightText: 2019, e Foundation
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2019 e Foundation
+ * SPDX-FileCopyrightText: 2020 microG Project Team
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -31,8 +31,17 @@ android {
 }
 
 dependencies {
+    // Dependencies from firebase-dynamic-links:21.2.0
+    api 'androidx.annotation:annotation:1.2.0'
+    api project(':play-services-base')
     api project(':play-services-basement')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api project(':play-services-tasks')
+//    api project(':firebase-auth-interop')
+//    api project(':firebase-measurement-connector')
+//    api project(':firebase-common')
+//    api project(':firebase-common-ktx')
+//    api project(':firebase-components')
+    api 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
 }
 
 apply from: '../gradle/publish-android.gradle'

firebase-dynamic-links/src/main/aidl/com/google/firebase/dynamiclinks/internal/IDynamicLinksService.aidl

@@ -11,6 +11,6 @@ import com.google.firebase.dynamiclinks.internal.IDynamicLinksCallbacks;
 import android.os.Bundle;
 
 interface IDynamicLinksService {
-    void getInitialLink(IDynamicLinksCallbacks callback, String link) = 0;
+    void getDynamicLink(IDynamicLinksCallbacks callback, String link) = 0;
     void createShortDynamicLink(IDynamicLinksCallbacks callback, in Bundle extras) = 1;
 }

firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/DynamicLinkData.java

@@ -7,13 +7,15 @@
 
 package com.google.firebase.dynamiclinks.internal;
 
-import org.microg.safeparcel.AutoSafeParcelable;
-import org.microg.safeparcel.SafeParceled;
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import com.google.android.gms.common.internal.safeparcel.AbstractSafeParcelable;
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableCreatorAndWriter;
 
 import android.os.Bundle;
 import android.net.Uri;
 
-public class DynamicLinkData extends AutoSafeParcelable {
+public class DynamicLinkData extends AbstractSafeParcelable {
     @Field(1)
     public final String dynamicLink;
 
@@ -32,14 +34,19 @@ public class DynamicLinkData extends AutoSafeParcelable {
     @Field(6)
     public final Uri redirectUrl;
 
-    public DynamicLinkData() {
-        dynamicLink = "";
-        deepLink = "";
-        minVersion = 0;
-        clickTimestamp = 0;
-        extensionBundle = new Bundle();
-        redirectUrl = Uri.EMPTY;
+    public DynamicLinkData(@Param(1) String dynamicLink, @Param(2) String deepLink, @Param(3) int minVersion, @Param(4) long clickTimestamp, @Param(5) Bundle extensionBundle, @Param(6) Uri redirectUrl) {
+        this.dynamicLink = dynamicLink;
+        this.deepLink = deepLink;
+        this.minVersion = minVersion;
+        this.clickTimestamp = clickTimestamp;
+        this.extensionBundle = extensionBundle;
+        this.redirectUrl = redirectUrl;
     }
 
-    public static final Creator<DynamicLinkData> CREATOR = new AutoCreator<DynamicLinkData>(DynamicLinkData.class);
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        CREATOR.writeToParcel(this, dest, flags);
+    }
+
+    public static final SafeParcelableCreatorAndWriter<DynamicLinkData> CREATOR = findCreator(DynamicLinkData.class);
 }