From 8472943bb4f6606b625eafbe28d5713a611a05aa Mon Sep 17 00:00:00 2001 From: Oizaro <98434320+Oizaro@users.noreply.github.com> Date: Fri, 28 Jan 2022 01:15:01 +0100 Subject: [PATCH] Optimize imports --- .../gms/auth/api/credentials/Credential.java | 1 - .../credentials/CredentialPickerConfig.java | 1 - .../api/credentials/CredentialRequest.java | 1 - .../gms/auth/api/credentials/IdToken.java | 1 - .../gms/clearcut/LogEventParcelable.java | 2 +- .../multiplayer/realtime/RealTimeMessage.java | 1 - .../gms/maps/model/MapStyleOptions.java | 3 - .../android/gms/maps/model/MarkerOptions.java | 1 + .../android/gms/common/images/WebImage.java | 4 +- .../gms/common/GoogleApiAvailability.java | 33 ++++---- .../gms/common/MultiConnectionKeeper.java | 8 +- .../gms/common/api/GoogleApiManager.java | 1 - .../common/internal/GetServiceRequest.java | 1 - .../google/android/gms/cast/CastDevice.java | 2 +- .../google/android/gms/cast/RequestItem.java | 1 - .../gms/cast/framework/CastOptions.java | 8 +- .../framework/media/CastMediaOptions.java | 1 - .../framework/media/NotificationOptions.java | 5 +- .../microg/gms/cast/CastApiClientBuilder.java | 2 +- .../CastRemoteDisplayApiClientBuilder.java | 2 +- .../java/org/microg/tools/ui/SwitchBar.java | 4 +- .../framework/internal/CastContextImpl.java | 2 +- .../internal/CastDynamiteModuleImpl.java | 3 - .../framework/internal/CastSessionImpl.java | 3 +- .../internal/DiscoveryManagerImpl.java | 3 +- .../cast/framework/internal/SessionImpl.java | 1 - .../internal/SessionManagerImpl.java | 9 +-- .../media/CastMediaRouteProviderService.java | 4 +- .../chimera/container/DynamiteLoaderImpl.java | 6 -- .../chimera/container/DynamiteModuleInfo.java | 3 - .../container/FilteredClassLoader.java | 2 - .../gms/common/GoogleCertificatesImpl.java | 3 +- .../security/ProviderInstallerImpl.java | 4 +- .../main/java/org/microg/gms/BaseService.java | 2 - .../gms/auth/AccountContentProvider.java | 12 +-- .../java/org/microg/gms/auth/AuthManager.java | 8 +- .../gms/auth/AuthManagerServiceImpl.java | 22 ++---- .../java/org/microg/gms/auth/AuthRequest.java | 8 +- .../org/microg/gms/auth/AuthResponse.java | 4 +- .../microg/gms/auth/login/LoginActivity.java | 39 +++++----- .../loginservice/AccountAuthenticator.java | 21 +++-- .../auth/loginservice/GoogleLoginService.java | 4 +- .../gms/cast/CastDeviceControllerImpl.java | 16 ++-- .../microg/gms/checkin/CheckinManager.java | 4 +- .../microg/gms/checkin/CheckinService.java | 4 +- .../microg/gms/checkin/TriggerReceiver.java | 12 +-- .../org/microg/gms/common/PackageUtils.java | 8 +- .../java/org/microg/gms/common/Utils.java | 4 +- .../org/microg/gms/gcm/McsInputStream.java | 22 +++--- .../org/microg/gms/gcm/McsOutputStream.java | 14 ++-- .../java/org/microg/gms/gcm/McsService.java | 76 +++++++++---------- .../microg/gms/gcm/PushRegisterManager.java | 13 ++-- .../org/microg/gms/gcm/RegisterRequest.java | 9 +-- .../org/microg/gms/gcm/RegisterResponse.java | 4 +- .../java/org/microg/gms/gcm/SendReceiver.java | 4 +- .../org/microg/gms/gcm/TriggerReceiver.java | 12 +-- .../microg/gms/gcm/UnregisterReceiver.java | 12 +-- .../gms/gservices/GServicesProvider.java | 4 - .../gms/location/GoogleLocationManager.java | 17 ++--- .../GoogleLocationManagerService.java | 2 - .../gms/location/LocationRequestHelper.java | 6 +- .../gms/location/MockLocationProvider.java | 4 +- .../gms/playlog/PlayLogServiceImpl.java | 2 +- .../gms/ui/AccountSettingsActivity.java | 10 +-- .../gms/ui/SettingsDashboardActivity.java | 1 - .../microg/gms/auth/appcert/AppCertManager.kt | 1 - .../org/microg/gms/chimera/ServiceProvider.kt | 2 - .../gms/clearcut/ClearcutLoggerService.kt | 1 - .../kotlin/org/microg/gms/gcm/GcmPrefs.kt | 3 +- .../org/microg/gms/gcm/PushRegisterService.kt | 2 - .../kotlin/org/microg/gms/profile/Build.kt | 3 - .../org/microg/gms/profile/ProfileManager.kt | 2 +- .../ui/PushNotificationAdvancedFragment.kt | 5 +- .../org/microg/gms/ui/SettingsFragment.kt | 4 - .../org/microg/gms/ui/TextPreference.kt | 1 - .../microg/mgms/settings/SettingsProvider.kt | 2 +- .../microg_light_color_24.xml | 2 +- .../layout/push_notification_app_fragment.xml | 1 - .../res/layout/push_notification_fragment.xml | 3 +- .../xml/preferences_push_notifications.xml | 1 - .../src/main/AndroidManifest.xml | 3 +- .../android/gms/iid/MessengerCompat.java | 6 +- .../gms/location/LocationSettingsRequest.java | 1 - .../internal/LocationRequestInternal.java | 1 - .../android/gms/location/LocationClient.java | 1 - .../ActivityRecognitionApiClientBuilder.java | 2 +- .../location/ActivityRecognitionApiImpl.java | 1 - .../LocationServicesApiClientBuilder.java | 2 +- .../location/NativeLocationClientImpl.java | 6 +- .../java/org/microg/gms/tasks/TaskImpl.java | 4 +- 90 files changed, 244 insertions(+), 322 deletions(-) diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java index f0f63321..3be9e900 100644 --- a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java +++ b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/Credential.java @@ -13,7 +13,6 @@ import android.text.TextUtils; import org.microg.gms.common.PublicApi; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; import java.util.Arrays; import java.util.List; diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java index e072efd0..fac74463 100644 --- a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java +++ b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialPickerConfig.java @@ -10,7 +10,6 @@ package com.google.android.gms.auth.api.credentials; import org.microg.gms.common.PublicApi; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; @PublicApi public class CredentialPickerConfig extends AutoSafeParcelable { diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java index a1679445..599dd387 100644 --- a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java +++ b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/CredentialRequest.java @@ -9,7 +9,6 @@ package com.google.android.gms.auth.api.credentials; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; /** * Parameters for requesting a Credential, via Auth.CredentialsApi.request(). Instances can be diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java index 4c3d1c05..8b4a65d6 100644 --- a/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java +++ b/play-services-api/src/main/java/com/google/android/gms/auth/api/credentials/IdToken.java @@ -10,7 +10,6 @@ package com.google.android.gms.auth.api.credentials; import org.microg.gms.common.PublicApi; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; @PublicApi public class IdToken extends AutoSafeParcelable { diff --git a/play-services-api/src/main/java/com/google/android/gms/clearcut/LogEventParcelable.java b/play-services-api/src/main/java/com/google/android/gms/clearcut/LogEventParcelable.java index 0f193b9c..faf12e33 100644 --- a/play-services-api/src/main/java/com/google/android/gms/clearcut/LogEventParcelable.java +++ b/play-services-api/src/main/java/com/google/android/gms/clearcut/LogEventParcelable.java @@ -19,9 +19,9 @@ package com.google.android.gms.clearcut; import android.util.Base64; import com.google.android.gms.clearcut.internal.LogVerifierResultParcelable; +import com.google.android.gms.clearcut.internal.PlayLoggerContext; import com.google.android.gms.phenotype.ExperimentToken; import com.google.android.gms.phenotype.GenericDimension; -import com.google.android.gms.clearcut.internal.PlayLoggerContext; import org.microg.safeparcel.AutoSafeParcelable; diff --git a/play-services-api/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java b/play-services-api/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java index f6716de3..5522dfae 100644 --- a/play-services-api/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java +++ b/play-services-api/src/main/java/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.java @@ -18,7 +18,6 @@ package com.google.android.gms.games.multiplayer.realtime; import android.os.Parcel; import android.os.Parcelable; -import android.os.Parcelable.Creator; public final class RealTimeMessage implements Parcelable { public static final int RELIABLE = 1; diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java index c2ebb01d..78e80314 100644 --- a/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java +++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/MapStyleOptions.java @@ -16,9 +16,6 @@ package com.google.android.gms.maps.model; -import android.os.IBinder; -import com.google.android.gms.dynamic.ObjectWrapper; - import org.microg.gms.common.PublicApi; import org.microg.safeparcel.AutoSafeParcelable; import org.microg.safeparcel.SafeParceled; diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java index a950cd34..b765406a 100644 --- a/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java +++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java @@ -17,6 +17,7 @@ package com.google.android.gms.maps.model; import android.os.IBinder; + import com.google.android.gms.dynamic.ObjectWrapper; import org.microg.gms.common.PublicApi; diff --git a/play-services-base-api/src/main/java/com/google/android/gms/common/images/WebImage.java b/play-services-base-api/src/main/java/com/google/android/gms/common/images/WebImage.java index 1843f847..1639c2bf 100644 --- a/play-services-base-api/src/main/java/com/google/android/gms/common/images/WebImage.java +++ b/play-services-base-api/src/main/java/com/google/android/gms/common/images/WebImage.java @@ -16,13 +16,13 @@ package com.google.android.gms.common.images; -import java.util.Locale; - import android.net.Uri; import org.microg.safeparcel.AutoSafeParcelable; import org.microg.safeparcel.SafeParceled; +import java.util.Locale; + public class WebImage extends AutoSafeParcelable { public static final Creator CREATOR = new AutoCreator<>(WebImage.class); 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 30afec09..ef43eb7d 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 @@ -16,22 +16,6 @@ package com.google.android.gms.common; -import android.app.Activity; -import android.app.Dialog; -import android.app.PendingIntent; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; -import android.util.Log; - -import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener; -import com.google.android.gms.tasks.Task; -import com.google.android.gms.tasks.Tasks; - -import org.microg.gms.common.Constants; -import org.microg.gms.common.PublicApi; - import static com.google.android.gms.common.ConnectionResult.INTERNAL_ERROR; import static com.google.android.gms.common.ConnectionResult.INVALID_ACCOUNT; import static com.google.android.gms.common.ConnectionResult.NETWORK_ERROR; @@ -43,6 +27,23 @@ import static com.google.android.gms.common.ConnectionResult.SERVICE_VERSION_UPD import static com.google.android.gms.common.ConnectionResult.SIGN_IN_REQUIRED; import static com.google.android.gms.common.ConnectionResult.SUCCESS; +import android.app.Activity; +import android.app.Dialog; +import android.app.PendingIntent; +import android.content.Context; +import android.content.DialogInterface; +import android.os.Bundle; +import android.util.Log; + +import androidx.fragment.app.FragmentActivity; + +import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener; +import com.google.android.gms.tasks.Task; +import com.google.android.gms.tasks.Tasks; + +import org.microg.gms.common.Constants; +import org.microg.gms.common.PublicApi; + @PublicApi public class GoogleApiAvailability { private static final String TAG = "GmsApiAvailability"; diff --git a/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java b/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java index 78c9d4f6..d7aad158 100644 --- a/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java +++ b/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java @@ -16,6 +16,10 @@ package org.microg.gms.common; +import static android.os.Build.VERSION.SDK_INT; +import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH; +import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; + import android.annotation.SuppressLint; import android.content.ComponentName; import android.content.Context; @@ -29,10 +33,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static android.os.Build.VERSION.SDK_INT; -import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH; -import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; - public class MultiConnectionKeeper { private static final String TAG = "GmsMultiConKeeper"; diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiManager.java b/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiManager.java index 2d6cf257..addad6a7 100644 --- a/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiManager.java +++ b/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiManager.java @@ -7,7 +7,6 @@ package org.microg.gms.common.api; import android.content.Context; import android.os.Bundle; -import android.os.DeadObjectException; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.Api; 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 618b420f..6e13dc66 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 @@ -26,7 +26,6 @@ import com.google.android.gms.common.api.Scope; import org.microg.gms.common.Constants; import org.microg.gms.common.GmsService; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; import java.util.Arrays; diff --git a/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastDevice.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastDevice.java index b340325b..2d3aaa2a 100644 --- a/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastDevice.java +++ b/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastDevice.java @@ -16,8 +16,8 @@ package com.google.android.gms.cast; -import android.os.Bundle; import android.net.Uri; +import android.os.Bundle; import android.text.TextUtils; import com.google.android.gms.common.images.WebImage; diff --git a/play-services-cast-api/src/main/java/com/google/android/gms/cast/RequestItem.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/RequestItem.java index 2d38c132..0fd47c4d 100644 --- a/play-services-cast-api/src/main/java/com/google/android/gms/cast/RequestItem.java +++ b/play-services-cast-api/src/main/java/com/google/android/gms/cast/RequestItem.java @@ -6,7 +6,6 @@ package com.google.android.gms.cast; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; public class RequestItem extends AutoSafeParcelable { @Field(2) diff --git a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java index 75dd0850..9b7a5abe 100644 --- a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java +++ b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java @@ -16,14 +16,12 @@ package com.google.android.gms.cast.framework; -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import com.google.android.gms.cast.framework.media.CastMediaOptions; import com.google.android.gms.cast.LaunchOptions; +import com.google.android.gms.cast.framework.media.CastMediaOptions; + +import org.microg.safeparcel.AutoSafeParcelable; import java.util.ArrayList; -import java.util.List; public class CastOptions extends AutoSafeParcelable { @Field(1) diff --git a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java index 2a9afe90..8f978be5 100644 --- a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java +++ b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java @@ -17,7 +17,6 @@ package com.google.android.gms.cast.framework.media; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; public class CastMediaOptions extends AutoSafeParcelable { diff --git a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java index 2219e4a3..25fb6b3a 100644 --- a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java +++ b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java @@ -16,12 +16,11 @@ package com.google.android.gms.cast.framework.media; -import java.util.List; - import com.google.android.gms.cast.framework.media.INotificationActionsProvider; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; + +import java.util.List; public class NotificationOptions extends AutoSafeParcelable { diff --git a/play-services-cast/src/main/java/org/microg/gms/cast/CastApiClientBuilder.java b/play-services-cast/src/main/java/org/microg/gms/cast/CastApiClientBuilder.java index aba48971..47847803 100755 --- a/play-services-cast/src/main/java/org/microg/gms/cast/CastApiClientBuilder.java +++ b/play-services-cast/src/main/java/org/microg/gms/cast/CastApiClientBuilder.java @@ -21,9 +21,9 @@ import android.os.Looper; import com.google.android.gms.cast.Cast; +import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ApiClientBuilder; import org.microg.gms.common.api.ApiClientSettings; -import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ConnectionCallbacks; import org.microg.gms.common.api.OnConnectionFailedListener; diff --git a/play-services-cast/src/main/java/org/microg/gms/cast/CastRemoteDisplayApiClientBuilder.java b/play-services-cast/src/main/java/org/microg/gms/cast/CastRemoteDisplayApiClientBuilder.java index 588d25c3..b3f5374a 100755 --- a/play-services-cast/src/main/java/org/microg/gms/cast/CastRemoteDisplayApiClientBuilder.java +++ b/play-services-cast/src/main/java/org/microg/gms/cast/CastRemoteDisplayApiClientBuilder.java @@ -22,9 +22,9 @@ import android.os.Looper; import com.google.android.gms.cast.CastRemoteDisplay; import org.microg.gms.common.DummyApiClient; +import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ApiClientBuilder; import org.microg.gms.common.api.ApiClientSettings; -import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ConnectionCallbacks; import org.microg.gms.common.api.OnConnectionFailedListener; diff --git a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java index 61f28ae5..e5672e90 100644 --- a/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java +++ b/play-services-core/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java @@ -17,6 +17,8 @@ package org.microg.tools.ui; +import static android.os.Build.VERSION.SDK_INT; + import android.content.Context; import android.os.Build; import android.os.Parcel; @@ -35,8 +37,6 @@ import androidx.appcompat.widget.SwitchCompat; import java.util.ArrayList; -import static android.os.Build.VERSION.SDK_INT; - public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener, View.OnClickListener { diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastContextImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastContextImpl.java index 96d805e4..ee94b2fa 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastContextImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastContextImpl.java @@ -34,8 +34,8 @@ import com.google.android.gms.cast.framework.ISessionProvider; import com.google.android.gms.dynamic.IObjectWrapper; import com.google.android.gms.dynamic.ObjectWrapper; -import java.util.Map; import java.util.HashMap; +import java.util.Map; public class CastContextImpl extends ICastContext.Stub { private static final String TAG = CastContextImpl.class.getSimpleName(); diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java index 03615bbe..fccaf432 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java @@ -27,9 +27,6 @@ import com.google.android.gms.cast.framework.IReconnectionService; import com.google.android.gms.cast.framework.ISession; import com.google.android.gms.cast.framework.ISessionProxy; import com.google.android.gms.cast.framework.media.CastMediaOptions; -import com.google.android.gms.cast.framework.internal.CastContextImpl; -import com.google.android.gms.cast.framework.internal.CastSessionImpl; -import com.google.android.gms.cast.framework.internal.SessionImpl; import com.google.android.gms.cast.framework.media.IMediaNotificationService; import com.google.android.gms.cast.framework.media.internal.IFetchBitmapTask; import com.google.android.gms.cast.framework.media.internal.IFetchBitmapTaskProgressPublisher; diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastSessionImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastSessionImpl.java index cc63b949..a53952bc 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastSessionImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastSessionImpl.java @@ -16,8 +16,6 @@ package com.google.android.gms.cast.framework.internal; -import com.google.android.gms.cast.framework.ICastSession; - import android.os.Bundle; import android.os.RemoteException; import android.util.Log; @@ -25,6 +23,7 @@ import android.util.Log; import com.google.android.gms.cast.ApplicationMetadata; import com.google.android.gms.cast.framework.CastOptions; import com.google.android.gms.cast.framework.ICastConnectionController; +import com.google.android.gms.cast.framework.ICastSession; import com.google.android.gms.common.api.Status; import com.google.android.gms.dynamic.IObjectWrapper; import com.google.android.gms.dynamic.ObjectWrapper; diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/DiscoveryManagerImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/DiscoveryManagerImpl.java index b0e7b51c..02916ed7 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/DiscoveryManagerImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/DiscoveryManagerImpl.java @@ -21,12 +21,11 @@ import android.util.Log; import com.google.android.gms.cast.framework.IDiscoveryManager; import com.google.android.gms.cast.framework.IDiscoveryManagerListener; -import com.google.android.gms.cast.framework.internal.CastContextImpl; import com.google.android.gms.dynamic.IObjectWrapper; import com.google.android.gms.dynamic.ObjectWrapper; -import java.util.Set; import java.util.HashSet; +import java.util.Set; public class DiscoveryManagerImpl extends IDiscoveryManager.Stub { private static final String TAG = DiscoveryManagerImpl.class.getSimpleName(); diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionImpl.java index 954405d8..6409b609 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionImpl.java @@ -20,7 +20,6 @@ import android.os.Bundle; import android.os.RemoteException; import android.util.Log; - import com.google.android.gms.cast.ApplicationMetadata; import com.google.android.gms.cast.CastDevice; import com.google.android.gms.cast.framework.ISession; diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionManagerImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionManagerImpl.java index 918968fe..2fccb426 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionManagerImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/SessionManagerImpl.java @@ -24,16 +24,13 @@ import com.google.android.gms.cast.framework.CastState; import com.google.android.gms.cast.framework.ICastStateListener; import com.google.android.gms.cast.framework.ISessionManager; import com.google.android.gms.cast.framework.ISessionManagerListener; -import com.google.android.gms.cast.framework.internal.CastContextImpl; -import com.google.android.gms.cast.framework.internal.SessionImpl; import com.google.android.gms.dynamic.IObjectWrapper; import com.google.android.gms.dynamic.ObjectWrapper; -import java.util.Set; -import java.util.HashSet; - -import java.util.Map; import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class SessionManagerImpl extends ISessionManager.Stub { private static final String TAG = SessionManagerImpl.class.getSimpleName(); diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/media/CastMediaRouteProviderService.java b/play-services-core/src/main/java/com/google/android/gms/cast/media/CastMediaRouteProviderService.java index e2502eea..bf0553de 100644 --- a/play-services-core/src/main/java/com/google/android/gms/cast/media/CastMediaRouteProviderService.java +++ b/play-services-core/src/main/java/com/google/android/gms/cast/media/CastMediaRouteProviderService.java @@ -16,11 +16,11 @@ package com.google.android.gms.cast.media; -import org.microg.gms.cast.CastMediaRouteProvider; - import androidx.mediarouter.media.MediaRouteProvider; import androidx.mediarouter.media.MediaRouteProviderService; +import org.microg.gms.cast.CastMediaRouteProvider; + public class CastMediaRouteProviderService extends MediaRouteProviderService { private static final String TAG = CastMediaRouteProviderService.class.getSimpleName(); diff --git a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java index 48e5a4b5..62f387df 100644 --- a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java @@ -17,8 +17,6 @@ package com.google.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; @@ -26,10 +24,6 @@ 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; - -import java.lang.reflect.Field; - public class DynamiteLoaderImpl extends IDynamiteLoader.Stub { private static final String TAG = "GmsDynamiteLoaderImpl"; diff --git a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java index 637a269f..ce9f891a 100644 --- a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java @@ -8,9 +8,6 @@ package com.google.android.gms.chimera.container; import java.util.Collection; import java.util.Collections; -import static android.content.Context.CONTEXT_IGNORE_SECURITY; -import static android.content.Context.CONTEXT_INCLUDE_CODE; - public class DynamiteModuleInfo { private Class descriptor; private String moduleId; diff --git a/play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java index 76731fc3..74c2bb36 100644 --- a/play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java @@ -5,8 +5,6 @@ package com.google.android.gms.chimera.container; -import android.util.Log; - import java.util.Collection; import java.util.HashSet; diff --git a/play-services-core/src/main/java/com/google/android/gms/common/GoogleCertificatesImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/GoogleCertificatesImpl.java index bbe72472..7ab30bc3 100644 --- a/play-services-core/src/main/java/com/google/android/gms/common/GoogleCertificatesImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/common/GoogleCertificatesImpl.java @@ -18,9 +18,10 @@ package com.google.android.gms.common; import android.content.pm.PackageManager; import android.os.RemoteException; -import androidx.annotation.Keep; import android.util.Log; +import androidx.annotation.Keep; + import com.google.android.gms.common.internal.GoogleCertificatesQuery; import com.google.android.gms.common.internal.IGoogleCertificatesApi; import com.google.android.gms.dynamic.IObjectWrapper; diff --git a/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java index 0135b57f..01137bd2 100644 --- a/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java @@ -5,6 +5,8 @@ package com.google.android.gms.common.security; +import static com.google.android.gms.security.ProviderInstaller.PROVIDER_NAME; + import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Build; @@ -38,8 +40,6 @@ import java.util.zip.ZipFile; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; -import static com.google.android.gms.security.ProviderInstaller.PROVIDER_NAME; - @Keep public class ProviderInstallerImpl { private static final String TAG = "GmsProviderInstaller"; diff --git a/play-services-core/src/main/java/org/microg/gms/BaseService.java b/play-services-core/src/main/java/org/microg/gms/BaseService.java index 113b2466..3941e508 100644 --- a/play-services-core/src/main/java/org/microg/gms/BaseService.java +++ b/play-services-core/src/main/java/org/microg/gms/BaseService.java @@ -16,7 +16,6 @@ package org.microg.gms; -import android.app.Service; import android.content.Intent; import android.os.IBinder; import android.os.RemoteException; @@ -32,7 +31,6 @@ import org.microg.gms.common.GmsService; import java.io.FileDescriptor; import java.io.PrintWriter; - import java.util.Arrays; import java.util.EnumSet; diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java b/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java index b1fb4822..2254ba39 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java @@ -16,6 +16,12 @@ package org.microg.gms.auth; +import static org.microg.gms.auth.AuthConstants.DEFAULT_ACCOUNT_TYPE; +import static org.microg.gms.auth.AuthConstants.PROVIDER_EXTRA_ACCOUNTS; +import static org.microg.gms.auth.AuthConstants.PROVIDER_EXTRA_CLEAR_PASSWORD; +import static org.microg.gms.auth.AuthConstants.PROVIDER_METHOD_CLEAR_PASSWORD; +import static org.microg.gms.auth.AuthConstants.PROVIDER_METHOD_GET_ACCOUNTS; + import android.Manifest; import android.accounts.Account; import android.accounts.AccountManager; @@ -35,12 +41,6 @@ import org.microg.gms.common.PackageUtils; import java.util.Arrays; -import static org.microg.gms.auth.AuthConstants.DEFAULT_ACCOUNT_TYPE; -import static org.microg.gms.auth.AuthConstants.PROVIDER_EXTRA_ACCOUNTS; -import static org.microg.gms.auth.AuthConstants.PROVIDER_EXTRA_CLEAR_PASSWORD; -import static org.microg.gms.auth.AuthConstants.PROVIDER_METHOD_CLEAR_PASSWORD; -import static org.microg.gms.auth.AuthConstants.PROVIDER_METHOD_GET_ACCOUNTS; - public class AccountContentProvider extends ContentProvider { private static final String TAG = "GmsAuthProvider"; 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 08618fd1..73adeabf 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 @@ -16,6 +16,10 @@ package org.microg.gms.auth; +import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; +import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; +import static org.microg.gms.auth.AuthPrefs.isTrustGooglePermitted; + import android.accounts.Account; import android.accounts.AccountManager; import android.content.Context; @@ -28,10 +32,6 @@ import org.microg.mgms.settings.SettingsContract; import java.io.IOException; -import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; -import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; -import static org.microg.gms.auth.AuthPrefs.isTrustGooglePermitted; - public class AuthManager { private static final String TAG = "GmsAuthManager"; 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 6e8d30bd..6343439d 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 @@ -16,27 +16,23 @@ package org.microg.gms.auth; +import static android.accounts.AccountManager.KEY_ACCOUNTS; +import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; +import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; +import static android.accounts.AccountManager.KEY_AUTHTOKEN; +import static android.accounts.AccountManager.KEY_CALLER_PID; + import android.accounts.Account; import android.accounts.AccountManager; -import android.accounts.AuthenticatorException; -import android.accounts.OperationCanceledException; import android.annotation.SuppressLint; -import android.app.NotificationManager; -import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Parcel; import android.os.RemoteException; -import android.util.Base64; import android.util.Log; -import androidx.core.app.NotificationCompat; -import androidx.core.app.NotificationManagerCompat; - import com.google.android.auth.IAuthManagerService; -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; @@ -49,12 +45,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static android.accounts.AccountManager.KEY_ACCOUNTS; -import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; -import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; -import static android.accounts.AccountManager.KEY_AUTHTOKEN; -import static android.accounts.AccountManager.KEY_CALLER_PID; - public class AuthManagerServiceImpl extends IAuthManagerService.Stub { private static final String TAG = "GmsAuthManagerSvc"; 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 aaea96c8..55ff536b 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 @@ -16,21 +16,21 @@ package org.microg.gms.auth; +import static org.microg.gms.common.HttpFormClient.RequestContent; +import static org.microg.gms.common.HttpFormClient.RequestHeader; + import android.content.Context; import org.microg.gms.checkin.LastCheckinInfo; -import org.microg.gms.profile.Build; import org.microg.gms.common.Constants; import org.microg.gms.common.HttpFormClient; import org.microg.gms.common.Utils; +import org.microg.gms.profile.Build; import org.microg.gms.profile.ProfileManager; import java.io.IOException; import java.util.Locale; -import static org.microg.gms.common.HttpFormClient.RequestContent; -import static org.microg.gms.common.HttpFormClient.RequestHeader; - public class AuthRequest extends HttpFormClient.Request { private static final String SERVICE_URL = "https://android.googleapis.com/auth"; private static final String USER_AGENT = "GoogleAuth/1.4 (%s %s); gzip"; diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java index f94eacef..f7c034c2 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java @@ -16,12 +16,12 @@ package org.microg.gms.auth; +import static org.microg.gms.common.HttpFormClient.ResponseField; + import android.util.Log; import java.lang.reflect.Field; -import static org.microg.gms.common.HttpFormClient.ResponseField; - public class AuthResponse { private static final String TAG = "GmsAuthResponse"; 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 e30a196c..3da0b892 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 @@ -16,12 +16,29 @@ package org.microg.gms.auth.login; +import static android.accounts.AccountManager.PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE; +import static android.accounts.AccountManager.VISIBILITY_USER_MANAGED_VISIBLE; +import static android.os.Build.VERSION.SDK_INT; +import static android.os.Build.VERSION_CODES.GINGERBREAD_MR1; +import static android.os.Build.VERSION_CODES.HONEYCOMB; +import static android.os.Build.VERSION_CODES.LOLLIPOP; +import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN; +import static android.view.KeyEvent.KEYCODE_BACK; +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.auth.AuthPrefs.isAuthVisible; +import static org.microg.gms.checkin.CheckinPrefs.hideLauncherIcon; +import static org.microg.gms.checkin.CheckinPrefs.isSpoofingEnabled; +import static org.microg.gms.checkin.CheckinPrefs.setSpoofingEnabled; +import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; +import static org.microg.gms.common.Constants.GMS_VERSION_CODE; + import android.accounts.Account; import android.accounts.AccountManager; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.content.Context; -import android.content.Intent; import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; @@ -43,7 +60,6 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.StringRes; -import androidx.preference.PreferenceManager; import com.mgoogle.android.gms.R; @@ -52,7 +68,6 @@ import org.microg.gms.auth.AuthConstants; import org.microg.gms.auth.AuthManager; import org.microg.gms.auth.AuthRequest; import org.microg.gms.auth.AuthResponse; -import org.microg.gms.checkin.CheckinClient; import org.microg.gms.checkin.CheckinManager; import org.microg.gms.checkin.LastCheckinInfo; import org.microg.gms.common.HttpFormClient; @@ -63,24 +78,6 @@ import org.microg.gms.ui.UtilsKt; import java.io.IOException; import java.util.Locale; -import static android.accounts.AccountManager.PACKAGE_NAME_KEY_LEGACY_NOT_VISIBLE; -import static android.accounts.AccountManager.VISIBILITY_USER_MANAGED_VISIBLE; -import static android.os.Build.VERSION.SDK_INT; -import static android.os.Build.VERSION_CODES.GINGERBREAD_MR1; -import static android.os.Build.VERSION_CODES.HONEYCOMB; -import static android.os.Build.VERSION_CODES.LOLLIPOP; -import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN; -import static android.view.KeyEvent.KEYCODE_BACK; -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.auth.AuthPrefs.isAuthVisible; -import static org.microg.gms.checkin.CheckinPrefs.hideLauncherIcon; -import static org.microg.gms.checkin.CheckinPrefs.isSpoofingEnabled; -import static org.microg.gms.checkin.CheckinPrefs.setSpoofingEnabled; -import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; -import static org.microg.gms.common.Constants.GMS_VERSION_CODE; - public class LoginActivity extends AssistantActivity { public static final String TMPL_NEW_ACCOUNT = "new_account"; public static final String EXTRA_TMPL = "tmpl"; 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 b2072a0c..2bce17af 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 @@ -16,6 +16,16 @@ package org.microg.gms.auth.loginservice; +import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE; +import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; +import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; +import static android.accounts.AccountManager.KEY_ANDROID_PACKAGE_NAME; +import static android.accounts.AccountManager.KEY_AUTHTOKEN; +import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT; +import static android.accounts.AccountManager.KEY_CALLER_PID; +import static android.accounts.AccountManager.KEY_CALLER_UID; +import static android.accounts.AccountManager.KEY_INTENT; + import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; import android.accounts.AccountAuthenticatorResponse; @@ -24,7 +34,6 @@ import android.accounts.NetworkErrorException; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.util.Base64; import android.util.Log; import org.microg.gms.auth.AuthConstants; @@ -36,16 +45,6 @@ import org.microg.gms.common.PackageUtils; import java.util.Arrays; import java.util.List; -import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE; -import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; -import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; -import static android.accounts.AccountManager.KEY_ANDROID_PACKAGE_NAME; -import static android.accounts.AccountManager.KEY_AUTHTOKEN; -import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT; -import static android.accounts.AccountManager.KEY_CALLER_PID; -import static android.accounts.AccountManager.KEY_CALLER_UID; -import static android.accounts.AccountManager.KEY_INTENT; - class AccountAuthenticator extends AbstractAccountAuthenticator { private static final String TAG = "GmsAuthenticator"; private final Context context; diff --git a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java index 086c0612..30d6541c 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java @@ -16,12 +16,12 @@ package org.microg.gms.auth.loginservice; +import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT; + import android.app.Service; import android.content.Intent; import android.os.IBinder; -import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT; - public class GoogleLoginService extends Service { private AccountAuthenticator authenticator; diff --git a/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java b/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java index 8dffb214..d6972005 100644 --- a/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java @@ -16,9 +16,6 @@ package org.microg.gms.cast; -import java.io.IOException; -import java.util.ArrayList; - import android.content.Context; import android.os.Bundle; import android.os.RemoteException; @@ -35,15 +32,18 @@ import com.google.android.gms.cast.internal.ICastDeviceControllerListener; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.internal.BinderWrapper; +import java.io.IOException; +import java.util.ArrayList; + import su.litvak.chromecast.api.v2.Application; import su.litvak.chromecast.api.v2.ChromeCast; -import su.litvak.chromecast.api.v2.Namespace; -import su.litvak.chromecast.api.v2.ChromeCastConnectionEventListener; -import su.litvak.chromecast.api.v2.ChromeCastSpontaneousEventListener; -import su.litvak.chromecast.api.v2.ChromeCastRawMessageListener; import su.litvak.chromecast.api.v2.ChromeCastConnectionEvent; -import su.litvak.chromecast.api.v2.ChromeCastSpontaneousEvent; +import su.litvak.chromecast.api.v2.ChromeCastConnectionEventListener; import su.litvak.chromecast.api.v2.ChromeCastRawMessage; +import su.litvak.chromecast.api.v2.ChromeCastRawMessageListener; +import su.litvak.chromecast.api.v2.ChromeCastSpontaneousEvent; +import su.litvak.chromecast.api.v2.ChromeCastSpontaneousEventListener; +import su.litvak.chromecast.api.v2.Namespace; public class CastDeviceControllerImpl extends ICastDeviceController.Stub implements ChromeCastConnectionEventListener, 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 af7f407d..9252bb19 100755 --- 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 @@ -16,6 +16,8 @@ package org.microg.gms.checkin; +import static org.microg.gms.checkin.CheckinPrefs.isSpoofingEnabled; + import android.accounts.Account; import android.accounts.AccountManager; import android.content.ContentResolver; @@ -32,8 +34,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.microg.gms.checkin.CheckinPrefs.isSpoofingEnabled; - public class CheckinManager { private static final String TAG = "GmsCheckinManager"; private static final long MIN_CHECKIN_INTERVAL = 3 * 60 * 60 * 1000; // 3 hours 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 52b94f0e..cc5707e0 100755 --- 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 @@ -32,12 +32,12 @@ import android.util.Log; import androidx.legacy.content.WakefulBroadcastReceiver; -import com.mgoogle.android.gms.R; import com.google.android.gms.checkin.internal.ICheckinService; +import com.mgoogle.android.gms.R; import org.microg.gms.auth.AuthConstants; -import org.microg.gms.common.ForegroundServiceInfo; import org.microg.gms.common.ForegroundServiceContext; +import org.microg.gms.common.ForegroundServiceInfo; import org.microg.gms.gcm.McsService; import org.microg.gms.people.PeopleManager; diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java index 5a51c6ed..4b6551bd 100755 --- a/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java @@ -16,6 +16,12 @@ package org.microg.gms.checkin; +import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; +import static android.os.Build.VERSION.SDK_INT; +import static org.microg.gms.checkin.CheckinService.EXTRA_FORCE_CHECKIN; +import static org.microg.gms.checkin.CheckinService.REGULAR_CHECKIN_INTERVAL; + import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -28,12 +34,6 @@ import androidx.legacy.content.WakefulBroadcastReceiver; import org.microg.gms.common.ForegroundServiceContext; -import static android.app.PendingIntent.FLAG_UPDATE_CURRENT; -import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; -import static android.os.Build.VERSION.SDK_INT; -import static org.microg.gms.checkin.CheckinService.EXTRA_FORCE_CHECKIN; -import static org.microg.gms.checkin.CheckinService.REGULAR_CHECKIN_INTERVAL; - public class TriggerReceiver extends WakefulBroadcastReceiver { private static final String TAG = "GmsCheckinTrigger"; diff --git a/play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java b/play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java index c14514d1..7d80c3b8 100644 --- a/play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java +++ b/play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java @@ -16,6 +16,10 @@ package org.microg.gms.common; +import static android.os.Build.VERSION.SDK_INT; +import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; +import static org.microg.gms.common.Constants.GMS_PACKAGE_SIGNATURE_SHA1; + import android.app.ActivityManager; import android.app.Application; import android.app.PendingIntent; @@ -36,10 +40,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static android.os.Build.VERSION.SDK_INT; -import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME; -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; diff --git a/play-services-core/src/main/java/org/microg/gms/common/Utils.java b/play-services-core/src/main/java/org/microg/gms/common/Utils.java index 44d87815..1aa984a2 100644 --- a/play-services-core/src/main/java/org/microg/gms/common/Utils.java +++ b/play-services-core/src/main/java/org/microg/gms/common/Utils.java @@ -16,6 +16,8 @@ package org.microg.gms.common; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + import android.content.Context; import android.util.Log; @@ -24,8 +26,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Locale; -import static android.content.pm.PackageManager.PERMISSION_GRANTED; - public class Utils { public static Locale getLocale(Context context) { diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java index 2e7f2b36..b6dfbb19 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java @@ -16,6 +16,17 @@ package org.microg.gms.gcm; +import static org.microg.gms.gcm.McsConstants.MCS_CLOSE_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_DATA_MESSAGE_STANZA_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_ACK_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_PING_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_IQ_STANZA_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_REQUEST_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_RESPONSE_TAG; +import static org.microg.gms.gcm.McsConstants.MSG_INPUT; +import static org.microg.gms.gcm.McsConstants.MSG_INPUT_ERROR; +import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; + import android.os.Handler; import android.util.Log; @@ -33,17 +44,6 @@ import java.io.Closeable; import java.io.IOException; import java.io.InputStream; -import static org.microg.gms.gcm.McsConstants.MCS_CLOSE_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_DATA_MESSAGE_STANZA_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_ACK_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_PING_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_IQ_STANZA_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_REQUEST_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_RESPONSE_TAG; -import static org.microg.gms.gcm.McsConstants.MSG_INPUT; -import static org.microg.gms.gcm.McsConstants.MSG_INPUT_ERROR; -import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; - public class McsInputStream extends Thread implements Closeable { private static final String TAG = "GmsGcmMcsInput"; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java index 5448adef..8af597d9 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java @@ -16,6 +16,13 @@ package org.microg.gms.gcm; +import static org.microg.gms.gcm.McsConstants.MCS_VERSION_CODE; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_DONE; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_ERROR; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_READY; +import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; + import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -26,13 +33,6 @@ import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; -import static org.microg.gms.gcm.McsConstants.MCS_VERSION_CODE; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_DONE; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_ERROR; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_READY; -import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; - public class McsOutputStream extends Thread implements Handler.Callback, Closeable { private static final String TAG = "GmsGcmMcsOutput"; 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 58151bf7..60db3145 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 @@ -16,6 +16,44 @@ package org.microg.gms.gcm; +import static android.app.AlarmManager.ELAPSED_REALTIME_WAKEUP; +import static android.os.Build.VERSION.SDK_INT; +import static org.microg.gms.common.PackageUtils.warnIfNotPersistentProcess; +import static org.microg.gms.gcm.GcmConstants.ACTION_C2DM_RECEIVE; +import static org.microg.gms.gcm.GcmConstants.EXTRA_APP; +import static org.microg.gms.gcm.GcmConstants.EXTRA_APP_OVERRIDE; +import static org.microg.gms.gcm.GcmConstants.EXTRA_COLLAPSE_KEY; +import static org.microg.gms.gcm.GcmConstants.EXTRA_FROM; +import static org.microg.gms.gcm.GcmConstants.EXTRA_MESSAGE_ID; +import static org.microg.gms.gcm.GcmConstants.EXTRA_MESSENGER; +import static org.microg.gms.gcm.GcmConstants.EXTRA_REGISTRATION_ID; +import static org.microg.gms.gcm.GcmConstants.EXTRA_SEND_FROM; +import static org.microg.gms.gcm.GcmConstants.EXTRA_SEND_TO; +import static org.microg.gms.gcm.GcmConstants.EXTRA_TTL; +import static org.microg.gms.gcm.McsConstants.ACTION_ACK; +import static org.microg.gms.gcm.McsConstants.ACTION_CONNECT; +import static org.microg.gms.gcm.McsConstants.ACTION_HEARTBEAT; +import static org.microg.gms.gcm.McsConstants.ACTION_RECONNECT; +import static org.microg.gms.gcm.McsConstants.ACTION_SEND; +import static org.microg.gms.gcm.McsConstants.EXTRA_REASON; +import static org.microg.gms.gcm.McsConstants.MCS_CLOSE_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_DATA_MESSAGE_STANZA_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_ACK_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_PING_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_IQ_STANZA_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_REQUEST_TAG; +import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_RESPONSE_TAG; +import static org.microg.gms.gcm.McsConstants.MSG_ACK; +import static org.microg.gms.gcm.McsConstants.MSG_CONNECT; +import static org.microg.gms.gcm.McsConstants.MSG_HEARTBEAT; +import static org.microg.gms.gcm.McsConstants.MSG_INPUT; +import static org.microg.gms.gcm.McsConstants.MSG_INPUT_ERROR; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_DONE; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_ERROR; +import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_READY; +import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; + import android.app.AlarmManager; import android.app.PendingIntent; import android.app.Service; @@ -73,44 +111,6 @@ import javax.net.ssl.SSLContext; import okio.ByteString; -import static android.app.AlarmManager.ELAPSED_REALTIME_WAKEUP; -import static android.os.Build.VERSION.SDK_INT; -import static org.microg.gms.common.PackageUtils.warnIfNotPersistentProcess; -import static org.microg.gms.gcm.GcmConstants.ACTION_C2DM_RECEIVE; -import static org.microg.gms.gcm.GcmConstants.EXTRA_APP; -import static org.microg.gms.gcm.GcmConstants.EXTRA_APP_OVERRIDE; -import static org.microg.gms.gcm.GcmConstants.EXTRA_COLLAPSE_KEY; -import static org.microg.gms.gcm.GcmConstants.EXTRA_FROM; -import static org.microg.gms.gcm.GcmConstants.EXTRA_MESSAGE_ID; -import static org.microg.gms.gcm.GcmConstants.EXTRA_MESSENGER; -import static org.microg.gms.gcm.GcmConstants.EXTRA_REGISTRATION_ID; -import static org.microg.gms.gcm.GcmConstants.EXTRA_SEND_FROM; -import static org.microg.gms.gcm.GcmConstants.EXTRA_SEND_TO; -import static org.microg.gms.gcm.GcmConstants.EXTRA_TTL; -import static org.microg.gms.gcm.McsConstants.ACTION_ACK; -import static org.microg.gms.gcm.McsConstants.ACTION_CONNECT; -import static org.microg.gms.gcm.McsConstants.ACTION_HEARTBEAT; -import static org.microg.gms.gcm.McsConstants.ACTION_RECONNECT; -import static org.microg.gms.gcm.McsConstants.ACTION_SEND; -import static org.microg.gms.gcm.McsConstants.EXTRA_REASON; -import static org.microg.gms.gcm.McsConstants.MCS_CLOSE_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_DATA_MESSAGE_STANZA_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_ACK_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_HEARTBEAT_PING_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_IQ_STANZA_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_REQUEST_TAG; -import static org.microg.gms.gcm.McsConstants.MCS_LOGIN_RESPONSE_TAG; -import static org.microg.gms.gcm.McsConstants.MSG_ACK; -import static org.microg.gms.gcm.McsConstants.MSG_CONNECT; -import static org.microg.gms.gcm.McsConstants.MSG_HEARTBEAT; -import static org.microg.gms.gcm.McsConstants.MSG_INPUT; -import static org.microg.gms.gcm.McsConstants.MSG_INPUT_ERROR; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_DONE; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_ERROR; -import static org.microg.gms.gcm.McsConstants.MSG_OUTPUT_READY; -import static org.microg.gms.gcm.McsConstants.MSG_TEARDOWN; - @ForegroundServiceInfo(value = "Cloud messaging", res = R.string.service_name_mcs) public class McsService extends Service implements Handler.Callback { private static final String TAG = "GmsGcmMcsSvc"; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterManager.java b/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterManager.java index 56f0e7da..1dcfec44 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterManager.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterManager.java @@ -16,6 +16,12 @@ package org.microg.gms.gcm; +import static org.microg.gms.gcm.GcmConstants.ERROR_SERVICE_NOT_AVAILABLE; +import static org.microg.gms.gcm.GcmConstants.EXTRA_ERROR; +import static org.microg.gms.gcm.GcmConstants.EXTRA_REGISTRATION_ID; +import static org.microg.gms.gcm.GcmConstants.EXTRA_RETRY_AFTER; +import static org.microg.gms.gcm.GcmConstants.EXTRA_UNREGISTERED; + import android.content.Context; import android.os.Bundle; import android.util.Log; @@ -23,16 +29,9 @@ import android.util.Log; import org.microg.gms.checkin.LastCheckinInfo; import org.microg.gms.common.HttpFormClient; import org.microg.gms.common.PackageUtils; -import org.microg.gms.common.Utils; import java.io.IOException; -import static org.microg.gms.gcm.GcmConstants.ERROR_SERVICE_NOT_AVAILABLE; -import static org.microg.gms.gcm.GcmConstants.EXTRA_ERROR; -import static org.microg.gms.gcm.GcmConstants.EXTRA_REGISTRATION_ID; -import static org.microg.gms.gcm.GcmConstants.EXTRA_RETRY_AFTER; -import static org.microg.gms.gcm.GcmConstants.EXTRA_UNREGISTERED; - public class PushRegisterManager { private static final String TAG = "GmsGcmRegisterMgr"; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java index 79c29c2c..67d86666 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java @@ -16,8 +16,11 @@ package org.microg.gms.gcm; -import android.content.Context; +import static org.microg.gms.common.HttpFormClient.RequestContent; +import static org.microg.gms.common.HttpFormClient.RequestContentDynamic; +import static org.microg.gms.common.HttpFormClient.RequestHeader; +import android.content.Context; import android.os.Bundle; import android.text.TextUtils; @@ -30,10 +33,6 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; -import static org.microg.gms.common.HttpFormClient.RequestContent; -import static org.microg.gms.common.HttpFormClient.RequestContentDynamic; -import static org.microg.gms.common.HttpFormClient.RequestHeader; - public class RegisterRequest extends HttpFormClient.Request { private static final String SERVICE_URL = "https://android.clients.google.com/c2dm/register3"; private static final String USER_AGENT = "Android-GCM/1.5 (%s %s)"; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java index 6d35560c..3bc5eba6 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java @@ -16,11 +16,11 @@ package org.microg.gms.gcm; +import static org.microg.gms.common.HttpFormClient.ResponseField; + import org.microg.gms.common.HttpFormClient.ResponseHeader; import org.microg.gms.common.HttpFormClient.ResponseStatusText; -import static org.microg.gms.common.HttpFormClient.ResponseField; - public class RegisterResponse { @ResponseField("token") public String token; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java b/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java index b2d1067a..2a6ac115 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java @@ -16,6 +16,8 @@ package org.microg.gms.gcm; +import static org.microg.gms.gcm.McsConstants.ACTION_SEND; + import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -23,8 +25,6 @@ import android.util.Log; import androidx.legacy.content.WakefulBroadcastReceiver; -import static org.microg.gms.gcm.McsConstants.ACTION_SEND; - public class SendReceiver extends WakefulBroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java b/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java index c3a79d58..245d5c2a 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java @@ -16,6 +16,12 @@ package org.microg.gms.gcm; +import static android.os.Build.VERSION.SDK_INT; +import static android.os.Build.VERSION_CODES.N; +import static org.microg.gms.gcm.McsConstants.ACTION_CONNECT; +import static org.microg.gms.gcm.McsConstants.ACTION_HEARTBEAT; +import static org.microg.gms.gcm.McsConstants.EXTRA_REASON; + import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -29,12 +35,6 @@ import org.microg.gms.checkin.CheckinPrefs; import org.microg.gms.checkin.LastCheckinInfo; import org.microg.gms.common.ForegroundServiceContext; -import static android.os.Build.VERSION.SDK_INT; -import static android.os.Build.VERSION_CODES.N; -import static org.microg.gms.gcm.McsConstants.ACTION_CONNECT; -import static org.microg.gms.gcm.McsConstants.ACTION_HEARTBEAT; -import static org.microg.gms.gcm.McsConstants.EXTRA_REASON; - public class TriggerReceiver extends WakefulBroadcastReceiver { private static final String TAG = "GmsGcmTrigger"; public static final String FORCE_TRY_RECONNECT = "org.microg.gms.gcm.FORCE_TRY_RECONNECT"; diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/UnregisterReceiver.java b/play-services-core/src/main/java/org/microg/gms/gcm/UnregisterReceiver.java index ebc3cf72..28a72d10 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/UnregisterReceiver.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/UnregisterReceiver.java @@ -1,5 +1,11 @@ package org.microg.gms.gcm; +import static android.content.Intent.ACTION_PACKAGE_DATA_CLEARED; +import static android.content.Intent.ACTION_PACKAGE_FULLY_REMOVED; +import static android.content.Intent.ACTION_PACKAGE_REMOVED; +import static android.content.Intent.EXTRA_DATA_REMOVED; +import static android.content.Intent.EXTRA_REPLACING; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -7,12 +13,6 @@ import android.util.Log; import java.util.List; -import static android.content.Intent.ACTION_PACKAGE_REMOVED; -import static android.content.Intent.ACTION_PACKAGE_DATA_CLEARED; -import static android.content.Intent.ACTION_PACKAGE_FULLY_REMOVED; -import static android.content.Intent.EXTRA_DATA_REMOVED; -import static android.content.Intent.EXTRA_REPLACING; - public class UnregisterReceiver extends BroadcastReceiver { private static final String TAG = "GmsGcmUnregisterRcvr"; 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 2382814d..d1bc56ed 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 @@ -18,16 +18,12 @@ package org.microg.gms.gservices; import android.content.ContentProvider; import android.content.ContentValues; -import android.content.Intent; import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; import android.os.Build; import android.util.Log; -import org.microg.gms.checkin.CheckinPrefs; -import org.microg.gms.gcm.GcmPrefs; - import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java index 4d11fb0d..f90831a4 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java +++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java @@ -16,6 +16,12 @@ package org.microg.gms.location; +import static android.Manifest.permission.ACCESS_COARSE_LOCATION; +import static android.Manifest.permission.ACCESS_FINE_LOCATION; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; +import static android.location.LocationManager.GPS_PROVIDER; +import static com.google.android.gms.location.LocationRequest.PRIORITY_HIGH_ACCURACY; + import android.Manifest; import android.app.PendingIntent; import android.content.Context; @@ -27,6 +33,8 @@ import android.os.Looper; import android.os.RemoteException; import android.util.Log; +import androidx.lifecycle.Lifecycle; + import com.google.android.gms.common.api.Status; import com.google.android.gms.location.ILocationListener; import com.google.android.gms.location.LocationRequest; @@ -40,15 +48,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import static android.Manifest.permission.ACCESS_COARSE_LOCATION; -import static android.Manifest.permission.ACCESS_FINE_LOCATION; -import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static android.location.LocationManager.GPS_PROVIDER; -import static com.google.android.gms.location.LocationRequest.PRIORITY_HIGH_ACCURACY; -import static com.google.android.gms.location.LocationRequest.PRIORITY_NO_POWER; - -import androidx.lifecycle.Lifecycle; - public class GoogleLocationManager implements LocationChangeListener { private static final String TAG = "LocationManager"; private static final String MOCK_PROVIDER = "mock"; diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java index 1c8d951f..b66e6978 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java +++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java @@ -17,9 +17,7 @@ package org.microg.gms.location; import android.os.RemoteException; -import android.util.Log; -import com.google.android.gms.common.Feature; import com.google.android.gms.common.internal.GetServiceRequest; import com.google.android.gms.common.internal.IGmsCallbacks; diff --git a/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java b/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java index 6fdae8d6..8b4da91c 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java +++ b/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java @@ -16,6 +16,9 @@ package org.microg.gms.location; +import static android.Manifest.permission.ACCESS_COARSE_LOCATION; +import static android.Manifest.permission.ACCESS_FINE_LOCATION; + import android.annotation.TargetApi; import android.app.AppOpsManager; import android.app.PendingIntent; @@ -37,9 +40,6 @@ import com.google.android.gms.location.internal.LocationRequestUpdateData; import java.util.Arrays; import java.util.UUID; -import static android.Manifest.permission.ACCESS_COARSE_LOCATION; -import static android.Manifest.permission.ACCESS_FINE_LOCATION; - public class LocationRequestHelper { public static final String TAG = "GmsLocRequestHelper"; private final Context context; diff --git a/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java b/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java index bdeb7318..b8d90223 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java +++ b/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java @@ -16,11 +16,11 @@ package org.microg.gms.location; +import static org.microg.gms.location.LocationConstants.KEY_MOCK_LOCATION; + import android.location.Location; import android.os.Bundle; -import static org.microg.gms.location.LocationConstants.KEY_MOCK_LOCATION; - public class MockLocationProvider { private boolean mockEnabled = false; private Location mockLocation = null; diff --git a/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java index 62996728..833b264c 100644 --- a/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java @@ -20,9 +20,9 @@ import android.os.Parcel; import android.os.RemoteException; import android.util.Log; +import com.google.android.gms.clearcut.internal.PlayLoggerContext; import com.google.android.gms.playlog.internal.IPlayLogService; import com.google.android.gms.playlog.internal.LogEvent; -import com.google.android.gms.clearcut.internal.PlayLoggerContext; import java.util.List; 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 0804d384..f0901aec 100755 --- 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,6 +16,11 @@ package org.microg.gms.ui; +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; + import android.accounts.Account; import android.accounts.AccountManager; import android.os.Build; @@ -31,11 +36,6 @@ import org.microg.gms.auth.AuthConstants; 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 diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsDashboardActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsDashboardActivity.java index ed2fb218..0375f317 100755 --- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsDashboardActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsDashboardActivity.java @@ -20,7 +20,6 @@ import androidx.fragment.app.Fragment; import com.mgoogle.android.gms.R; -//import org.microg.nlp.Preferences; import org.microg.tools.ui.AbstractDashboardActivity; public class SettingsDashboardActivity extends AbstractDashboardActivity { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/appcert/AppCertManager.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/appcert/AppCertManager.kt index 2c09bfde..fa66a147 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/auth/appcert/AppCertManager.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/auth/appcert/AppCertManager.kt @@ -17,7 +17,6 @@ import com.android.volley.VolleyError import com.android.volley.toolbox.Volley import com.mgoogle.android.gms.BuildConfig import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.runBlocking import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import okio.ByteString.Companion.of diff --git a/play-services-core/src/main/kotlin/org/microg/gms/chimera/ServiceProvider.kt b/play-services-core/src/main/kotlin/org/microg/gms/chimera/ServiceProvider.kt index 24dfa1c0..5633c560 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/chimera/ServiceProvider.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/chimera/ServiceProvider.kt @@ -7,7 +7,6 @@ package org.microg.gms.chimera import android.content.ContentProvider import android.content.ContentValues -import android.content.Context import android.content.Intent import android.database.Cursor import android.database.MatrixCursor @@ -17,7 +16,6 @@ import android.util.Log import androidx.core.os.bundleOf import org.microg.gms.DummyService import org.microg.gms.common.GmsService -import org.microg.gms.common.RemoteListenerProxy class ServiceProvider : ContentProvider() { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/clearcut/ClearcutLoggerService.kt b/play-services-core/src/main/kotlin/org/microg/gms/clearcut/ClearcutLoggerService.kt index afe0dc7f..1e0d9b82 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/clearcut/ClearcutLoggerService.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/clearcut/ClearcutLoggerService.kt @@ -5,7 +5,6 @@ package org.microg.gms.clearcut import android.os.Parcel -import android.os.RemoteException import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope diff --git a/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt b/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt index 9494e39c..aadb7473 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/gcm/GcmPrefs.kt @@ -2,7 +2,8 @@ package org.microg.gms.gcm import android.content.Context import android.content.Intent -import android.net.* +import android.net.ConnectivityManager +import android.net.NetworkInfo import android.util.Log import org.microg.gms.gcm.TriggerReceiver.FORCE_TRY_RECONNECT import org.microg.mgms.settings.SettingsContract diff --git a/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt b/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt index 29922173..d3e519bd 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt @@ -6,7 +6,6 @@ package org.microg.gms.gcm -import android.app.Activity import android.app.PendingIntent import android.content.Context import android.content.Intent @@ -22,7 +21,6 @@ import org.microg.gms.checkin.CheckinService import org.microg.gms.checkin.LastCheckinInfo import org.microg.gms.common.ForegroundServiceContext import org.microg.gms.common.PackageUtils -import org.microg.gms.common.Utils import org.microg.gms.gcm.GcmConstants.* import java.util.concurrent.atomic.AtomicBoolean import kotlin.coroutines.resume diff --git a/play-services-core/src/main/kotlin/org/microg/gms/profile/Build.kt b/play-services-core/src/main/kotlin/org/microg/gms/profile/Build.kt index c13a4d5a..ffaeda10 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/profile/Build.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/profile/Build.kt @@ -6,9 +6,6 @@ package org.microg.gms.profile import android.annotation.TargetApi -import android.content.Context -import android.os.Build -import kotlin.random.Random object Build { @JvmField diff --git a/play-services-core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt b/play-services-core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt index 5a815a04..c8f5c87e 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/profile/ProfileManager.kt @@ -9,9 +9,9 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.XmlResourceParser import android.util.Log +import org.microg.gms.utils.FileXmlResourceParser import org.microg.mgms.settings.SettingsContract import org.microg.mgms.settings.SettingsContract.Profile -import org.microg.gms.utils.FileXmlResourceParser import org.xmlpull.v1.XmlPullParser import java.io.File import java.util.* diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt index 50bc9012..3e8c01a0 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/PushNotificationAdvancedFragment.kt @@ -9,9 +9,10 @@ import androidx.lifecycle.lifecycleScope import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import androidx.preference.TwoStatePreference import com.mgoogle.android.gms.R -import org.microg.gms.gcm.* +import org.microg.gms.gcm.GcmPrefs +import org.microg.gms.gcm.getGcmServiceInfo +import org.microg.gms.gcm.setGcmServiceConfiguration class PushNotificationAdvancedFragment : PreferenceFragmentCompat() { private lateinit var networkMobile: ListPreference diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt index 317e83e1..8b0debff 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt @@ -9,16 +9,12 @@ import android.content.ComponentName import android.content.Context import android.content.pm.PackageManager import android.os.Bundle -import androidx.lifecycle.lifecycleScope -import androidx.navigation.fragment.findNavController import androidx.preference.Preference import androidx.preference.SwitchPreferenceCompat import com.google.android.gms.cast.media.CastMediaRouteProviderService import com.mgoogle.android.gms.R -import org.microg.gms.checkin.CheckinClient import org.microg.gms.checkin.CheckinPrefs import org.microg.gms.gcm.GcmDatabase -import org.microg.gms.gcm.McsService import org.microg.gms.gcm.getGcmServiceInfo import org.microg.mgms.settings.SettingsContract import org.microg.tools.ui.ResourceSettingsFragment diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt index 4bb9123a..4415512c 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt @@ -7,7 +7,6 @@ package org.microg.gms.ui import android.content.Context import android.util.AttributeSet -import android.util.TypedValue import android.view.Gravity import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.widget.LinearLayout diff --git a/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt b/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt index a41dc07b..404aa443 100644 --- a/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt +++ b/play-services-core/src/main/kotlin/org/microg/mgms/settings/SettingsProvider.kt @@ -17,10 +17,10 @@ import android.net.Uri import android.preference.PreferenceManager import org.microg.gms.common.PackageUtils.warnIfNotMainProcess import org.microg.gms.gcm.GcmPrefs -import org.microg.mgms.settings.SettingsContract.Profile import org.microg.mgms.settings.SettingsContract.Auth import org.microg.mgms.settings.SettingsContract.CheckIn import org.microg.mgms.settings.SettingsContract.Gcm +import org.microg.mgms.settings.SettingsContract.Profile import org.microg.mgms.settings.SettingsContract.getAuthority import java.io.File diff --git a/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml b/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml index 5d62e2e4..9f1500dc 100644 --- a/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml +++ b/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml @@ -1,4 +1,4 @@ - diff --git a/play-services-core/src/main/res/layout/push_notification_fragment.xml b/play-services-core/src/main/res/layout/push_notification_fragment.xml index 4cf48176..fdd799bd 100755 --- a/play-services-core/src/main/res/layout/push_notification_fragment.xml +++ b/play-services-core/src/main/res/layout/push_notification_fragment.xml @@ -5,8 +5,7 @@ --> + xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/play-services-core/src/main/res/xml/preferences_push_notifications.xml b/play-services-core/src/main/res/xml/preferences_push_notifications.xml index 3e1201fc..20862ae7 100755 --- a/play-services-core/src/main/res/xml/preferences_push_notifications.xml +++ b/play-services-core/src/main/res/xml/preferences_push_notifications.xml @@ -5,7 +5,6 @@ --> - + diff --git a/play-services-iid-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java b/play-services-iid-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java index 05bf4c8c..0e51092f 100644 --- a/play-services-iid-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java +++ b/play-services-iid-api/src/main/java/com/google/android/gms/iid/MessengerCompat.java @@ -16,6 +16,9 @@ package com.google.android.gms.iid; +import static android.os.Build.VERSION.SDK_INT; +import static android.os.Build.VERSION_CODES.LOLLIPOP; + import android.os.Binder; import android.os.Handler; import android.os.IBinder; @@ -25,9 +28,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.RemoteException; -import static android.os.Build.VERSION.SDK_INT; -import static android.os.Build.VERSION_CODES.LOLLIPOP; - public class MessengerCompat implements Parcelable { private Messenger messenger; private IMessengerCompat messengerCompat; diff --git a/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java index f77a392e..1b187f87 100644 --- a/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java +++ b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java @@ -7,7 +7,6 @@ package com.google.android.gms.location; import org.microg.gms.common.PublicApi; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; import java.util.ArrayList; import java.util.Collection; diff --git a/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java index ee2e09a6..2bcbfa14 100644 --- a/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java +++ b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java @@ -19,7 +19,6 @@ package com.google.android.gms.location.internal; import com.google.android.gms.location.LocationRequest; import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; import java.util.List; diff --git a/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java index 47ec9568..bc8b00ce 100644 --- a/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java +++ b/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java @@ -22,7 +22,6 @@ import android.location.Location; import android.os.Looper; import com.google.android.gms.common.api.GoogleApiClient; -import com.google.android.gms.common.api.PendingResult; import org.microg.gms.common.ForwardConnectionCallbacks; import org.microg.gms.common.ForwardConnectionFailedListener; diff --git a/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java b/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java index 1d22bd14..6c9461b4 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java +++ b/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiClientBuilder.java @@ -21,9 +21,9 @@ import android.os.Looper; import com.google.android.gms.common.api.Api.ApiOptions.NoOptions; +import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ApiClientBuilder; import org.microg.gms.common.api.ApiClientSettings; -import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ConnectionCallbacks; import org.microg.gms.common.api.OnConnectionFailedListener; diff --git a/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiImpl.java b/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiImpl.java index 5c09eefd..7635c826 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiImpl.java +++ b/play-services-location/src/main/java/org/microg/gms/location/ActivityRecognitionApiImpl.java @@ -18,7 +18,6 @@ package org.microg.gms.location; import android.app.PendingIntent; import android.os.RemoteException; -import android.util.Log; import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.common.api.PendingResult; diff --git a/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java index 504bcc46..1984419d 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java +++ b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiClientBuilder.java @@ -21,9 +21,9 @@ import android.os.Looper; import com.google.android.gms.common.api.Api.ApiOptions.NoOptions; +import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ApiClientBuilder; import org.microg.gms.common.api.ApiClientSettings; -import org.microg.gms.common.api.ApiClient; import org.microg.gms.common.api.ConnectionCallbacks; import org.microg.gms.common.api.OnConnectionFailedListener; diff --git a/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java index 78e0cd50..8db830c6 100644 --- a/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java +++ b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java @@ -16,6 +16,9 @@ package org.microg.gms.location; +import static android.location.LocationManager.KEY_LOCATION_CHANGED; +import static android.location.LocationManager.KEY_PROXIMITY_ENTERING; + import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -45,9 +48,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static android.location.LocationManager.KEY_LOCATION_CHANGED; -import static android.location.LocationManager.KEY_PROXIMITY_ENTERING; - @SuppressWarnings("MissingPermission") public class NativeLocationClientImpl { private final static String TAG = "GmsToNativeLocClient"; diff --git a/play-services-tasks/src/main/java/org/microg/gms/tasks/TaskImpl.java b/play-services-tasks/src/main/java/org/microg/gms/tasks/TaskImpl.java index ae5c42f1..3e52c24e 100644 --- a/play-services-tasks/src/main/java/org/microg/gms/tasks/TaskImpl.java +++ b/play-services-tasks/src/main/java/org/microg/gms/tasks/TaskImpl.java @@ -5,6 +5,8 @@ package org.microg.gms.tasks; +import static com.google.android.gms.tasks.TaskExecutors.MAIN_THREAD; + import android.app.Activity; import com.google.android.gms.tasks.Continuation; @@ -22,8 +24,6 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; -import static com.google.android.gms.tasks.TaskExecutors.MAIN_THREAD; - public class TaskImpl extends Task { private final Object lock = new Object(); private boolean completed;