From b94a88753431863cfd32f788ff3ff623fb56d1aa Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Mon, 21 Dec 2020 20:25:48 -0600
Subject: [PATCH] Remove redundant logError method

---
 .../org/isoron/uhabits/HabitsApplicationComponent.java |  2 ++
 .../org/isoron/uhabits/activities/sync/SyncActivity.kt | 10 +++-------
 .../uhabits/core/ui/screens/sync/SyncBehavior.kt       |  8 ++++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
index 72776a23e..52d499d1c 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
@@ -67,6 +67,8 @@ public interface HabitsApplicationComponent
 
     IntentParser getIntentParser();
 
+    Logging getLogging();
+
     MidnightTimer getMidnightTimer();
 
     ModelFactory getModelFactory();
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
index 2cdf20fe4..d8b5a4c24 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
@@ -47,14 +47,14 @@ class SyncActivity : BaseActivity(), SyncBehavior.Screen {
     private val scope = CoroutineScope(Dispatchers.Main)
     private var styledResources = StyledResources(this)
 
-    override fun onCreate(state: Bundle?) {
-        super.onCreate(state)
+    override fun onCreate(savedInstance: Bundle?) {
+        super.onCreate(savedInstance)
 
         val component = (application as HabitsApplication).component
         val preferences = component.preferences
         val server = RemoteSyncServer(preferences = preferences)
         baseScreen = BaseScreen(this)
-        behavior = SyncBehavior(this, preferences, server)
+        behavior = SyncBehavior(this, preferences, server, component.logging)
 
         binding = ActivitySyncBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -125,8 +125,4 @@ class SyncActivity : BaseActivity(), SyncBehavior.Screen {
         binding.syncLink.text = link
         showQR(link)
     }
-
-    override fun logError(msg: String) {
-        Log.e("SyncActivity", msg)
-    }
 }
\ No newline at end of file
diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt
index 13783c057..0be1b6079 100644
--- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt
+++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt
@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.sync
 
+import org.isoron.uhabits.core.io.*
 import org.isoron.uhabits.core.preferences.*
 import org.isoron.uhabits.core.sync.*
 
@@ -26,7 +27,10 @@ class SyncBehavior(
         val screen: Screen,
         val preferences: Preferences,
         val server: AbstractSyncServer,
+        val logging: Logging,
 ) {
+    val logger = logging.getLogger("SyncBehavior")
+
     suspend fun onResume() {
         if (preferences.syncKey.isBlank()) {
             register()
@@ -47,7 +51,8 @@ class SyncBehavior(
             preferences.enableSync(syncKey, encKey.base64)
             displayCurrentKey()
         } catch (e: Exception) {
-            screen.logError("Unexpected exception $e")
+            logger.error("Unexpected exception")
+            logger.error(e)
             screen.showErrorScreen()
         }
     }
@@ -56,6 +61,5 @@ class SyncBehavior(
         suspend fun showLoadingScreen()
         suspend fun showErrorScreen()
         suspend fun showLink(link: String)
-        fun logError(msg: String)
     }
 }
\ No newline at end of file