Convert main library module to kt

app/src/main/java/com/instacart/library/sample/SampleActivity.kt

@@ -15,14 +15,14 @@ class SampleActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_sample)
-        refreshBtn.isEnabled = TrueTime.isInitialized()
+        refreshBtn.isEnabled = TrueTime.isInitialized
         refreshBtn.setOnClickListener {
             updateTime()
         }
     }
 
     private fun updateTime() {
-        if (!TrueTime.isInitialized()) {
+        if (!TrueTime.isInitialized) {
             Toast.makeText(this, "Sorry TrueTime not yet initialized. Trying again.", Toast.LENGTH_SHORT)
                 .show()
             return

library-extension-rx/src/main/java/com/instacart/library/truetime/TrueTimeRx.kt

@@ -3,25 +3,19 @@ package com.instacart.library.truetime
 import android.content.Context
 import io.reactivex.BackpressureStrategy
 import io.reactivex.Flowable
-import io.reactivex.FlowableEmitter
 import io.reactivex.FlowableOnSubscribe
 import io.reactivex.FlowableTransformer
 import io.reactivex.Single
-import io.reactivex.annotations.NonNull
-import io.reactivex.functions.Consumer
 import io.reactivex.functions.Function
-import io.reactivex.functions.Predicate
 import io.reactivex.schedulers.Schedulers
 import java.io.IOException
 import java.net.InetAddress
 import java.net.UnknownHostException
 import java.util.Arrays
 import java.util.Collections
-import java.util.Comparator
 import java.util.Date
-import org.reactivestreams.Publisher
 
-@Suppress("MemberVisibilityCanBePrivate")
+@Suppress("MemberVisibilityCanBePrivate", "unused")
 class TrueTimeRx : TrueTime() {
 
     companion object {
@@ -34,7 +28,7 @@ class TrueTimeRx : TrueTime() {
         }
 
         fun isInitialized(): Boolean {
-            return TrueTime.isInitialized()
+            return TrueTime.isInitialized
         }
 
         fun build(): TrueTimeRx {
@@ -58,18 +52,18 @@ class TrueTimeRx : TrueTime() {
         return this
     }
 
-    override fun withConnectionTimeout(timeout: Int): TrueTimeRx {
-        super.withConnectionTimeout(timeout)
+    override fun withConnectionTimeout(timeoutInMillis: Int): TrueTimeRx {
+        super.withConnectionTimeout(timeoutInMillis)
         return this
     }
 
-    override fun withRootDelayMax(rootDelay: Float): TrueTimeRx {
-        super.withRootDelayMax(rootDelay)
+    override fun withRootDelayMax(rootDelayMax: Float): TrueTimeRx {
+        super.withRootDelayMax(rootDelayMax)
         return this
     }
 
-    override fun withRootDispersionMax(rootDispersion: Float): TrueTimeRx {
-        super.withRootDispersionMax(rootDispersion)
+    override fun withRootDispersionMax(rootDispersionMax: Float): TrueTimeRx {
+        super.withRootDispersionMax(rootDispersionMax)
         return this
     }
 
@@ -95,7 +89,7 @@ class TrueTimeRx : TrueTime() {
      * @return accurate NTP Date
      */
     fun initializeRx(ntpPoolAddress: String): Single<Date> {
-        return if (TrueTime.isInitialized())
+        return if (TrueTime.isInitialized)
             Single.just(TrueTime.now())
         else
             initializeNtp(ntpPoolAddress).map { TrueTime.now() }

library/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
@@ -27,7 +28,7 @@ android {
 }
 
 dependencies {
-
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 group='com.github.instacart'

library/src/main/java/com/instacart/library/truetime/BootCompletedBroadcastReceiver.kt

@@ -0,0 +1,20 @@
+package com.instacart.library.truetime
+
+import android.content.BroadcastReceiver
+import android.content.ContentValues.TAG
+import android.content.Context
+import android.content.Intent
+
+class BootCompletedBroadcastReceiver : BroadcastReceiver() {
+
+    companion object {
+        private val TAG = BootCompletedBroadcastReceiver::class.java.simpleName
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        TrueLog.i(TAG, "---- clearing TrueTime disk cache as we've detected a boot")
+        if (Intent.ACTION_BOOT_COMPLETED == intent.action) {
+            TrueTime.clearCachedInfo()
+        }
+    }
+}

library/src/main/java/com/instacart/library/truetime/CacheInterface.kt

@@ -0,0 +1,16 @@
+package com.instacart.library.truetime
+
+interface CacheInterface {
+
+    companion object {
+        const val KEY_CACHED_BOOT_TIME = "com.instacart.library.truetime.cached_boot_time"
+        const val KEY_CACHED_DEVICE_UPTIME = "com.instacart.library.truetime.cached_device_uptime"
+        const val KEY_CACHED_SNTP_TIME = "com.instacart.library.truetime.cached_sntp_time"
+    }
+
+    fun put(key: String, value: Long)
+
+    fun get(key: String, defaultValue: Long): Long
+
+    fun clear()
+}

library/src/main/java/com/instacart/library/truetime/DiskCacheClient.kt

@@ -0,0 +1,85 @@
+package com.instacart.library.truetime
+
+import android.os.SystemClock
+
+internal class DiskCacheClient {
+
+    companion object {
+        private val TAG = DiskCacheClient::class.java.simpleName
+    }
+
+    private var _cacheInterface: CacheInterface? = null
+
+    // has boot time changed (simple check)
+    fun isTrueTimeCachedFromAPreviousBoot(): Boolean {
+        if (cacheUnavailable()) {
+            return false
+        }
+
+        val cachedBootTime = _cacheInterface?.get(CacheInterface.KEY_CACHED_BOOT_TIME, 0L) ?: 0L
+        if (cachedBootTime == 0L) {
+            return false
+        }
+        val bootTimeChanged = SystemClock.elapsedRealtime() < getCachedDeviceUptime()
+        TrueLog.i(TAG, "---- boot time changed $bootTimeChanged")
+        return !bootTimeChanged
+    }
+
+    fun getCachedDeviceUptime(): Long = if (cacheUnavailable()) {
+        0L
+    } else _cacheInterface?.get(CacheInterface.KEY_CACHED_DEVICE_UPTIME, 0L) ?: 0L
+
+    fun getCachedSntpTime(): Long = if (cacheUnavailable()) {
+        0L
+    } else _cacheInterface?.get(CacheInterface.KEY_CACHED_SNTP_TIME, 0L) ?: 0L
+
+    /**
+     * Provide your own cache interface to cache the true time information.
+     * @param cacheInterface the customized cache interface to save the true time data.
+     */
+    fun enableCacheInterface(cacheInterface: CacheInterface) {
+        this._cacheInterface = cacheInterface
+    }
+
+    /**
+     * Clear the cache cache when the device is rebooted.
+     * @param cacheInterface the customized cache interface to save the true time data.
+     */
+    @JvmOverloads fun clearCachedInfo(cacheInterface: CacheInterface? = this._cacheInterface) {
+        cacheInterface?.clear()
+    }
+
+    fun cacheTrueTimeInfo(sntpClient: SntpClient) {
+        if (cacheUnavailable()) {
+            return
+        }
+
+        val cachedSntpTime = sntpClient.cachedSntpTime
+        val cachedDeviceUptime = sntpClient.cachedDeviceUptime
+        val bootTime = cachedSntpTime - cachedDeviceUptime
+
+        TrueLog.d(
+            TAG,
+            String.format(
+                "Caching true time info to disk sntp [%s] device [%s] boot [%s]",
+                cachedSntpTime,
+                cachedDeviceUptime,
+                bootTime
+            )
+        )
+
+        _cacheInterface?.put(CacheInterface.KEY_CACHED_BOOT_TIME, bootTime)
+        _cacheInterface?.put(CacheInterface.KEY_CACHED_DEVICE_UPTIME, cachedDeviceUptime)
+        _cacheInterface?.put(CacheInterface.KEY_CACHED_SNTP_TIME, cachedSntpTime)
+    }
+
+    // -----------------------------------------------------------------------------------
+
+    private fun cacheUnavailable(): Boolean {
+        if (_cacheInterface == null) {
+            TrueLog.w(TAG, "Cannot use disk caching strategy for TrueTime. CacheInterface unavailable")
+            return true
+        }
+        return false
+    }
+}