Convert BraintreeSharedPreferences to Kotlin (#1384)

* Convert BraintreeSharedPreferences to Kotlin

* Clean up single line return functions

Author: tdchow

BraintreeCore/src/main/java/com/braintreepayments/api/core/ConfigurationCache.kt

@@ -23,13 +23,13 @@ internal class ConfigurationCache(
         return null
     }
 
-    fun saveConfiguration(configuration: Configuration, cacheKey: String?) {
+    fun saveConfiguration(configuration: Configuration, cacheKey: String) {
         saveConfiguration(configuration, cacheKey, System.currentTimeMillis())
     }
 
     fun saveConfiguration(
         configuration: Configuration,
-        cacheKey: String?,
+        cacheKey: String,
         currentTimeMillis: Long
     ) {
         val timestampKey = "${cacheKey}_timestamp"

BraintreeCore/src/main/java/com/braintreepayments/api/core/UUIDHelper.kt

@@ -14,7 +14,7 @@ class UUIDHelper {
     val formattedUUID: String
         get() = UUID.randomUUID().toString().replace("-", "")
 
-    fun getInstallationGUID(context: Context?): String {
+    fun getInstallationGUID(context: Context): String {
         return getInstallationGUID(BraintreeSharedPreferences.getInstance(context))
     }
 

DataCollector/src/main/java/com/braintreepayments/api/datacollector/DataCollector.kt

@@ -35,7 +35,7 @@ class DataCollector @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) constructor(
      * @suppress
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    fun getPayPalInstallationGUID(context: Context?): String {
+    fun getPayPalInstallationGUID(context: Context): String {
         return uuidHelper.getInstallationGUID(context)
     }
 
@@ -45,7 +45,7 @@ class DataCollector @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) constructor(
     @MainThread
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     fun getClientMetadataId(
-        context: Context?,
+        context: Context,
         configuration: Configuration?,
         hasUserLocationConsent: Boolean
     ): String {

SharedUtils/src/main/java/com/braintreepayments/api/sharedutils/BraintreeSharedPreferences.java

@@ -0,0 +1,63 @@
+package com.braintreepayments.api.sharedutils
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.annotation.RestrictTo
+
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class BraintreeSharedPreferences(
+    private val sharedPreferences: SharedPreferences
+) {
+
+    companion object {
+        private const val PREFERENCES_FILE_KEY = "com.braintreepayments.api.SHARED_PREFERENCES"
+
+        @Volatile
+        private var INSTANCE: BraintreeSharedPreferences? = null
+
+        @JvmStatic
+        fun getInstance(context: Context): BraintreeSharedPreferences {
+            return INSTANCE ?: synchronized(this) {
+                INSTANCE ?: BraintreeSharedPreferences(createSharedPreferencesInstance(context))
+                    .also { INSTANCE = it }
+            }
+        }
+
+        private fun createSharedPreferencesInstance(context: Context): SharedPreferences {
+            return context.getSharedPreferences(PREFERENCES_FILE_KEY, Context.MODE_PRIVATE)
+        }
+    }
+
+    fun getString(key: String, fallback: String?): String? = sharedPreferences.getString(key, fallback)
+
+    fun putString(key: String, value: String) {
+        sharedPreferences.edit().putString(key, value).apply()
+    }
+
+    fun getBoolean(key: String): Boolean = sharedPreferences.getBoolean(key, false)
+
+    fun putBoolean(key: String, value: Boolean) {
+        sharedPreferences.edit().putBoolean(key, value).apply()
+    }
+
+    fun containsKey(key: String): Boolean = sharedPreferences.contains(key)
+
+    fun getLong(key: String): Long = sharedPreferences.getLong(key, 0)
+
+    fun putStringAndLong(
+        stringKey: String,
+        stringValue: String,
+        longKey: String,
+        longValue: Long
+    ) {
+        sharedPreferences
+            .edit()
+            .putString(stringKey, stringValue)
+            .putLong(longKey, longValue)
+            .apply()
+    }
+
+    fun clearSharedPreferences() {
+        sharedPreferences.edit().clear().apply()
+    }
+}

SharedUtils/src/main/java/com/braintreepayments/api/sharedutils/BraintreeSharedPreferences.kt

@@ -35,8 +35,4 @@ public static void overrideConfigurationCache(Context context, Authorization aut
                 .putStringAndLong(cacheKey, configuration.toJson(), timestampKey,
                         System.currentTimeMillis());
     }
-
-    public static void clearConfigurationCacheOverride(Context context) {
-        BraintreeSharedPreferences.getInstance(context).clearSharedPreferences();
-    }
 }

TestUtils/src/main/java/com/braintreepayments/api/testutils/SharedPreferencesHelper.java

@@ -4,7 +4,7 @@ import android.content.Context
 import com.braintreepayments.api.sharedutils.BraintreeSharedPreferences
 
 internal class VenmoSharedPrefsWriter {
-    fun persistVenmoVaultOption(context: Context?, shouldVault: Boolean) {
+    fun persistVenmoVaultOption(context: Context, shouldVault: Boolean) {
         persistVenmoVaultOption(BraintreeSharedPreferences.getInstance(context), shouldVault)
     }
 
@@ -15,7 +15,7 @@ internal class VenmoSharedPrefsWriter {
         braintreeSharedPreferences.putBoolean(VAULT_VENMO_KEY, shouldVault)
     }
 
-    fun getVenmoVaultOption(context: Context?): Boolean {
+    fun getVenmoVaultOption(context: Context): Boolean {
         return getVenmoVaultOption(BraintreeSharedPreferences.getInstance(context))
     }