diff --git a/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java b/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
index da1def3e..3a06c85f 100644
--- a/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
+++ b/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
@@ -238,7 +238,7 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
request.gmsVersion = gmsVersion;
request.packageName = packageName;
request.extras = extras;
- request.account = accountName == null ? null : new Account(accountName, "com.google");
+ request.account = accountName == null ? null : new Account(accountName, "com.mgoogle");
request.scopes = scopes == null ? null : scopesFromStringArray(scopes);
getService(callback, request);
}
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/PackageUtils.java b/play-services-base-core/src/main/java/org/microg/gms/common/PackageUtils.java
index 40aa86ca..ce3c7bca 100644
--- a/play-services-base-core/src/main/java/org/microg/gms/common/PackageUtils.java
+++ b/play-services-base-core/src/main/java/org/microg/gms/common/PackageUtils.java
@@ -55,6 +55,10 @@ public class PackageUtils {
KNOWN_GOOGLE_PACKAGES.put("com.google.android.contacts", "ee3e2b5d95365c5a1ccc2d8dfe48d94eb33b3ebe");
KNOWN_GOOGLE_PACKAGES.put("com.google.android.wearable.app", "a197f9212f2fed64f0ff9c2a4edf24b9c8801c8c");
KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.youtube.music", "afb0fed5eeaebdd86f56a97742f4b6b33ef59875");
+ KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.youtube.unplugged", "3a82b5ee26bc46bf68113d920e610cd090198d4a");
+ KNOWN_GOOGLE_PACKAGES.put("com.google.android.youtube.tv", "61226bdb57cc32c8a2a9ef71f7bc9548e95dcc0b");
+ KNOWN_GOOGLE_PACKAGES.put("com.google.android.apps.photos", "24bb24c05e47e0aefa68a58a766179d9b613a600");
+ KNOWN_GOOGLE_PACKAGES.put("com.google.android.youtube", "24bb24c05e47e0aefa68a58a766179d9b613a600");
KNOWN_GOOGLE_PACKAGES.put("com.google.android.vr.home", "fc1edc68f7e3e4963c998e95fc38f3de8d1bfc96");
KNOWN_GOOGLE_PACKAGES.put("com.google.vr.cyclops", "188c5ca3863fa121216157a5baa80755ceda70ab");
KNOWN_GOOGLE_PACKAGES.put("com.waze", "35b438fe1bc69d975dc8702dc16ab69ebf65f26f");
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 1bb7e68e..07b646fa 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -106,7 +106,7 @@
android:allowBackup="false"
android:extractNativeLibs="true"
android:icon="@mipmap/ic_core_service_app"
- android:label="@string/gms_app_name">
+ android:label="Vanced MicroG">
@@ -412,11 +412,6 @@
android:label="@string/gms_settings_name"
android:roundIcon="@mipmap/ic_microg_settings"
android:theme="@style/Theme.AppCompat.DayNight">
-
-
-
-
-
diff --git a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java b/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java
deleted file mode 100644
index a4001024..00000000
--- a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- */
-
-package com.mgoogle.android.gms.chimera.container;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.pm.PackageManager;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.google.android.gms.dynamic.IObjectWrapper;
-import com.google.android.gms.dynamic.ObjectWrapper;
-import com.google.android.gms.dynamite.IDynamiteLoader;
-
-import org.microg.gms.common.Constants;
-
-public class DynamiteLoaderImpl extends IDynamiteLoader.Stub {
- private static final String TAG = "GmsDynamiteLoaderImpl";
-
- @Override
- public IObjectWrapper createModuleContext(IObjectWrapper wrappedContext, String moduleId, int minVersion) throws RemoteException {
- Log.d(TAG, "unimplemented Method: createModuleContext for " + moduleId + " at version " + minVersion + ", returning gms context");
- final Context context = (Context) ObjectWrapper.unwrap(wrappedContext);
- try {
- return ObjectWrapper.wrap(new ContextWrapper(context.createPackageContext("com.mgoogle.android.gms", Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY)) {
- @Override
- public Context getApplicationContext() {
- return context;
- }
- });
- } catch (PackageManager.NameNotFoundException e) {
- Log.w(TAG, "returning null instead", e);
- return null;
- }
- }
-
- @Override
- public int getModuleVersion(IObjectWrapper context, String moduleId) throws RemoteException {
- return getModuleVersion2(context, moduleId, true);
- }
-
- @Override
- public int getModuleVersion2(IObjectWrapper context, String moduleId, boolean updateConfigIfRequired) throws RemoteException {
- if (moduleId.equals("com.google.android.gms.firebase_database")) {
- Log.d(TAG, "returning temp fix module version for " + moduleId + ". Firebase Database will not be functional!");
- return com.google.android.gms.dynamite.descriptors.com.google.android.gms.firebase_database.ModuleDescriptor.MODULE_VERSION;
- }
- if (moduleId.equals("com.google.android.gms.googlecertificates")) {
- return com.google.android.gms.dynamite.descriptors.com.google.android.gms.googlecertificates.ModuleDescriptor.MODULE_VERSION;
- }
- if (moduleId.equals("com.google.android.gms.cast.framework.dynamite")) {
- Log.d(TAG, "returning temp fix module version for " + moduleId + ". Cast API wil not be functional!");
- return 1;
- }
- Log.d(TAG, "unimplemented Method: getModuleVersion for " + moduleId);
- return 0;
- }
-}
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
index 5a4ad523..19cbb621 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
@@ -34,7 +34,7 @@ import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
public class AuthManager {
private static final String TAG = "GmsAuthManager";
- public static final String PERMISSION_TREE_BASE = "com.google.android.googleapps.permission.GOOGLE_AUTH.";
+ public static final String PERMISSION_TREE_BASE = "com.mgoogle.android.googleapps.permission.GOOGLE_AUTH.";
private static final String PREF_AUTH_TRUST_GOOGLE = "auth_manager_trust_google";
public static final String PREF_AUTH_VISIBLE = "auth_manager_visible";
public static final int ONE_HOUR_IN_SECONDS = 60 * 60;
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java
index 6408e6c7..43a5f540 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java
@@ -16,58 +16,11 @@
package org.microg.gms.ui;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.os.Build;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-
import com.mgoogle.android.gms.R;
-
-import org.microg.gms.auth.AuthConstants;
-import org.microg.gms.auth.AuthManager;
import org.microg.tools.ui.AbstractSettingsActivity;
-import org.microg.tools.ui.ResourceSettingsFragment;
-
-import static android.accounts.AccountManager.PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE;
-import static android.accounts.AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE;
-import static android.accounts.AccountManager.VISIBILITY_USER_MANAGED_VISIBLE;
-import static org.microg.gms.auth.AuthManager.PREF_AUTH_VISIBLE;
public class AccountSettingsActivity extends AbstractSettingsActivity {
-
- @Override
- protected Fragment getFragment() {
- return new AccountSettingsFragment();
+ public AccountSettingsActivity() {
+ this.preferencesResource = R.xml.preferences_account;
}
-
- public static class AccountSettingsFragment extends ResourceSettingsFragment {
- public AccountSettingsFragment() {
- preferencesResource = R.xml.preferences_account;
- }
-
- @Override
- public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
- super.onCreatePreferences(savedInstanceState, rootKey);
- Preference pref = findPreference(PREF_AUTH_VISIBLE);
- if (pref != null) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
- pref.setVisible(false);
- } else {
- pref.setOnPreferenceChangeListener((preference, newValue) -> {
- if (newValue instanceof Boolean) {
- AccountManager am = AccountManager.get(getContext());
- for (Account account : am.getAccountsByType(AuthConstants.DEFAULT_ACCOUNT_TYPE)) {
- am.setAccountVisibility(account, PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE, (Boolean) newValue ? VISIBILITY_USER_MANAGED_VISIBLE : VISIBILITY_USER_MANAGED_NOT_VISIBLE);
- }
- }
- return true;
- });
- }
- }
- }
- }
-}
+}
\ No newline at end of file