diff --git a/play-services-base-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java b/play-services-base-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java index b0dbea65..60fb6cfb 100644 --- a/play-services-base-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java +++ b/play-services-base-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java @@ -46,7 +46,7 @@ public class ChimeraSpoofProvider extends ContentProvider { @Nullable @Override public String getType(@NonNull Uri uri) { - return "vnd.android.cursor.item/com.google.android.gms.chimera"; + return "vnd.android.cursor.item/com.mgoogle.android.gms.chimera"; } @Nullable 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 9f1f2cc8..40aa86ca 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 @@ -40,9 +40,8 @@ import static org.microg.gms.common.Constants.GMS_PACKAGE_SIGNATURE_SHA1; public class PackageUtils { private static final String GOOGLE_PLATFORM_KEY = GMS_PACKAGE_SIGNATURE_SHA1; - private static final String GOOGLE_APP_KEY = "24bb24c05e47e0aefa68a58a766179d9b613a600"; private static final String GOOGLE_LEGACY_KEY = "58e1c4133f7441ec3d2c270270a14802da47ba0e"; // Seems to be no longer used. - private static final String[] GOOGLE_PRIMARY_KEYS = {GOOGLE_PLATFORM_KEY, GOOGLE_APP_KEY}; + private static final String[] GOOGLE_PRIMARY_KEYS = {GOOGLE_PLATFORM_KEY, "24bb24c05e47e0aefa68a58a766179d9b613a600", "afb0fed5eeaebdd86f56a97742f4b6b33ef59875", "61226bdb57cc32c8a2a9ef71f7bc9548e95dcc0b", "3a82b5ee26bc46bf68113d920e610cd090198d4a"}; private static final Map KNOWN_GOOGLE_PACKAGES; @@ -99,7 +98,7 @@ public class PackageUtils { return true; } } - return context.checkCallingPermission("org.microg.gms.EXTENDED_ACCESS") == PackageManager.PERMISSION_GRANTED; + return context.checkCallingPermission("org.mgoogle.gms.EXTENDED_ACCESS") == PackageManager.PERMISSION_GRANTED; } public static void checkPackageUid(Context context, String packageName, int callingUid) { @@ -113,6 +112,18 @@ public class PackageUtils { @Nullable public static String firstSignatureDigest(PackageManager packageManager, String packageName) { + if (packageName.equals("com.google.android.apps.youtube.music") || packageName.contains("youtube.music")) { + return "afb0fed5eeaebdd86f56a97742f4b6b33ef59875"; + } + if (packageName.equals("com.google.android.apps.youtube.unplugged") || packageName.contains("youtube.unplugged")) { + return "3a82b5ee26bc46bf68113d920e610cd090198d4a"; + } + if (packageName.equals("com.google.android.youtube.tv") || packageName.contains("youtube.tv")) { + return "61226bdb57cc32c8a2a9ef71f7bc9548e95dcc0b"; + } + if (packageName.equals("com.google.android.apps.photos") || packageName.contains("apps.photos") || packageName.equals("com.google.android.youtube") || packageName.contains("youtube")) { + return "24bb24c05e47e0aefa68a58a766179d9b613a600"; + } final PackageInfo info; try { info = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES); diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/Utils.java b/play-services-base-core/src/main/java/org/microg/gms/common/Utils.java index c965a444..bd6b891c 100644 --- a/play-services-base-core/src/main/java/org/microg/gms/common/Utils.java +++ b/play-services-base-core/src/main/java/org/microg/gms/common/Utils.java @@ -19,7 +19,6 @@ package org.microg.gms.common; import android.content.Context; import android.util.Log; import android.widget.Toast; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/play-services-basement/src/main/java/org/microg/gms/auth/AuthConstants.java b/play-services-basement/src/main/java/org/microg/gms/auth/AuthConstants.java index 2245272c..52c1dc72 100644 --- a/play-services-basement/src/main/java/org/microg/gms/auth/AuthConstants.java +++ b/play-services-basement/src/main/java/org/microg/gms/auth/AuthConstants.java @@ -23,5 +23,5 @@ public class AuthConstants { public static final String PROVIDER_METHOD_CLEAR_PASSWORD = "clear_password"; public static final String PROVIDER_EXTRA_CLEAR_PASSWORD = "clear_password"; public static final String PROVIDER_EXTRA_ACCOUNTS = "accounts"; - public static final String DEFAULT_ACCOUNT_TYPE = "com.google"; + public static final String DEFAULT_ACCOUNT_TYPE = "com.mgoogle"; } 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 e6680da8..853eea71 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 @@ -19,6 +19,6 @@ package org.microg.gms.common; public class Constants { public static final int MAX_REFERENCE_VERSION = 19420 * 1000; public static final String GMS_PACKAGE_NAME = "com.google.android.gms"; - public static final String GSF_PACKAGE_NAME = "com.google.android.gsf"; + public static final String GSF_PACKAGE_NAME = "com.mgoogle.android.gsf"; public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788"; } diff --git a/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java b/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java index 19dcf1e3..22eecc4a 100644 --- a/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java +++ b/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java @@ -67,7 +67,7 @@ public enum GmsService { AUDIO_MODEM(48, "com.google.android.gms.audiomodem.service.AudioModemService.START"), NEARBY_SHARING(49, "com.google.android.gms.nearby.sharing.service.NearbySharingService.START"), LIGHTWEIGHT_NETWORK_QUALITY(50, "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START"), - PHENOTYPE(51, "com.google.android.gms.phenotype.service.START"), + PHENOTYPE(51, "com.mgoogle.android.gms.phenotype.service.START"), VOICE_UNLOCK(52, "com.google.android.gms.speech.service.START"), NEARBY_CONNECTIONS(54, "com.google.android.gms.nearby.connection.service.START"), FITNESS_SENSORS(55, "com.google.android.gms.fitness.SensorsApi"), diff --git a/play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java b/play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java index d33bbfde..1a019230 100644 --- a/play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java +++ b/play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java @@ -17,10 +17,10 @@ package org.microg.gms.gcm; public final class GcmConstants { - public static final String ACTION_C2DM_RECEIVE = "com.google.android.c2dm.intent.RECEIVE"; - public static final String ACTION_C2DM_REGISTER = "com.google.android.c2dm.intent.REGISTER"; - public static final String ACTION_C2DM_REGISTRATION = "com.google.android.c2dm.intent.REGISTRATION"; - public static final String ACTION_C2DM_UNREGISTER = "com.google.android.c2dm.intent.UNREGISTER"; + public static final String ACTION_C2DM_RECEIVE = "com.mgoogle.android.c2dm.intent.RECEIVE"; + public static final String ACTION_C2DM_REGISTER = "com.mgoogle.android.c2dm.intent.REGISTER"; + public static final String ACTION_C2DM_REGISTRATION = "com.mgoogle.android.c2dm.intent.REGISTRATION"; + public static final String ACTION_C2DM_UNREGISTER = "com.mgoogle.android.c2dm.intent.UNREGISTER"; public static final String ACTION_GCM_SEND = "com.google.android.gcm.intent.SEND"; public static final String ACTION_NOTIFICATION_OPEN = "com.google.android.gms.gcm.NOTIFICATION_OPEN"; public static final String ACTION_NOTIFICATION_DISMISS = "com.google.android.gms.gcm.NOTIFICATION_DISMISS"; diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index e6dee201..1bb7e68e 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -16,52 +16,52 @@ --> + package="com.mgoogle.android.gms"> @@ -86,11 +86,11 @@ - - - + + + - + @@ -104,7 +104,7 @@ - + @@ -200,10 +200,10 @@ + android:permission="com.mgoogle.android.c2dm.permission.RECEIVE"> - - + + @@ -211,7 +211,7 @@ - + @@ -219,7 +219,7 @@ + android:permission="com.mgoogle.android.c2dm.permission.RECEIVE"> @@ -312,7 +312,7 @@ - + @@ -400,7 +400,7 @@ @@ -523,7 +523,7 @@ - + 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 new file mode 100644 index 00000000..a4001024 --- /dev/null +++ b/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java @@ -0,0 +1,72 @@ +/* + * 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/AskPermissionActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java index 63c3d343..b93d29cc 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java @@ -38,7 +38,7 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import com.squareup.wire.Wire; import org.microg.gms.common.PackageUtils; 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 821f09fe..5a4ad523 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 @@ -51,6 +51,17 @@ public class AuthManager { public AuthManager(Context context, String accountName, String packageName, String service) { this.context = context; this.accountName = accountName; + if (packageName.contains("youtube.music")) { + packageName = "com.google.android.apps.youtube.music"; + } else if (packageName.contains("youtube.unplugged")) { + packageName = "com.google.android.apps.youtube.unplugged"; + } else if (packageName.contains("youtube.tv")) { + packageName = "com.google.android.youtube.tv"; + } else if (packageName.contains("youtube")) { + packageName = "com.google.android.youtube"; + } else if (packageName.contains("apps.photos")) { + packageName = "com.google.android.apps.photos"; + } this.packageName = packageName; this.service = service; } diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java index 6b7e00fb..6b779a26 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java @@ -32,7 +32,7 @@ import android.util.Log; import androidx.core.app.NotificationCompat; import com.google.android.auth.IAuthManagerService; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import com.google.android.gms.auth.AccountChangeEventsRequest; import com.google.android.gms.auth.AccountChangeEventsResponse; import com.google.android.gms.auth.TokenData; diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java index a631601f..21164946 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java @@ -28,7 +28,7 @@ import android.widget.TextView; import androidx.annotation.StringRes; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; public abstract class AssistantActivity extends Activity { private static final int TITLE_MIN_HEIGHT = 64; 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 7a292df3..0b4777d7 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 @@ -45,7 +45,7 @@ import android.widget.TextView; import androidx.annotation.StringRes; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.json.JSONArray; import org.microg.gms.auth.AuthConstants; diff --git a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java index c52565ce..9d476d2b 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java @@ -27,7 +27,7 @@ import android.os.Bundle; import android.util.Base64; import android.util.Log; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.auth.AskPermissionActivity; import org.microg.gms.auth.AuthConstants; diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java index 4b67bdd5..b8cfc399 100644 --- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java @@ -43,7 +43,7 @@ public class CheckinManager { LastCheckinInfo info = LastCheckinInfo.read(context); if (!force && info.lastCheckin > System.currentTimeMillis() - MIN_CHECKIN_INTERVAL) return null; - if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, false)) + if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, true)) return null; List accounts = new ArrayList(); AccountManager accountManager = AccountManager.get(context); diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java index fd31234a..94893d27 100644 --- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java @@ -58,7 +58,7 @@ public class CheckinService extends IntentService { protected void onHandleIntent(Intent intent) { try { ForegroundServiceContext.completeForegroundService(this, intent, TAG); - if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PREF_ENABLE_CHECKIN, false)) { + if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PREF_ENABLE_CHECKIN, true)) { LastCheckinInfo info = CheckinManager.checkin(this, intent.getBooleanExtra(EXTRA_FORCE_CHECKIN, false)); if (info != null) { Log.d(TAG, "Checked in as " + Long.toHexString(info.androidId)); diff --git a/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java b/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java index 7b2709a4..ee4f3bd8 100644 --- a/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java @@ -27,7 +27,7 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; public class UpgradeActivity extends Activity { public static final String ACTION_PLAY_GAMES_UPGRADE = "com.google.android.gms.games.PLAY_GAMES_UPGRADE"; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java index 30a95703..cb136365 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java @@ -83,7 +83,7 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe gcmLogEnabled = defaultPreferences.getBoolean(PREF_FULL_LOG, true); lastPersistedId = defaultPreferences.getString(PREF_LAST_PERSISTENT_ID, ""); confirmNewApps = defaultPreferences.getBoolean(PREF_CONFIRM_NEW_APPS, false); - gcmEnabled = defaultPreferences.getBoolean(PREF_ENABLE_GCM, false); + gcmEnabled = defaultPreferences.getBoolean(PREF_ENABLE_GCM, true); networkMobile = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_MOBILE, "0")); networkWifi = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_WIFI, "0")); diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java index 3301b5f5..6c67ce9b 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java @@ -106,7 +106,7 @@ import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; public class McsService extends Service implements Handler.Callback { private static final String TAG = "GmsGcmMcsSvc"; - public static final String SELF_CATEGORY = "com.google.android.gsf.gtalkservice"; + public static final String SELF_CATEGORY = "com.mgoogle.android.gsf.gtalkservice"; public static final String IDLE_NOTIFICATION = "IdleNotification"; public static final String FROM_FIELD = "gcm@android.com"; diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java index 66595b26..79543f47 100644 --- a/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java +++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java @@ -22,9 +22,9 @@ import android.database.Cursor; import android.net.Uri; public class GServices { - public static final Uri CONTENT_URI = Uri.parse("content://com.google.android.gsf.gservices"); - public static final Uri MAIN_URI = Uri.parse("content://com.google.android.gsf.gservices/main"); - public static final Uri OVERRIDE_URI = Uri.parse("content://com.google.android.gsf.gservices/override"); + public static final Uri CONTENT_URI = Uri.parse("content://com.mgoogle.android.gsf.gservices"); + public static final Uri MAIN_URI = Uri.parse("content://com.mgoogle.android.gsf.gservices/main"); + public static final Uri OVERRIDE_URI = Uri.parse("content://com.mgoogle.android.gsf.gservices/override"); public static int setString(ContentResolver resolver, String key, String value) { ContentValues values = new ContentValues(); 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 0dc21d30..698836cb 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 @@ -38,7 +38,7 @@ import java.util.Set; * if certain "experiments" are enabled on the device. */ public class GServicesProvider extends ContentProvider { - public static final Uri CONTENT_URI = Uri.parse("content://com.google.android.gsf.gservices/"); + public static final Uri CONTENT_URI = Uri.parse("content://com.mgoogle.android.gsf.gservices/"); public static final Uri MAIN_URI = Uri.withAppendedPath(CONTENT_URI, "main"); public static final Uri OVERRIDE_URI = Uri.withAppendedPath(CONTENT_URI, "override"); public static final Uri PREFIX_URI = Uri.withAppendedPath(CONTENT_URI, "prefix"); diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java index 0e863358..176ed386 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java @@ -18,7 +18,7 @@ package org.microg.gms.ui; import androidx.fragment.app.Fragment; -import com.google.android.gms.BuildConfig; +import com.mgoogle.android.gms.BuildConfig; import org.microg.tools.ui.AbstractAboutFragment; import org.microg.tools.ui.AbstractSettingsActivity; 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 9fa7c11d..6408e6c7 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 @@ -25,7 +25,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.auth.AuthConstants; import org.microg.gms.auth.AuthManager; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java b/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java index 17dcf631..8e5014bc 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/AskPushPermission.java @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.fragment.app.FragmentActivity; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.gcm.GcmDatabase; import org.microg.gms.gcm.PushRegisterService; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java index aee8642f..8a034b84 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/CheckinFragment.java @@ -21,7 +21,7 @@ import android.preference.PreferenceManager; import androidx.fragment.app.Fragment; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.tools.ui.AbstractSettingsActivity; import org.microg.tools.ui.SwitchBarResourceSettingsFragment; @@ -38,7 +38,7 @@ public class CheckinFragment extends SwitchBarResourceSettingsFragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - switchBar.setChecked(PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, false)); + switchBar.setChecked(PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, true)); } @Override diff --git a/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java b/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java index de517dc5..c1c35ae9 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java @@ -28,7 +28,7 @@ import android.view.View; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.gcm.GcmPrefs; import org.microg.tools.ui.Condition; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java index e7c846f2..537fde3c 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java @@ -23,7 +23,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.gcm.GcmPrefs; import org.microg.gms.gcm.McsService; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/GcmAppFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/GcmAppFragment.java index 232a2d65..62f45a06 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/GcmAppFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/GcmAppFragment.java @@ -18,7 +18,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.gcm.GcmDatabase; import org.microg.gms.gcm.PushRegisterManager; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java index 6c4ee0db..b9c68c0c 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java @@ -34,7 +34,7 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.gcm.GcmDatabase; import org.microg.gms.gcm.GcmPrefs; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/GoogleMoreFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/GoogleMoreFragment.java index 7cb01d6b..f9d90bf2 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/GoogleMoreFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/GoogleMoreFragment.java @@ -16,7 +16,7 @@ package org.microg.gms.ui; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.tools.ui.AbstractSettingsActivity; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java index b84cb274..e83ff7ef 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java @@ -39,7 +39,7 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; import androidx.core.view.MenuItemCompat; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.api.Status; import com.google.android.gms.location.places.internal.PlaceImpl; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetAdvancedFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetAdvancedFragment.java index e956b589..ff1a433f 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetAdvancedFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetAdvancedFragment.java @@ -22,7 +22,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.preference.Preference; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.tools.ui.AbstractSettingsActivity; import org.microg.tools.ui.RadioButtonPreference; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetFragment.java index 3756aff8..c5ef88a4 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SafetyNetFragment.java @@ -25,7 +25,7 @@ import android.view.MenuItem; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.snet.SafetyNetPrefs; import org.microg.tools.ui.AbstractSettingsActivity; diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java index 965872ff..0a356b53 100644 --- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java @@ -23,7 +23,7 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.gcm.GcmDatabase; import org.microg.gms.gcm.GcmPrefs; @@ -105,7 +105,7 @@ public class SettingsActivity extends AbstractDashboardActivity { // Preferences.splitBackendString(unifiedNlPrefs.getGeocoderBackends()).length; // findPreference(PREF_UNIFIEDNLP).setSummary(getResources().getQuantityString(R.plurals.pref_unifiednlp_summary, backendCount, backendCount)); - boolean checkinEnabled = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, false); + boolean checkinEnabled = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(PREF_ENABLE_CHECKIN, true); findPreference(PREF_CHECKIN).setSummary(checkinEnabled ? R.string.service_status_enabled : R.string.service_status_disabled); } } diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java index e34d3dd0..e7927a2f 100644 --- a/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java +++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java @@ -19,7 +19,7 @@ package org.microg.tools.selfcheck; import android.content.Context; import android.content.pm.PackageManager; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.common.Constants; import org.microg.gms.common.PackageUtils; diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java index beb61d98..b81a0c4d 100644 --- a/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java +++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import org.microg.gms.common.Constants; import org.microg.gms.common.PackageUtils; diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java index c091d2d0..472031d9 100644 --- a/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java +++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java @@ -25,7 +25,7 @@ import android.provider.Settings; import androidx.fragment.app.Fragment; -import com.google.android.gms.R; +import com.mgoogle.android.gms.R; import static org.microg.tools.selfcheck.SelfCheckGroup.Result.Negative; import static org.microg.tools.selfcheck.SelfCheckGroup.Result.Positive; diff --git a/play-services-core/src/main/res/xml/authenticator.xml b/play-services-core/src/main/res/xml/authenticator.xml index 16c7aea5..efa3fc0e 100644 --- a/play-services-core/src/main/res/xml/authenticator.xml +++ b/play-services-core/src/main/res/xml/authenticator.xml @@ -16,7 +16,7 @@ \ No newline at end of file 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 c51f7dc5..85b5e3d0 100644 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -22,7 +22,7 @@ android:title="@string/self_check_title"> + android:targetPackage="com.mgoogle.android.gms"/> @@ -32,7 +32,7 @@ android:title="@string/pref_add_account_title"> + android:targetPackage="com.mgoogle.android.gms"/> + android:targetPackage="com.mgoogle.android.gms"/> + android:targetPackage="com.mgoogle.android.gms"/> + android:targetPackage="com.mgoogle.android.gms"/> + android:targetPackage="com.mgoogle.android.gms"/> @@ -73,7 +73,7 @@ android:title="UnifiedNlp"> + android:targetPackage="com.mgoogle.android.gms"/> @@ -82,7 +82,7 @@ android:title="@string/pref_about_title"> + android:targetPackage="com.mgoogle.android.gms"/> diff --git a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java index ddec2077..3a322430 100644 --- a/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java +++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java @@ -45,7 +45,7 @@ public class SharedTileProvider extends ContentProvider { @Override public String getType(Uri uri) { - return "vnd.android.cursor.item/org.microg.gms.map.tile"; + return "vnd.android.cursor.item/org.mgoogle.gms.map.tile"; } @Override