Merge branch 'microg:master' into patch-gms-version

micro5k · Mar 6, 2024 · f237cf5 · f237cf5
2 parents 5f17ea1 + 928c3a9
commit f237cf5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -756,6 +756,18 @@
             </intent-filter>
         </service>
 
+        <!-- backup -->
+
+        <activity
+            android:name="org.microg.gms.backup.BackupSettingsActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.android.gms.backup.ACTION_BACKUP_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
         <!-- Other -->
 
         <service

diff --git a/play-services-core/src/main/kotlin/org/microg/gms/backup/BackupSettingsActivity.kt b/play-services-core/src/main/kotlin/org/microg/gms/backup/BackupSettingsActivity.kt
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2024 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.microg.gms.backup
+
+import android.app.Activity
+import android.os.Bundle
+import android.widget.Toast
+import com.google.android.gms.R
+
+class BackupSettingsActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Toast.makeText(this, getString(R.string.backup_disabled), Toast.LENGTH_SHORT).show()
+        finish()
+    }
+}
diff --git a/play-services-core/src/main/res/values-zh-rCN/strings.xml b/play-services-core/src/main/res/values-zh-rCN/strings.xml
@@ -195,4 +195,5 @@ microG GmsCore 内置一套自由的 SafetyNet 实现，但是官方服务器要
     <string name="signin_subtext_policy">使用此应用前，请先阅读其%1$s和%2$s。</string>
     <string name="signin_confirm_button_text">允许并共享</string>
     <string name="feedback_disabled">反馈功能不可用</string>
+    <string name="backup_disabled">备份功能不可用</string>
 </resources>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
@@ -253,5 +253,6 @@ This can take a couple of minutes."</string>
     <string name="pref_vending_license_enable_summary">Some apps require verification that you have purchased them on Google Play. When requested by an app, microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored.</string>
 
     <string name="feedback_disabled">Feedback currently not possible</string>
+    <string name="backup_disabled">Backup currently not possible</string>
 
 </resources>