Auth: improve handling of network and timeout exceptions

https://github.com/microg/GmsCore/pull/3220
Signed-off-by: Cuynu <cuynu@proton.me>

README.md

@@ -3,7 +3,7 @@
 This fork tweaks MicroG to be usable by applications that require Google authentication such as [YouTube Vanced+](https://gitlab.com/cuynu/vancedx).
 
 ## Warning!
-Vanced+ microG probably does not works in ReVanced/RVX in future as recent changes from ReVanced/RVX to use with they specific MicroG called ReVanced MicroG with different package name !
+Vanced+ microG are currently **DOES NOT WORK** with ReVanced/RVX as they now uses their own ReVanced microG with specific package name! However, there are workaround : [Issues #15](https://gitlab.com/cuynu/VancedxMicroG/-/issues/15#note_1837372638)
 
 ## Notable changes
 

build.gradle

@@ -28,7 +28,7 @@ buildscript {
     ext.wireVersion = '4.8.0'
 
 
-    ext.androidBuildGradleVersion = '7.4.2'
+    ext.androidBuildGradleVersion = '8.0.2'
     ext.androidBuildVersionTools = '33.0.2'
 
     ext.androidMinSdk = 23
@@ -48,7 +48,7 @@ buildscript {
 }
 
 
-def gmsVersion = "24.17.17"
+def gmsVersion = "25.09.34"
 def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
 
 def ourVersionBase = "0.3.0"

fake-signature/build.gradle

@@ -17,8 +17,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 

gradle.properties

@@ -1,3 +1,5 @@
 android.useAndroidX=true
-android.disableAutomaticComponentCreation=true
 org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

play-services-api/build.gradle

@@ -26,9 +26,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
+        sourceCompatibility = 17
-        targetCompatibility = 1.8
+        targetCompatibility = 17
     }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.api'
 }
 
 dependencies {

play-services-api/src/main/AndroidManifest.xml

@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.api"/>
+<manifest />

play-services-base-api/build.gradle

@@ -34,7 +34,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
+        sourceCompatibility = 17
-        targetCompatibility = 1.8
+        targetCompatibility = 17
     }
+    buildFeatures {
+        aidl true
+    }
+    namespace 'org.microg.gms.base.api'
 }

play-services-base-api/src/main/AndroidManifest.xml

@@ -3,4 +3,4 @@
   ~ SPDX-FileCopyrightText: 2020, microG Project Team
   ~ SPDX-License-Identifier: Apache-2.0
   -->
-<manifest package="org.microg.gms.base.api"/>
+<manifest />

play-services-base-core/build.gradle

@@ -21,7 +21,6 @@ android {
     buildToolsVersion androidBuildVersionTools
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 
@@ -33,7 +32,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
+        sourceCompatibility = 17
-        targetCompatibility = 1.8
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.base.core'
 }

play-services-base-core/src/main/AndroidManifest.xml

@@ -4,14 +4,20 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 <manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android">
-    package="org.microg.gms.base.core">
+
+    <permission android:name="${applicationId}.permission.WRITE_SETTINGS"
+        android:protectionLevel="normal" />
+    <permission android:name="${applicationId}.permission.WRITE_SETTINGS"
+        android:protectionLevel="normal" />
 
     <application>
         <provider
             android:name="org.microg.gms.settings.SettingsProvider"
             android:authorities="${applicationId}.microg.settings"
-            android:exported="false" />
+            android:exported="true"
+            android:readPermission="${applicationId}.permission.READ_SETTINGS"
+            android:writePermission="${applicationId}.permission.WRITE_SETTINGS" />
 
         <provider
             android:name="org.microg.gms.profile.ProfileProvider"

play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt

@@ -22,7 +22,6 @@ object SettingsContract {
         const val SECURITY_TOKEN = "securityToken"
         const val VERSION_INFO = "versionInfo"
         const val DEVICE_DATA_VERSION_INFO = "deviceDataVersionInfo"
-
         const val BRAND_SPOOF = "brandSpoof"
 
         const val HIDE_LAUNCHER_ICON = "hideLauncherIcon"

play-services-base-core/src/main/res/layout/preference_app_heading.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2023 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingTop="24dp"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingBottom="16dp">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:antialias="true"
+            android:scaleType="fitCenter"
+            tools:src="@android:mipmap/sym_def_app_icon" />
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:singleLine="false"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="20sp"
+            tools:text="@tools:sample/lorem" />
+    </LinearLayout>
+</RelativeLayout>

play-services-base-core/src/main/res/layout/preference_switch_bar.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2020 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    tools:background="?attr/colorControlActivated">
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:paddingStart="56dp"
+        android:paddingLeft="56dp"
+        android:textAppearance="?attr/textAppearanceListItem"
+        android:textColor="?android:attr/textColorPrimaryInverse"
+        tools:text="Enabled" />
+
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/switch_widget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:background="@null"
+        app:thumbTint="?android:attr/textColorPrimaryInverse"
+        app:trackTint="?android:attr/textColorSecondaryInverse"
+        tools:checked="true" />
+</LinearLayout>

play-services-base/build.gradle

@@ -26,9 +26,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
+        sourceCompatibility = 17
-        targetCompatibility = 1.8
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.base'
 }
 
 dependencies {

play-services-base/src/main/AndroidManifest.xml

@@ -15,8 +15,7 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.base"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data

play-services-basement/build.gradle

@@ -44,6 +44,7 @@ android {
 
     buildFeatures {
         viewBinding = true
+        aidl true
     }
 
     sourceSets {
@@ -51,7 +52,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
+        sourceCompatibility = 17
-        targetCompatibility = 1.8
+        targetCompatibility = 17
     }
+    namespace 'org.microg.gms.basement'
 }

play-services-basement/src/main/AndroidManifest.xml

@@ -15,4 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="org.microg.gms.basement"/>
+<manifest />