From e89f21e9e3621db9c745e42a20a4ffd87ade1bfd Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sat, 13 Mar 2021 20:14:18 +0000 Subject: [PATCH 01/13] Hide icon italian translation --- play-services-core/src/main/res/values-it/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index 1a6facfa..c3e7627f 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -102,6 +102,7 @@ Questo potrà richiedere un paio di minuti" Informazioni su Vanced microG Correzione cast duplicato + Nascondi l\'icona di microG dal launcher delle app Registra dispositivo Registra il tuo dispositivo sui servizi Google e crea un identificatore univoco del dispositivo. Verranno rimossi dai Servizi Vanced microG alcuni bit utili per identificare i dati di registrazione, oltre al nome dell\'account Google. From 338a471cb2572d4e26879a5e40407d53bc639947 Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sat, 13 Mar 2021 21:58:28 +0100 Subject: [PATCH 02/13] MicroG 0.2.18.210390 - Bump version. - Automatically fetch versioncode from buildconfig. - Code cleanup. --- .travis.yml | 15 ----------- build.gradle | 17 ++++++------ gradle/wrapper/gradle-wrapper.properties | 4 +-- play-services-api/build.gradle | 2 +- play-services-api/gradle.properties | 3 +-- play-services-base-api/build.gradle | 2 +- play-services-base/build.gradle | 6 +++-- play-services-base/gradle.properties | 3 +-- .../gms/common/GoogleApiAvailability.java | 2 +- .../gms/common/GooglePlayServicesUtil.java | 2 +- play-services-basement/build.gradle | 3 ++- play-services-basement/gradle.properties | 3 +-- .../common/internal/GetServiceRequest.java | 5 ++-- .../java/org/microg/gms/common/Constants.java | 6 ++++- play-services-cast-api/build.gradle | 3 ++- play-services-cast-api/gradle.properties | 3 +-- play-services-cast-framework-api/build.gradle | 2 +- .../gradle.properties | 3 +-- play-services-cast/build.gradle | 11 +------- play-services-cast/gradle.properties | 3 +-- play-services-core-proto/build.gradle | 6 ++++- play-services-core/build.gradle | 24 ++++++++--------- .../java/org/microg/gms/auth/AuthRequest.java | 2 +- .../microg/gms/auth/login/LoginActivity.java | 4 +-- .../gms/gservices/GServicesProvider.java | 7 ++--- play-services-iid-api/build.gradle | 2 +- play-services-iid-api/gradle.properties | 3 +-- play-services-location-api/build.gradle | 2 +- play-services-location-api/gradle.properties | 3 +-- play-services-location/build.gradle | 2 +- play-services-location/gradle.properties | 3 +-- .../location/GoogleLocationManagerClient.java | 2 +- play-services-tasks/build.gradle | 2 +- play-services-tasks/gradle.properties | 3 +-- settings.gradle | 27 ++++++++++--------- 35 files changed, 85 insertions(+), 105 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 02f9e12f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: java -jdk: openjdk8 -install: - - mkdir $HOME/android-cmdline-tools - - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-cmdline-tools/cmdline-tools.zip - - unzip -qq -n $HOME/android-cmdline-tools/cmdline-tools.zip -d $HOME/android-cmdline-tools - - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platform-tools' - - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'build-tools;29.0.3' - - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platforms;android-30' -env: - - ANDROID_HOME=$HOME/android-sdk TERM=dumb JAVA_OPTS="-Xmx2048m" -before_script: - - echo sdk.dir $ANDROID_HOME > local.properties -script: - - ./gradlew --no-daemon build diff --git a/build.gradle b/build.gradle index b70af530..8558d6c3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,24 +4,24 @@ */ buildscript { - ext.safeParcelVersion = '1.6.0' + ext.safeParcelVersion = '1.7.0' ext.kotlinVersion = '1.4.31' ext.coroutineVersion = '1.3.7' ext.annotationVersion = '1.1.0' - ext.appcompatVersion = '1.1.0' + ext.appcompatVersion = '1.2.0' ext.fragmentVersion = '1.3.0' ext.lifecycleVersion = '2.3.0' - ext.mediarouterVersion = '1.1.0' - ext.navigationVersion = '2.3.0' + ext.mediarouterVersion = '1.2.0' + ext.navigationVersion = '2.3.1' ext.preferenceVersion = '1.1.1' ext.recyclerviewVersion = '1.1.0' ext.supportLibraryVersion = "28.0.0" ext.wireVersion = '3.2.2' - ext.androidBuildGradleVersion = "4.0.1" + ext.androidBuildGradleVersion = "4.1.0" ext.androidBuildVersionTools = "29.0.3" @@ -45,8 +45,8 @@ allprojects { apply plugin: 'idea' group = 'org.microg.gms' - version = "0.2.16.204713" - ext.appVersionCode = 204713001 + version = "0.2.18.210390" + ext.appVersionCode = 210390001 ext.isReleaseVersion = false } @@ -55,5 +55,4 @@ subprojects { jcenter() google() } -} - +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb1c2da9..c984a6e2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Dec 27 23:11:46 GMT 2020 +#Sat Mar 13 21:39:25 CET 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle index 778f7cea..891b041c 100644 --- a/play-services-api/build.gradle +++ b/play-services-api/build.gradle @@ -38,4 +38,4 @@ dependencies { api project(':play-services-cast-framework-api') api project(':play-services-iid-api') api project(':play-services-location-api') -} +} \ No newline at end of file diff --git a/play-services-api/gradle.properties b/play-services-api/gradle.properties index 221fda84..cac2a521 100644 --- a/play-services-api/gradle.properties +++ b/play-services-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-base-api/build.gradle b/play-services-base-api/build.gradle index 70d9d624..ba889533 100644 --- a/play-services-base-api/build.gradle +++ b/play-services-base-api/build.gradle @@ -37,4 +37,4 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } -} +} \ No newline at end of file diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle index 1ac08ee7..7938f2e7 100644 --- a/play-services-base/build.gradle +++ b/play-services-base/build.gradle @@ -33,10 +33,12 @@ android { } dependencies { + implementation 'com.google.android.gms:play-services-base:17.6.0' + api project(':play-services-basement') api project(':play-services-tasks') api project(':play-services-base-api') - implementation "androidx.fragment:fragment:${fragmentVersion}" + implementation "androidx.fragment:fragment:1.3.1" implementation 'com.google.android.gms:play-services-base:17.6.0' -} +} \ No newline at end of file diff --git a/play-services-base/gradle.properties b/play-services-base/gradle.properties index b31a23e5..6949ecb1 100644 --- a/play-services-base/gradle.properties +++ b/play-services-base/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java b/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java index 0439619e..889cc7f6 100644 --- a/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java +++ b/play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java @@ -55,7 +55,7 @@ public class GoogleApiAvailability { /** * Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode). */ - public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.MAX_REFERENCE_VERSION; + public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.GMS_VERSION_CODE; private static GoogleApiAvailability instance; diff --git a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java index 5fb995b5..4850b816 100644 --- a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java +++ b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java @@ -52,7 +52,7 @@ public class GooglePlayServicesUtil { * Google Play services client library version (declared in library's AndroidManifest.xml android:versionCode). */ @Deprecated - public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.MAX_REFERENCE_VERSION; + public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = Constants.GMS_VERSION_CODE; /** * Package name for Google Play Store. diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index 02116217..4f2f05c5 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -38,6 +38,7 @@ android { versionName version minSdkVersion androidMinSdk targetSdkVersion androidTargetSdk + buildConfigField "int", "VERSION_CODE", "$appVersionCode" } sourceSets { @@ -48,4 +49,4 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } -} +} \ No newline at end of file diff --git a/play-services-basement/gradle.properties b/play-services-basement/gradle.properties index c18a7f49..f7f3ecc1 100644 --- a/play-services-basement/gradle.properties +++ b/play-services-basement/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java index 3bec84eb..d498328c 100644 --- a/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java +++ b/play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java @@ -31,6 +31,7 @@ import java.util.Arrays; import kotlin.Suppress; +@SuppressWarnings("deprecation") public class GetServiceRequest extends AutoSafeParcelable { @SafeParceled(1) private int versionCode = 3; @@ -61,12 +62,12 @@ public class GetServiceRequest extends AutoSafeParcelable { private GetServiceRequest() { serviceId = -1; - gmsVersion = Constants.MAX_REFERENCE_VERSION; + gmsVersion = Constants.GMS_VERSION_CODE; } public GetServiceRequest(int serviceId) { this.serviceId = serviceId; - this.gmsVersion = Constants.MAX_REFERENCE_VERSION; + this.gmsVersion = Constants.GMS_VERSION_CODE; } @Override diff --git a/play-services-basement/src/main/java/org/microg/gms/common/Constants.java b/play-services-basement/src/main/java/org/microg/gms/common/Constants.java index c57c81ce..881ac540 100644 --- a/play-services-basement/src/main/java/org/microg/gms/common/Constants.java +++ b/play-services-basement/src/main/java/org/microg/gms/common/Constants.java @@ -16,9 +16,13 @@ package org.microg.gms.common; +import org.microg.gms.basement.BuildConfig; + public class Constants { - public static final int MAX_REFERENCE_VERSION = 202414 * 1000; + public static final int GMS_VERSION_CODE = (BuildConfig.VERSION_CODE / 1000) * 1000; public static final String GMS_PACKAGE_NAME = "com.google.android.gms"; public static final String GSF_PACKAGE_NAME = "com.mgoogle.android.gsf"; public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788"; + @Deprecated + public static final int MAX_REFERENCE_VERSION = GMS_VERSION_CODE; } diff --git a/play-services-cast-api/build.gradle b/play-services-cast-api/build.gradle index b0b70bcb..6cfc38d1 100644 --- a/play-services-cast-api/build.gradle +++ b/play-services-cast-api/build.gradle @@ -37,5 +37,6 @@ android { dependencies { api project(':play-services-basement') + api project(':play-services-base-api') -} +} \ No newline at end of file diff --git a/play-services-cast-api/gradle.properties b/play-services-cast-api/gradle.properties index 18ff0a50..f2736ebf 100644 --- a/play-services-cast-api/gradle.properties +++ b/play-services-cast-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-cast-framework-api/build.gradle b/play-services-cast-framework-api/build.gradle index 9db7c812..bf519984 100644 --- a/play-services-cast-framework-api/build.gradle +++ b/play-services-cast-framework-api/build.gradle @@ -37,4 +37,4 @@ dependencies { api project(':play-services-base-api') api project(':play-services-cast-api') -} +} \ No newline at end of file diff --git a/play-services-cast-framework-api/gradle.properties b/play-services-cast-framework-api/gradle.properties index 54557daf..69ae4836 100644 --- a/play-services-cast-framework-api/gradle.properties +++ b/play-services-cast-framework-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-cast/build.gradle b/play-services-cast/build.gradle index 915202cd..e174c3c7 100755 --- a/play-services-cast/build.gradle +++ b/play-services-cast/build.gradle @@ -16,15 +16,6 @@ apply plugin: 'com.android.library' -String getMyVersionName() { - def stdout = new ByteArrayOutputStream() - if (rootProject.file("gradlew").exists()) - exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout } - else // automatic build system, don't tag dirty - exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout } - return stdout.toString().trim().substring(1) -} - android { compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -44,4 +35,4 @@ android { dependencies { api project(':play-services-base') api project(':play-services-cast-api') -} +} \ No newline at end of file diff --git a/play-services-cast/gradle.properties b/play-services-cast/gradle.properties index 937fcc06..85daef1f 100755 --- a/play-services-cast/gradle.properties +++ b/play-services-cast/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-core-proto/build.gradle b/play-services-core-proto/build.gradle index 3ae24b59..2cfb351e 100644 --- a/play-services-core-proto/build.gradle +++ b/play-services-core-proto/build.gradle @@ -16,10 +16,14 @@ wire { } } +sourceSets { + main.java.srcDirs += "$buildDir/generated/source/wire" +} + compileKotlin { kotlinOptions.jvmTarget = 1.8 } compileTestKotlin { kotlinOptions.jvmTarget = 1.8 -} +} \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 5ea27117..1d07b824 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -16,21 +16,17 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' dependencies { - implementation 'com.squareup.wire:wire-runtime:3.6.0' + implementation 'com.squareup.wire:wire-runtime:3.6.1' implementation 'de.hdodenhof:circleimageview:3.1.0' - implementation "org.microg.gms:conscrypt-gmscore:2.5.1" - implementation "androidx.annotation:annotation:$annotationVersion" // TODO: Switch to upstream once raw requests are merged // https://github.com/vitalidze/chromecast-java-api-v2/pull/99 // implementation "su.litvak.chromecast:api-v2:0.10.4" implementation "info.armills.chromecast-java-api-v2:api-v2-raw-request:0.10.4-raw-request-1" - // Specified manually due to - // https://github.com/vitalidze/chromecast-java-api-v2/issues/91 - implementation project(':play-services-core-proto') implementation project(':play-services-core:microg-ui-tools') // deprecated implementation project(':play-services-api') @@ -38,17 +34,21 @@ dependencies { // AndroidX UI implementation "androidx.appcompat:appcompat:1.2.0" - implementation "androidx.mediarouter:mediarouter:1.2.2" + implementation 'androidx.mediarouter:mediarouter:1.2.2' implementation "androidx.preference:preference-ktx:$preferenceVersion" - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.3' + implementation "org.microg.gms:conscrypt-gmscore:2.5.1" + implementation "androidx.annotation:annotation:$annotationVersion" + implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion" + + // Navigation + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.4' implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion" implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31' - implementation project(path: ':play-services-basement') - api project(':play-services-location-api') + api project(':play-services-basement') } android { @@ -101,4 +101,4 @@ android { if (file('user.gradle').exists()) { apply from: 'user.gradle' -} +} \ No newline at end of file diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java index 6de2e815..8365adb9 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java @@ -58,7 +58,7 @@ public class AuthRequest extends HttpFormClient.Request { @RequestContent("lang") public String locale; @RequestContent("google_play_services_version") - public int gmsVersion = Constants.MAX_REFERENCE_VERSION; + public int gmsVersion = Constants.GMS_VERSION_CODE; @RequestContent("accountType") public String accountType; @RequestContent("Email") diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java index e63c2223..25f79817 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java @@ -74,7 +74,7 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; -import static org.microg.gms.common.Constants.MAX_REFERENCE_VERSION; +import static org.microg.gms.common.Constants.GMS_VERSION_CODE; public class LoginActivity extends AssistantActivity { public static final String TMPL_NEW_ACCOUNT = "new_account"; @@ -484,7 +484,7 @@ public class LoginActivity extends AssistantActivity { @JavascriptInterface public final int getPlayServicesVersionCode() { - return MAX_REFERENCE_VERSION; + return GMS_VERSION_CODE; } @JavascriptInterface diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java index d5245318..6b3d8b85 100644 --- a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java +++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java @@ -57,9 +57,10 @@ public class GServicesProvider extends ContentProvider { public boolean onCreate() { if (CheckinPrefs.get(getContext()).isEnabled()) { getContext().sendOrderedBroadcast(new Intent(getContext(), org.microg.gms.checkin.TriggerReceiver.class), null); - } - if (GcmPrefs.get(getContext()).isEnabled()) { - getContext().sendBroadcast(new Intent(org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT, null, getContext(), org.microg.gms.gcm.TriggerReceiver.class)); + + if (GcmPrefs.get(getContext()).isEnabled()) { + getContext().sendBroadcast(new Intent(org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT, null, getContext(), org.microg.gms.gcm.TriggerReceiver.class)); + } } databaseHelper = new DatabaseHelper(getContext()); diff --git a/play-services-iid-api/build.gradle b/play-services-iid-api/build.gradle index 7d1eb81f..e25a297b 100644 --- a/play-services-iid-api/build.gradle +++ b/play-services-iid-api/build.gradle @@ -34,4 +34,4 @@ android { dependencies { api project(':play-services-basement') -} +} \ No newline at end of file diff --git a/play-services-iid-api/gradle.properties b/play-services-iid-api/gradle.properties index d54aab99..9835eeac 100644 --- a/play-services-iid-api/gradle.properties +++ b/play-services-iid-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-location-api/build.gradle b/play-services-location-api/build.gradle index fb66e4c7..3917674a 100644 --- a/play-services-location-api/build.gradle +++ b/play-services-location-api/build.gradle @@ -36,4 +36,4 @@ dependencies { api project(':play-services-basement') api project(':play-services-base-api') -} +} \ No newline at end of file diff --git a/play-services-location-api/gradle.properties b/play-services-location-api/gradle.properties index de0a3085..cb75f79e 100644 --- a/play-services-location-api/gradle.properties +++ b/play-services-location-api/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle index 076fd90f..f4650885 100644 --- a/play-services-location/build.gradle +++ b/play-services-location/build.gradle @@ -37,4 +37,4 @@ dependencies { api project(':play-services-location-api') implementation 'androidx.annotation:annotation:1.1.0' -} +} \ No newline at end of file diff --git a/play-services-location/gradle.properties b/play-services-location/gradle.properties index bfc9b4b2..0b02e4ed 100644 --- a/play-services-location/gradle.properties +++ b/play-services-location/gradle.properties @@ -30,5 +30,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mar-v-in -POM_DEVELOPER_NAME=Marvin W - +POM_DEVELOPER_NAME=Marvin W \ No newline at end of file diff --git a/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java index deb26d47..3d542782 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java +++ b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java @@ -46,7 +46,7 @@ public abstract class GoogleLocationManagerClient extends GmsClient Date: Sat, 13 Mar 2021 22:11:34 +0100 Subject: [PATCH 03/13] Attempt to fix debug error --- play-services-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 1d07b824..c924d20e 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -79,7 +79,7 @@ android { } lintOptions { - disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag' + disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'WrongConstant' } buildTypes { From e91ef2133c6e03aaa22aae5c813acbba2f600394 Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sat, 13 Mar 2021 22:19:08 +0100 Subject: [PATCH 04/13] Another attempt --- play-services-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index c924d20e..2a878698 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -79,7 +79,7 @@ android { } lintOptions { - disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'WrongConstant' + disable 'MissingTranslation', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'Range' } buildTypes { From afe1be854d621a1e3ec9fcf921d604c75abc9fea Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sun, 14 Mar 2021 10:08:00 +0100 Subject: [PATCH 05/13] Remove unused library from settings --- settings.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/settings.gradle b/settings.gradle index f9319bef..cd6649aa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ include ':play-services-tasks' include ':play-services-base-api' include ':play-services-cast-api' include ':play-services-cast-framework-api' -include ':play-services-droidguard-api' include ':play-services-iid-api' include ':play-services-location-api' @@ -18,5 +17,4 @@ include ':play-services-core' include ':play-services-base' include ':play-services-cast' -include ':play-services-droidguard' -include ':play-services-location' \ No newline at end of file +include ':play-services-location' From 73677ee57cf7551b3dc8229ba07c0e9753ad4560 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 14 Mar 2021 14:10:46 +0000 Subject: [PATCH 06/13] fixed hiding stuff --- play-services-core/src/main/res/values/strings.xml | 2 +- play-services-core/src/main/res/xml/preferences_start.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index dd79f6a6..4d20d137 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -102,7 +102,7 @@ This can take a couple of minutes." About Vanced microG Cast duplication fix - Hide microG icon in the app launcher + Hide microG from launcher Huawei diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 7ea2cfa3..6cc21d40 100755 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -52,7 +52,7 @@ android:key="pref_hide_launcher_icon" android:title="@string/pref_hide_launcher_icon" android:icon="@drawable/ic_baseline_hide_source_24" - android:defaultValue="true"/> + android:defaultValue="false"/> Date: Sun, 14 Mar 2021 14:12:28 +0000 Subject: [PATCH 07/13] change wording --- play-services-core/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index 4d20d137..35dfabdb 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -102,7 +102,7 @@ This can take a couple of minutes." About Vanced microG Cast duplication fix - Hide microG from launcher + Hide icon from launcher Huawei From 9f8f6966562cb915485011999e97f8f0d8d20e09 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Sun, 14 Mar 2021 14:26:13 +0000 Subject: [PATCH 08/13] revert default state --- play-services-core/src/main/res/xml/preferences_start.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index 6cc21d40..7ea2cfa3 100755 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -52,7 +52,7 @@ android:key="pref_hide_launcher_icon" android:title="@string/pref_hide_launcher_icon" android:icon="@drawable/ic_baseline_hide_source_24" - android:defaultValue="false"/> + android:defaultValue="true"/> Date: Sun, 14 Mar 2021 14:33:49 +0000 Subject: [PATCH 09/13] Fix italian translation --- play-services-core/src/main/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index c3e7627f..adacbe3a 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -102,7 +102,7 @@ Questo potrà richiedere un paio di minuti" Informazioni su Vanced microG Correzione cast duplicato - Nascondi l\'icona di microG dal launcher delle app + Nascondi microG dal launcher Registra dispositivo Registra il tuo dispositivo sui servizi Google e crea un identificatore univoco del dispositivo. Verranno rimossi dai Servizi Vanced microG alcuni bit utili per identificare i dati di registrazione, oltre al nome dell\'account Google. From c2a737a0c9206602a6368dd80204d1547f3b4ea1 Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sun, 14 Mar 2021 15:10:47 +0000 Subject: [PATCH 10/13] Hide icon spanish translation --- play-services-core/src/main/res/values-es/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/play-services-core/src/main/res/values-es/strings.xml b/play-services-core/src/main/res/values-es/strings.xml index 3e25d84e..92411340 100644 --- a/play-services-core/src/main/res/values-es/strings.xml +++ b/play-services-core/src/main/res/values-es/strings.xml @@ -102,6 +102,7 @@ Esto puede tardar unos minutos." Acerca de Vanced microG Solucion para Cast duplicado + Ocultar microG del lanzador Huawei From 4fb53e35d70278446ae8339baca081497b0ecd4a Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sun, 14 Mar 2021 15:12:49 +0000 Subject: [PATCH 11/13] Hide icon indonesian translation --- play-services-core/src/main/res/values-in/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/play-services-core/src/main/res/values-in/strings.xml b/play-services-core/src/main/res/values-in/strings.xml index 238d2df7..6827eb66 100644 --- a/play-services-core/src/main/res/values-in/strings.xml +++ b/play-services-core/src/main/res/values-in/strings.xml @@ -102,6 +102,7 @@ Ini bisa berlangsung beberapa menit." Tentang Vanced microG Perbaikan Cast terduplikasi + Sembunyikan microG dari peluncur Registrasi perangkat Registrasi perangkat anda ke layanan Google dan buat pengenal perangkat unik. Vanced microG strips mengenal bits selain dari akun Google anda dari data registrasi. From e015189785331defb366b95f4af31c15cdbe5b2b Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Sun, 14 Mar 2021 15:14:51 +0000 Subject: [PATCH 12/13] Hide icon russian translation --- play-services-core/src/main/res/values-ru/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml index 4bb315e6..f5a78cc0 100644 --- a/play-services-core/src/main/res/values-ru/strings.xml +++ b/play-services-core/src/main/res/values-ru/strings.xml @@ -102,6 +102,7 @@ О Vanced microG Исправление двух кнопок трансляции + скрыть микрог из лаунчера Huawei From 221e6e74ceca498d50568cc7283b0c292e12e9fa Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Mon, 15 Mar 2021 20:04:11 +0100 Subject: [PATCH 13/13] Show launcher icon after click on Huawei button --- .../src/main/java/org/microg/gms/auth/login/LoginActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java index 25f79817..659e1fdd 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java @@ -162,6 +162,7 @@ public class LoginActivity extends AssistantActivity { super.onHuaweiButtonClicked(); state++; if (state == 1) { + PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("pref_hide_launcher_icon", false).apply(); PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(HuaweiButtonPreference, true).apply(); if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(LoginButtonPreference, true)) { LastCheckinInfo.ClearCheckinInfo(this);