Merge branch 'refs/heads/v6.8.1'

2024-09-11 15:40:08 +08:00
parent 528647a0bc eb90ae9e03
commit f2ccf37022
133 changed files with 22 additions and 5482 deletions
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -315,4 +315,5 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.qiniu.**{*;}
 -keep class com.qiniu.**{public <init>();}
 -ignorewarnings
-keep class com.samsung.android.sdk.**{*;}
+-keep class com.samsung.android.sdk.**{*;}
+-keep class com.samsung.**{*;}
--- a/app/src/samsung_test/google-services.json
+++ b/app/src/samsung_test/google-services.json
@@ -44,7 +44,7 @@
      ],
      "api_key": [
        {
-          "current_key": "SSSSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
+          "current_key": "AIzaSyDVnuGnQzjI_vDrxh20Hv_S1OMUD7Vp3zU"
        }
      ],
      "services": {