isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant logError method

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-21 20:25:48 -06:00
parent f6699fbfda
commit b94a887534
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplicationComponent.java
View File

@@ -67,6 +67,8 @@ public interface HabitsApplicationComponent
IntentParser getIntentParser();
Logging getLogging();
MidnightTimer getMidnightTimer();
ModelFactory getModelFactory();

10
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt
View File

@@ -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)
}
}

8
android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/sync/SyncBehavior.kt
View File

@@ -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)
}
}