Merge pull request #522 from matomo-org/SimplifyCode

Simplify code
matomo-org · Jul 11, 2024 · aed4990 · aed4990
2 parents fd12a56 + a5ad6e4
commit aed4990
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/exampleapp/src/main/java/org/matomo/demo/DemoApp.kt b/exampleapp/src/main/java/org/matomo/demo/DemoApp.kt
@@ -6,8 +6,6 @@
  */
 package org.matomo.demo
 
-import android.os.StrictMode
-import android.os.StrictMode.ThreadPolicy
 import info.hannes.timber.DebugFormatTree
 import org.matomo.sdk.TrackMe
 import org.matomo.sdk.TrackerBuilder
@@ -46,10 +44,10 @@ class DemoApp : MatomoApplication() {
         // Alternative:
         // i.e. "http://org.matomo.demo:1/com.android.vending"
         // getTracker().download();
-        val mDimensionQueue = DimensionQueue(tracker)
+        val dimensionQueue = DimensionQueue(tracker)
 
         // This will be send the next time something is tracked.
-        mDimensionQueue.add(0, "test")
+        dimensionQueue.add(0, "test")
         tracker.addTrackingCallback { trackMe: TrackMe? ->
             Timber.i("Tracker.Callback.onTrack(%s)", trackMe)
             trackMe

diff --git a/tracker/src/main/java/org/matomo/sdk/Matomo.kt b/tracker/src/main/java/org/matomo/sdk/Matomo.kt
@@ -18,30 +18,25 @@ import org.matomo.sdk.tools.PropertySource
 import timber.log.Timber
 
 class Matomo private constructor(context: Context) {
-    private val mPreferenceMap: MutableMap<Tracker, SharedPreferences?> = HashMap()
-    val context: Context
+    private val preferenceMap: MutableMap<Tracker, SharedPreferences?> = HashMap()
+    val context: Context = context.applicationContext
 
     /**
      * Base preferences, tracker independent.
      */
-    val preferences: SharedPreferences
+    val preferences: SharedPreferences = context.getSharedPreferences(BASE_PREFERENCE_FILE, Context.MODE_PRIVATE)
 
     /**
      * If you want to use your own [org.matomo.sdk.dispatcher.Dispatcher]
      */
     var dispatcherFactory: DispatcherFactory = DefaultDispatcherFactory()
 
-    init {
-        this.context = context.applicationContext
-        preferences = context.getSharedPreferences(BASE_PREFERENCE_FILE, Context.MODE_PRIVATE)
-    }
-
     /**
      * @return Tracker specific settings object
      */
     fun getTrackerPreferences(tracker: Tracker): SharedPreferences? {
-        synchronized(mPreferenceMap) {
-            var newPrefs = mPreferenceMap[tracker]
+        synchronized(preferenceMap) {
+            var newPrefs = preferenceMap[tracker]
             if (newPrefs == null) {
                 val prefName: String = try {
                     "org.matomo.sdk_" + Checksum.getMD5Checksum(tracker.name)
@@ -50,7 +45,7 @@ class Matomo private constructor(context: Context) {
                     "org.matomo.sdk_" + tracker.name
                 }
                 newPrefs = context.getSharedPreferences(prefName, Context.MODE_PRIVATE)
-                mPreferenceMap[tracker] = newPrefs
+                preferenceMap[tracker] = newPrefs
             }
             return newPrefs
         }