Skip to content
Snippets Groups Projects
Commit b4016e86 authored by Sebastian's avatar Sebastian
Browse files

Replace remaining printlns with proper logging

parent 3c449c8f
No related branches found
No related tags found
1 merge request!80Replace remaining printlns with proper logging
Pipeline #8939 passed
package org.briarproject.briar.desktop.contact.add.remote package org.briarproject.briar.desktop.contact.add.remote
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import mu.KotlinLogging
import org.briarproject.bramble.api.FormatException import org.briarproject.bramble.api.FormatException
import org.briarproject.bramble.api.contact.ContactManager import org.briarproject.bramble.api.contact.ContactManager
import org.briarproject.bramble.api.contact.HandshakeLinkConstants import org.briarproject.bramble.api.contact.HandshakeLinkConstants
...@@ -25,6 +26,10 @@ constructor( ...@@ -25,6 +26,10 @@ constructor(
private val contactManager: ContactManager, private val contactManager: ContactManager,
) : DbViewModel(briarExecutors, lifecycleManager, db) { ) : DbViewModel(briarExecutors, lifecycleManager, db) {
companion object {
private val LOG = KotlinLogging.logger {}
}
override fun onInit() { override fun onInit() {
super.onInit() super.onInit()
fetchHandshakeLink() fetchHandshakeLink()
...@@ -59,15 +64,18 @@ constructor( ...@@ -59,15 +64,18 @@ constructor(
private fun addPendingContact(link: String, alias: String) { private fun addPendingContact(link: String, alias: String) {
if (_handshakeLink.value == link) { if (_handshakeLink.value == link) {
println("Please enter contact's link, not your own") LOG.warn { "Please enter contact's link, not your own" }
// TODO: show warning to user
return return
} }
if (remoteHandshakeLinkIsInvalid(link)) { if (remoteHandshakeLinkIsInvalid(link)) {
println("Remote handshake link is invalid") LOG.warn { "Remote handshake link is invalid" }
// TODO: show message to user
return return
} }
if (aliasIsInvalid(alias)) { if (aliasIsInvalid(alias)) {
println("Alias is invalid") LOG.warn { "Alias is invalid" }
// TODO: show message to user
return return
} }
...@@ -75,11 +83,11 @@ constructor( ...@@ -75,11 +83,11 @@ constructor(
try { try {
contactManager.addPendingContact(txn, link, alias) contactManager.addPendingContact(txn, link, alias)
} catch (e: FormatException) { } catch (e: FormatException) {
println("Link is invalid") LOG.warn(e) { "Link is invalid" }
println(e.stackTrace) // TODO: show error to user
} catch (e: GeneralSecurityException) { } catch (e: GeneralSecurityException) {
println("Public key is invalid") LOG.warn(e) { "Public key is invalid" }
println(e.stackTrace) // TODO: show error to user
} }
/* /*
TODO: Warn user that the following two errors might be an attack TODO: Warn user that the following two errors might be an attack
...@@ -89,11 +97,11 @@ constructor( ...@@ -89,11 +97,11 @@ constructor(
*/ */
catch (e: ContactExistsException) { catch (e: ContactExistsException) {
println("Contact already exists") LOG.warn(e) { "Contact already exists" }
println(e.stackTrace) // TODO: show error to user
} catch (e: PendingContactExistsException) { } catch (e: PendingContactExistsException) {
println("Pending Contact already exists") LOG.warn(e) { "Pending Contact already exists" }
println(e.stackTrace) // TODO: show error to user
} }
} }
} }
......
...@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable ...@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.ApplicationScope import androidx.compose.ui.window.ApplicationScope
import androidx.compose.ui.window.application import androidx.compose.ui.window.application
import mu.KotlinLogging
import org.briarproject.bramble.BrambleCoreEagerSingletons import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
...@@ -11,7 +12,6 @@ import org.briarproject.briar.BriarCoreEagerSingletons ...@@ -11,7 +12,6 @@ import org.briarproject.briar.BriarCoreEagerSingletons
import org.briarproject.briar.desktop.TestUtils.getDataDir import org.briarproject.briar.desktop.TestUtils.getDataDir
import org.briarproject.briar.desktop.utils.LogUtils import org.briarproject.briar.desktop.utils.LogUtils
import java.util.logging.Level.ALL import java.util.logging.Level.ALL
import java.util.logging.Logger
internal class RunWithMultipleTemporaryAccounts( internal class RunWithMultipleTemporaryAccounts(
private val names: List<String>, private val names: List<String>,
...@@ -19,7 +19,7 @@ internal class RunWithMultipleTemporaryAccounts( ...@@ -19,7 +19,7 @@ internal class RunWithMultipleTemporaryAccounts(
) { ) {
companion object { companion object {
private val LOG = Logger.getLogger(RunWithMultipleTemporaryAccounts::class.java.name) private val LOG = KotlinLogging.logger {}
} }
private val apps = mutableListOf<BriarDesktopTestApp>() private val apps = mutableListOf<BriarDesktopTestApp>()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment