From a238f8c1cb761c8d7f5df23e44a45f9964767c6e Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 7 Apr 2021 13:09:42 +0200
Subject: [PATCH] fix code issues

---
 Habitica/build.gradle                                |  2 +-
 .../android/habitica/modules/DeveloperModule.kt      |  2 +-
 .../android/habitica/ReleaseDeveloperModule.kt       |  8 +++-----
 .../android/habitica/proxy/AnalyticsManagerImpl.kt   | 12 +++++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index fbb8b7c6e..75a03ceff 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -149,7 +149,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2895
+        versionCode 2903
         versionName "3.2.2"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt
index e99f77539..550f23972 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/DeveloperModule.kt
@@ -12,7 +12,7 @@ import javax.inject.Singleton
 open class DeveloperModule {
     @Provides
     @Singleton
-    protected fun provideAnalyticsManager(context: Context?): AnalyticsManager {
+    open fun provideAnalyticsManager(context: Context): AnalyticsManager {
         return EmptyAnalyticsManager()
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt b/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt
index 12fb4ba6f..404cf2161 100644
--- a/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt
+++ b/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt
@@ -5,10 +5,8 @@ import com.habitrpg.android.habitica.proxy.AnalyticsManagerImpl
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import android.content.Context
 
-//change debug proxy here by override methods
-class ReleaseDeveloperModule : DeveloperModule() {
-    @Override
-    protected fun provideAnalyticsManager(context: Context?): AnalyticsManager {
-        return AnalyticsManagerImpl()
+class ReleaseDeveloperModule: DeveloperModule() {
+    override fun provideAnalyticsManager(context: Context): AnalyticsManager {
+        return AnalyticsManagerImpl(context)
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt b/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt
index af4d2b789..f8226c708 100644
--- a/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt
+++ b/Habitica/src/release/java/com/habitrpg/android/habitica/proxy/AnalyticsManagerImpl.kt
@@ -5,16 +5,18 @@ import com.google.firebase.crashlytics.internal.common.CrashlyticsCore
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import android.content.Context
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.amplitude.api.Amplitude
+import android.os.Bundle
 
-class AnalyticsManagerImpl: AnalyticsManager {
+class AnalyticsManagerImpl(context: Context): AnalyticsManager {
 
     private val firebaseAnalytics: com.google.firebase.analytics.FirebaseAnalytics
 
-    init(context: Context) {
-        firebaseAnalytics = FirebaseAnalytics.getInstance(this)
+    init {
+        firebaseAnalytics = FirebaseAnalytics.getInstance(context)
     }
 
-    override fun logException(t: Throwabl?) {
+    override fun logException(t: Throwable) {
         FirebaseCrashlytics.getInstance().recordException(t)
     }
 
@@ -27,7 +29,7 @@ class AnalyticsManagerImpl: AnalyticsManager {
         FirebaseCrashlytics.getInstance().log(msg)
     }
 
-    fun logEvent(eventName: String, data: Bundle) {
+    override fun logEvent(eventName: String, data: Bundle) {
         firebaseAnalytics.logEvent(eventName, data)
     }
 }
\ No newline at end of file