More refactoring

Author: opstic

play-services-constellation/core/src/main/kotlin/org/microg/gms/constellation/core/AuthManager.kt

@@ -13,8 +13,11 @@ import java.security.Signature
 import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 
-class AuthManager(context: Context) {
+val Context.authManager: AuthManager get() = AuthManager.get(this)
+
+class AuthManager private constructor(context: Context) {
     private val context = context.applicationContext
+    private val sharedPrefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
 
     companion object {
         private const val PREFS_NAME = "constellation_prefs"
@@ -24,22 +27,14 @@ class AuthManager(context: Context) {
         @Volatile
         private var instance: AuthManager? = null
 
-        fun get(context: Context): AuthManager {
-            val existing = instance
-            if (existing != null) return existing
-
-            return synchronized(this) {
-                instance ?: AuthManager(context).also { instance = it }
-            }
+        fun get(context: Context): AuthManager = instance ?: synchronized(this) {
+            instance ?: AuthManager(context).also { instance = it }
         }
     }
 
-    private val sharedPrefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-
     // GMS signing format: {iidToken}:{seconds}:{nanos}
     fun signIidToken(iidToken: String): Pair<ByteArray, Instant> {
-        val now = System.currentTimeMillis()
-        val timestamp = Instant.ofEpochMilli(now)
+        val timestamp = Instant.ofEpochMilli(System.currentTimeMillis())
         val content = "$iidToken:${timestamp.epochSecond}:${timestamp.nano}"
         return sign(content) to timestamp
     }
@@ -61,10 +56,20 @@ class AuthManager(context: Context) {
             try {
                 val kf = KeyFactory.getInstance("EC")
                 val privateKey = kf.generatePrivate(
-                    PKCS8EncodedKeySpec(Base64.decode(privateKeyStr, Base64.DEFAULT))
+                    PKCS8EncodedKeySpec(
+                        Base64.decode(
+                            privateKeyStr,
+                            Base64.DEFAULT
+                        )
+                    )
                 )
                 val publicKey = kf.generatePublic(
-                    X509EncodedKeySpec(Base64.decode(publicKeyStr, Base64.DEFAULT))
+                    X509EncodedKeySpec(
+                        Base64.decode(
+                            publicKeyStr,
+                            Base64.DEFAULT
+                        )
+                    )
                 )
                 return KeyPair(publicKey, privateKey)
             } catch (_: Exception) {
@@ -96,7 +101,5 @@ class AuthManager(context: Context) {
         }
     }
 
-    fun getFid(): String {
-        return InstanceID.getInstance(context).id
-    }
-}
+    fun getFid(): String = InstanceID.getInstance(context).id
+}

play-services-constellation/core/src/main/kotlin/org/microg/gms/constellation/core/RpcClient.kt

@@ -1,47 +1,33 @@
 package org.microg.gms.constellation.core
 
 import com.squareup.wire.GrpcClient
-import okhttp3.Interceptor
 import okhttp3.OkHttpClient
-import okhttp3.Response
 import org.microg.gms.common.Constants
 import org.microg.gms.constellation.core.proto.PhoneDeviceVerificationClient
 import org.microg.gms.constellation.core.proto.PhoneNumberClient
 
-private class AuthInterceptor : Interceptor {
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val originalRequest = chain.request()
-
-        val builder = originalRequest.newBuilder()
-            .header("X-Goog-Api-Key", "AIzaSyAP-gfH3qvi6vgHZbSYwQ_XHqV_mXHhzIk")
-            .header("X-Android-Package", Constants.GMS_PACKAGE_NAME)
-            .header("X-Android-Cert", Constants.GMS_PACKAGE_SIGNATURE_SHA1.uppercase())
-
-        return chain.proceed(builder.build())
-    }
-}
-
 object RpcClient {
-    private val client: OkHttpClient by lazy {
-        OkHttpClient.Builder()
-            .addInterceptor(AuthInterceptor())
-            .build()
-    }
-
-    private val grpcClient: GrpcClient by lazy {
-        GrpcClient.Builder()
-            .client(client)
-            // Google's constellationserver does NOT like compressed requests
-            .minMessageToCompress(Long.MAX_VALUE)
-            .baseUrl("https://phonedeviceverification-pa.googleapis.com/")
-            .build()
-    }
-
-    val phoneDeviceVerificationClient: PhoneDeviceVerificationClient by lazy {
+    private val client: OkHttpClient = OkHttpClient.Builder()
+        .addInterceptor { chain ->
+            val originalRequest = chain.request()
+            val builder = originalRequest.newBuilder()
+                .header("X-Goog-Api-Key", "AIzaSyAP-gfH3qvi6vgHZbSYwQ_XHqV_mXHhzIk")
+                .header("X-Android-Package", Constants.GMS_PACKAGE_NAME)
+                .header("X-Android-Cert", Constants.GMS_PACKAGE_SIGNATURE_SHA1.uppercase())
+            chain.proceed(builder.build())
+        }
+        .build()
+
+    private val grpcClient: GrpcClient = GrpcClient.Builder()
+        .client(client)
+        // Google's constellationserver does NOT like compressed requests
+        .minMessageToCompress(Long.MAX_VALUE)
+        .baseUrl("https://phonedeviceverification-pa.googleapis.com/")
+        .build()
+
+    val phoneDeviceVerificationClient: PhoneDeviceVerificationClient =
         grpcClient.create(PhoneDeviceVerificationClient::class)
-    }
 
-    val phoneNumberClient: PhoneNumberClient by lazy {
+    val phoneNumberClient: PhoneNumberClient =
         grpcClient.create(PhoneNumberClient::class)
-    }
 }