Commit 8877e665 authored by Michael Droettboom's avatar Michael Droettboom
Browse files

Use a single sharedPreferences object

parent 96f55389

components/service/glean/src/main/java/mozilla/components/service/glean/Glean.kt

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ open class GleanInternalAPI internal constructor () { 


        pingStorageEngine.clearPendingPings()

        storageEngineManager.clearAllStores()

        pingMaker.resetPingSequenceNumbers()

        pingMaker.resetPingMakerStorage()



        // This does not clear the experiments store (which isn't managed by the

        // StorageEngineManager), since doing so would mean we would have to have the

components/service/glean/src/main/java/mozilla/components/service/glean/ping/PingMaker.kt

+7 −13
Original line number Diff line number Diff line
@@ -23,18 +23,12 @@ internal class PingMaker( 
) {

    private val logger = Logger("glean/PingMaker")

    private val objectStartTime = getISOTimeString()

    internal val sharedPreferencesSeq: SharedPreferences? by lazy {

    internal val sharedPreferences: SharedPreferences? by lazy {

        applicationContext.getSharedPreferences(

            this.javaClass.canonicalName,

            Context.MODE_PRIVATE

        )

    }

    val sharedPreferencesStartTimes: SharedPreferences? by lazy {

        applicationContext.getSharedPreferences(

            "{this.javaClass.canonicalName}StartTimes",

            Context.MODE_PRIVATE

        )

    }



    /**

     * Get the ping sequence number for a given ping. This is a
@@ -45,7 +39,7 @@ internal class PingMaker( 
     * @return sequence number

     */

    internal fun getPingSeq(pingName: String): Int {

        sharedPreferencesSeq?.let {

        sharedPreferences?.let {

            val key = "${pingName}_seq"

            val currentValue = it.getInt(key, 0)

            val editor = it.edit()
@@ -61,10 +55,10 @@ internal class PingMaker( 
    }



    /**

     * Reset all ping sequence numbers.

     * Reset all ping sequence numbers and start times.

     */

    internal fun resetPingSequenceNumbers() {

        sharedPreferencesSeq?.let {

    internal fun resetPingMakerStorage() {

        sharedPreferences?.let {

            it.edit().clear().apply()

        }

    }
@@ -77,7 +71,7 @@ internal class PingMaker( 
     * @return start time

     */

    internal fun getPingStartTime(pingName: String): String {

        sharedPreferencesStartTimes?.let {

        sharedPreferences?.let {

            val key = "${pingName}_start_time"

            val currentValue = it.getString(key, objectStartTime)!!

            return currentValue
@@ -96,7 +90,7 @@ internal class PingMaker( 
     * @param startTime The start time to set for the ping

     */

    internal fun setPingStartTime(pingName: String, startTime: String) {

        sharedPreferencesStartTimes?.let {

        sharedPreferences?.let {

            val key = "${pingName}_start_time"

            val editor = it.edit()

            editor.putString(key, startTime)

components/service/glean/src/test/java/mozilla/components/service/glean/ping/PingMakerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ class PingMakerTest { 


        // Clear the sharedPreferences on the PingMaker so we can test that the

        // numbers start at zero.

        maker.sharedPreferencesSeq?.let {

        maker.sharedPreferences?.let {

            val editor = it.edit()

            editor.clear()

            editor.apply()