ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2025-01-05 17:15:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #135 from Oizaro/master

Browse Source 
MicroG 0.2.19.211712
This commit is contained in:
KevinX8 2021-05-14 01:14:24 +01:00 committed by GitHub
commit 747cd9b5bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 227 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.gradle
View File

@ -6,15 +6,15 @@
buildscript {
ext.safeParcelVersion = '1.7.0'
ext.kotlinVersion = '1.4.31'
ext.coroutineVersion = '1.3.7'
ext.kotlinVersion = '1.4.32'
ext.coroutineVersion = '1.3.8'
ext.annotationVersion = '1.1.0'
ext.annotationVersion = '1.2.0'
ext.appcompatVersion = '1.2.0'
ext.fragmentVersion = '1.3.0'
ext.lifecycleVersion = '2.3.0'
ext.mediarouterVersion = '1.2.0'
ext.navigationVersion = '2.3.1'
ext.lifecycleVersion = '2.3.1'
ext.mediarouterVersion = '1.2.2'
ext.navigationVersion = '2.3.5'
ext.preferenceVersion = '1.1.1'
ext.recyclerviewVersion = '1.1.0'
@ -23,7 +23,7 @@ buildscript {
ext.androidBuildGradleVersion = "4.1.0"
ext.androidBuildVersionTools = "29.0.3"
ext.androidBuildVersionTools = "30.0.2"
ext.androidMinSdk = 21
ext.androidTargetSdk = 29
@ -35,7 +35,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:4.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
}
@ -45,8 +45,8 @@ allprojects {
apply plugin: 'idea'
group = 'org.microg.gms'
version = "0.2.18.210500"
ext.appVersionCode = 210500001
version = "0.2.19.211712"
ext.appVersionCode = 211712001
ext.isReleaseVersion = false
}

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Thu Apr 15 23:13:18 CEST 2021
#Fri May 14 01:45:11 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME

3
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/FacsCacheCallOptions.aidl vendored Normal file
View File

@ -0,0 +1,3 @@
package com.google.android.gms.facs.cache;
parcelable FacsCacheCallOptions;

3
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/ForceSettingsCacheRefreshResult.aidl vendored Normal file
View File

@ -0,0 +1,3 @@
package com.google.android.gms.facs.cache;
parcelable ForceSettingsCacheRefreshResult;

3
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/GetActivityControlsSettingsResult.aidl vendored Normal file
View File

@ -0,0 +1,3 @@
package com.google.android.gms.facs.cache;
parcelable GetActivityControlsSettingsResult;

3
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/ReadDeviceLevelSettingsResult.aidl vendored Normal file
View File

@ -0,0 +1,3 @@
package com.google.android.gms.facs.cache;
parcelable ReadDeviceLevelSettingsResult;

3
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/UpdateActivityControlsSettingsResult.aidl vendored Normal file
View File

@ -0,0 +1,3 @@
package com.google.android.gms.facs.cache;
parcelable UpdateActivityControlsSettingsResult;

15
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/internal/IFacsCacheCallbacks.aidl vendored Normal file
View File

@ -0,0 +1,15 @@
package com.google.android.gms.facs.cache.internal;
import com.google.android.gms.common.api.Status;
import com.google.android.gms.facs.cache.ForceSettingsCacheRefreshResult;
import com.google.android.gms.facs.cache.GetActivityControlsSettingsResult;
import com.google.android.gms.facs.cache.ReadDeviceLevelSettingsResult;
import com.google.android.gms.facs.cache.UpdateActivityControlsSettingsResult;
interface IFacsCacheCallbacks {
void onForceSettingsCacheRefreshResult(in Status status, in ForceSettingsCacheRefreshResult result) = 0;
void onUpdateActivityControlsSettingsResult(in Status status, in UpdateActivityControlsSettingsResult result) = 1;
void onGetActivityControlsSettingsResult(in Status status, in GetActivityControlsSettingsResult result) = 2;
void onWriteDeviceLevelSettingsResult(in Status status) = 3;
void onReadDeviceLevelSettingsResult(in Status status, in ReadDeviceLevelSettingsResult result) = 4;
}

12
play-services-api/src/main/aidl/com/google/android/gms/facs/cache/internal/IFacsCacheService.aidl vendored Normal file
View File

@ -0,0 +1,12 @@
package com.google.android.gms.facs.cache.internal;
import com.google.android.gms.facs.cache.FacsCacheCallOptions;
import com.google.android.gms.facs.cache.internal.IFacsCacheCallbacks;
interface IFacsCacheService {
void forceSettingsCacheRefresh(IFacsCacheCallbacks callbacks, in FacsCacheCallOptions options) = 0;
void updateActivityControlsSettings(IFacsCacheCallbacks callbacks, in byte[] bytes, in FacsCacheCallOptions options) = 1;
void getActivityControlsSettings(IFacsCacheCallbacks callbacks, in FacsCacheCallOptions options) = 2;
void readDeviceLevelSettings(IFacsCacheCallbacks callbacks) = 3;
void writeDeviceLevelSettings(IFacsCacheCallbacks callbacks, in byte[] bytes) = 4;
}

34
play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java
View File

@ -1,17 +1,9 @@
/*
* Copyright (C) 2013-2017 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* SPDX-FileCopyrightText: 2016, microG Project Team
* SPDX-License-Identifier: Apache-2.0
* Notice: Portions of this file are reproduced from work created and shared by Google and used
* according to terms described in the Creative Commons 4.0 Attribution License.
* See https://developers.google.com/readme/policies for details.
*/
package com.google.android.gms.auth.api.credentials;
@ -31,28 +23,28 @@ import java.util.Objects;
@PublicApi
public class Credential extends AutoSafeParcelable {
@SafeParceled(1000)
@Field(1000)
private int versionCode = 1;
@SafeParceled(1)
@Field(1)
private String id;
@SafeParceled(2)
@Field(2)
private String name;
@SafeParceled(3)
@Field(3)
private Uri profilePictureUri;
@SafeParceled(value = 4, subClass = IdToken.class)
@Field(value = 4, subClass = IdToken.class)
private List<IdToken> tokens;
@SafeParceled(5)
@Field(5)
private String password;
@SafeParceled(6)
@Field(6)
private String accountType;
@SafeParceled(7)
@Field(7)
private String generatedPassword;
private Credential() {

18
play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java
View File

@ -1,17 +1,9 @@
/*
* Copyright (C) 2013-2017 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* SPDX-FileCopyrightText: 2016, microG Project Team
* SPDX-License-Identifier: Apache-2.0
* Notice: Portions of this file are reproduced from work created and shared by Google and used
* according to terms described in the Creative Commons 4.0 Attribution License.
* See https://developers.google.com/readme/policies for details.
*/
package com.google.android.gms.auth.api.credentials;

18
play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java
View File

@ -1,17 +1,9 @@
/*
* Copyright (C) 2013-2017 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* SPDX-FileCopyrightText: 2016, microG Project Team
* SPDX-License-Identifier: Apache-2.0
* Notice: Portions of this file are reproduced from work created and shared by Google and used
* according to terms described in the Creative Commons 4.0 Attribution License.
* See https://developers.google.com/readme/policies for details.
*/
package com.google.android.gms.auth.api.credentials;

3
play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/HintRequest.java
View File

@ -1,6 +1,9 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
* Notice: Portions of this file are reproduced from work created and shared by Google and used
* according to terms described in the Creative Commons 4.0 Attribution License.
* See https://developers.google.com/readme/policies for details.
*/
package com.google.android.gms.auth.api.credentials;

24
play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java
View File

@ -1,17 +1,9 @@
/*
* Copyright (C) 2013-2017 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* SPDX-FileCopyrightText: 2016, microG Project Team
* SPDX-License-Identifier: Apache-2.0
* Notice: Portions of this file are reproduced from work created and shared by Google and used
* according to terms described in the Creative Commons 4.0 Attribution License.
* See https://developers.google.com/readme/policies for details.
*/
package com.google.android.gms.auth.api.credentials;
@ -23,13 +15,13 @@ import org.microg.safeparcel.SafeParceled;
@PublicApi
public class IdToken extends AutoSafeParcelable {
@SafeParceled(1000)
@Field(1000)
private int versionCode = 1;
@SafeParceled(1)
@Field(1)
private String accountType;
@SafeParceled(2)
@Field(2)
private String id;
private IdToken() {

3
play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/IdentityProviders.java
View File

@ -1,6 +1,9 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
* Notice: Portions of this file are reproduced from work created and shared by Google and used
* according to terms described in the Creative Commons 4.0 Attribution License.
* See https://developers.google.com/readme/policies for details.
*/
package com.google.android.gms.auth.api.credentials;

17
play-services-api/src/main/java/com/google/android/gms/facs/cache/FacsCacheCallOptions.java vendored Normal file
View File

@ -0,0 +1,17 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.facs.cache;
import org.microg.safeparcel.AutoSafeParcelable;
public class FacsCacheCallOptions extends AutoSafeParcelable {
@Field(1)
public String instanceId;
@Field(2)
public long version;
public static final Creator<FacsCacheCallOptions> CREATOR = new AutoCreator<>(FacsCacheCallOptions.class);
}

13
play-services-api/src/main/java/com/google/android/gms/facs/cache/ForceSettingsCacheRefreshResult.java vendored Normal file
View File

@ -0,0 +1,13 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.facs.cache;
import org.microg.safeparcel.AutoSafeParcelable;
public class ForceSettingsCacheRefreshResult extends AutoSafeParcelable {
public static final Creator<ForceSettingsCacheRefreshResult> CREATOR = new AutoCreator<>(ForceSettingsCacheRefreshResult.class);
}

13
play-services-api/src/main/java/com/google/android/gms/facs/cache/GetActivityControlsSettingsResult.java vendored Normal file
View File

@ -0,0 +1,13 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.facs.cache;
import org.microg.safeparcel.AutoSafeParcelable;
public class GetActivityControlsSettingsResult extends AutoSafeParcelable {
public static final Creator<GetActivityControlsSettingsResult> CREATOR = new AutoCreator<>(GetActivityControlsSettingsResult.class);
}

13
play-services-api/src/main/java/com/google/android/gms/facs/cache/ReadDeviceLevelSettingsResult.java vendored Normal file
View File

@ -0,0 +1,13 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.facs.cache;
import org.microg.safeparcel.AutoSafeParcelable;
public class ReadDeviceLevelSettingsResult extends AutoSafeParcelable {
public static final Creator<ReadDeviceLevelSettingsResult> CREATOR = new AutoCreator<>(ReadDeviceLevelSettingsResult.class);
}

13
play-services-api/src/main/java/com/google/android/gms/facs/cache/UpdateActivityControlsSettingsResult.java vendored Normal file
View File

@ -0,0 +1,13 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.facs.cache;
import org.microg.safeparcel.AutoSafeParcelable;
public class UpdateActivityControlsSettingsResult extends AutoSafeParcelable {
public static final Creator<UpdateActivityControlsSettingsResult> CREATOR = new AutoCreator<>(UpdateActivityControlsSettingsResult.class);
}

2
play-services-basement/src/main/java/org/microg/gms/common/GmsService.java
View File

@ -46,7 +46,9 @@ public enum GmsService {
CREDENTIALS(68, "com.google.android.gms.auth.api.credentials.service.START"),
MEASUREMENT(93, "com.google.android.gms.measurement.START"),
GASS(116, "com.google.android.gms.gass.START"),
FACS_CACHE(202, "com.google.android.gms.facs.cache.service.START"),
IDENTITY_SIGN_IN(212, "com.google.android.gms.auth.api.identity.service.signin.START"),
FACS_SYNC(220, "com.google.android.gms.facs.internal.service.START"),
;
public int SERVICE_ID;

2
play-services-core/build.gradle
View File

@ -33,7 +33,7 @@ dependencies {
// AndroidX UI
implementation "androidx.appcompat:appcompat:1.2.0"
implementation 'androidx.mediarouter:mediarouter:1.2.2'
implementation 'androidx.mediarouter:mediarouter:1.2.3'
implementation "androidx.preference:preference-ktx:$preferenceVersion"
implementation "org.microg.gms:conscrypt-gmscore:2.5.1"

7
play-services-core/src/main/AndroidManifest.xml
View File

@ -444,6 +444,12 @@
</intent-filter>
</service>
<service android:name="org.microg.gms.udc.FacsCacheService">
<intent-filter>
<action android:name="com.google.android.gms.facs.cache.service.START" />
</intent-filter>
</service>
<service android:name="org.microg.gms.DummyService">
<intent-filter>
<action android:name="com.google.android.gms.accounts.ACCOUNT_SERVICE" />
@ -455,6 +461,7 @@
<action android:name="com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START" />
<action android:name="com.google.android.gms.auth.api.credentials.service.START" />
<action android:name="com.google.android.gms.gass.START" />
<action android:name="com.google.android.gms.audit.service.START" />
</intent-filter>
</service>
</application>

4
play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java
View File

@ -108,6 +108,10 @@ public class ProviderInstallerImpl {
}
}
public void reportRequestStats(Context context, long a, long b) {
// Ignore stats
}
private static void initProvider(Context context, String packageName) {
Log.d(TAG, "Initializing provider for " + packageName);

52
play-services-core/src/main/kotlin/org/microg/gms/udc/FacsCacheService.kt Normal file
View File

@ -0,0 +1,52 @@
/*
* SPDX-FileCopyrightText: 2021, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package org.microg.gms.udc
import android.util.Log
import com.google.android.gms.common.api.Status
import com.google.android.gms.common.internal.GetServiceRequest
import com.google.android.gms.common.internal.IGmsCallbacks
import com.google.android.gms.facs.cache.FacsCacheCallOptions
import com.google.android.gms.facs.cache.internal.IFacsCacheCallbacks
import com.google.android.gms.facs.cache.internal.IFacsCacheService
import org.microg.gms.BaseService
import org.microg.gms.common.GmsService
private const val TAG = "GmsFacsCache"
class FacsCacheService : BaseService(TAG, GmsService.FACS_CACHE) {
override fun handleServiceRequest(callback: IGmsCallbacks, request: GetServiceRequest?, service: GmsService?) {
callback.onPostInitComplete(0, FacsCacheServiceImpl().asBinder(), null)
}
}
class FacsCacheServiceImpl : IFacsCacheService.Stub() {
override fun forceSettingsCacheRefresh(callbacks: IFacsCacheCallbacks, options: FacsCacheCallOptions) {
Log.d(TAG, "forceSettingsCacheRefresh")
callbacks.onForceSettingsCacheRefreshResult(Status.CANCELED, null)
}
override fun updateActivityControlsSettings(callbacks: IFacsCacheCallbacks, bytes: ByteArray, options: FacsCacheCallOptions) {
Log.d(TAG, "updateActivityControlsSettings")
callbacks.onUpdateActivityControlsSettingsResult(Status.CANCELED, null)
}
override fun getActivityControlsSettings(callbacks: IFacsCacheCallbacks, options: FacsCacheCallOptions) {
Log.d(TAG, "getActivityControlsSettings")
callbacks.onGetActivityControlsSettingsResult(Status.CANCELED, null)
}
override fun readDeviceLevelSettings(callbacks: IFacsCacheCallbacks) {
Log.d(TAG, "readDeviceLevelSettings")
callbacks.onReadDeviceLevelSettingsResult(Status.CANCELED, null)
}
override fun writeDeviceLevelSettings(callbacks: IFacsCacheCallbacks, bytes: ByteArray) {
Log.d(TAG, "writeDeviceLevelSettings")
callbacks.onWriteDeviceLevelSettingsResult(Status.CANCELED)
}
}