Clean up even more

.idea/runConfigurations/Briar_Desktop.xml

 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Briar Desktop" type="JetRunConfigurationType">
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.briar.compose.MainKt" />
+    <option name="MAIN_CLASS_NAME" value="org.briarproject.briar.desktop.MainKt" />
     <module name="briar-desktop.main" />
+    <option name="PROGRAM_PARAMETERS" value="--debug" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

build.gradle.kts

@@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.30"
+    kotlin("jvm") version "1.5.10"
     kotlin("kapt") version "1.3.72"
-    id("org.jetbrains.compose") version "0.3.1"
+    id("org.jetbrains.compose") version "0.4.0"
     id("java")
     id("idea")
 }
@@ -20,13 +20,18 @@ repositories {
 }
 
 dependencies {
-    testImplementation(kotlin("test-testng"))
     implementation(compose.desktop.currentOs)
+
     implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
+    implementation("com.github.ajalt:clikt:2.2.0")
+
     implementation(project(path = ":briar:briar-core", configuration = "default"))
     implementation(project(path = ":briar:bramble-java", configuration = "default"))
+
     val daggerVersion = "2.24"
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
+
+    testImplementation(kotlin("test-testng"))
 }
 
 tasks.test {

src/main/kotlin/org/briarproject/briar/compose/main.kt

-package org.briarproject.briar.compose
-
-import org.briarproject.bramble.BrambleCoreEagerSingletons
-import org.briarproject.briar.BriarCoreEagerSingletons
-import java.io.File
-import java.io.File.separator
-import java.io.IOException
-import java.lang.System.getProperty
-import java.nio.file.Files.setPosixFilePermissions
-import java.nio.file.attribute.PosixFilePermission
-import java.util.logging.Level
-import java.util.logging.LogManager
-
-fun main() {
-    LogManager.getLogManager().getLogger("").level = Level.INFO
-
-    val dataDir = getDataDir()
-    val app =
-        DaggerBriarSwingApp.builder().swingModule(
-            SwingModule(
-                dataDir
-            )
-        ).build()
-    // We need to load the eager singletons directly after making the
-    // dependency graphs
-    BrambleCoreEagerSingletons.Helper.injectEagerSingletons(app)
-    BriarCoreEagerSingletons.Helper.injectEagerSingletons(app)
-
-    app.getUI().startBriar()
-    app.getUI().startUI()
-}
-
-private fun getDataDir(): File {
-    val file = File(getProperty("user.home") + separator + ".briar")
-    if (!file.exists() && !file.mkdirs()) {
-        throw IOException("Could not create directory: ${file.absolutePath}")
-    } else if (!file.isDirectory) {
-        throw IOException("Data dir is not a directory: ${file.absolutePath}")
-    }
-    val perms = HashSet<PosixFilePermission>()
-    perms.add(PosixFilePermission.OWNER_READ)
-    perms.add(PosixFilePermission.OWNER_WRITE)
-    perms.add(PosixFilePermission.OWNER_EXECUTE)
-    setPosixFilePermissions(file.toPath(), perms)
-    return file
-}
\ No newline at end of file

src/main/kotlin/org/briarproject/briar/compose/BriarSwingApp.kt → src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt

-package org.briarproject.briar.compose
+package org.briarproject.briar.desktop
 
 import dagger.Component
 import org.briarproject.bramble.BrambleCoreEagerSingletons
@@ -12,11 +12,11 @@ import javax.inject.Singleton
     modules = [
         BrambleCoreModule::class,
         BriarCoreModule::class,
-        SwingModule::class
+        DesktopModule::class
     ]
 )
 @Singleton
-internal interface BriarSwingApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
+internal interface BriarDesktopApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
 
     fun getUI(): UI
 

src/main/kotlin/org/briarproject/briar/compose/BriarService.kt → src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt

-package org.briarproject.briar.compose
+package org.briarproject.briar.desktop
 
 import org.briarproject.bramble.api.account.AccountManager
-import org.briarproject.bramble.api.crypto.DecryptionException
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
 import org.briarproject.bramble.api.lifecycle.LifecycleManager
+import org.briarproject.briar.desktop.dialogs.Login
+import org.briarproject.briar.desktop.dialogs.Registration
 import javax.annotation.concurrent.Immutable
 import javax.inject.Inject
 import javax.inject.Singleton
-import javax.swing.JOptionPane
 
 interface BriarService {
     fun start()
@@ -26,29 +26,10 @@ constructor(
 
     override fun start() {
         if (!accountManager.accountExists()) {
-            createAccount();
+            createAccount()
         } else {
-            while (true) {
-//                val password = PasswordPrompt.promptForPassword();
-//                if (!password.isValid) {
-//                    // this happens when dismissing the dialog or clicking 'cancel'
-//                    exitProcess(1)
-//                }
-                val password = "sdifjasdjhfksjadf"
-                try {
-                    accountManager.signIn(password)
-                    break
-                } catch (e: DecryptionException) {
-                    JOptionPane.showMessageDialog(
-                        null, "Wrong password",
-                        "Error", JOptionPane.ERROR_MESSAGE
-                    )
-                }
-            }
+            login()
         }
-        val dbKey = accountManager.databaseKey ?: throw AssertionError()
-        lifecycleManager.startServices(dbKey)
-        lifecycleManager.waitForStartup()
     }
 
     override fun stop() {
@@ -57,19 +38,11 @@ constructor(
     }
 
     private fun createAccount() {
-//        echo("No account found. Let's create one!\n\n")
-//        val result = NewAccountPrompt.promptForDetails();
-//        if (!result.isValid) {
-//            echo("Error: Please enter a username and password")
-//            exitProcess(1)
-//        }
-//        try {
-//            check(passwordStrengthEstimator, result)
-//        } catch (e: UsageError) {
-//            return;
-//        }
-
-        accountManager.createAccount("Nico", "sdifjasdjhfksjadf")
+        print("No account found. Let's create one!\n\n")
+        Registration("Briar", accountManager, lifecycleManager)
     }
 
+    private fun login() {
+        Login("Briar", accountManager, lifecycleManager)
+    }
 }

src/main/kotlin/org/briarproject/briar/compose/SwingDatabaseConfig.kt → src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt

-package org.briarproject.briar.compose
+package org.briarproject.briar.desktop
 
 import org.briarproject.bramble.api.crypto.KeyStrengthener
 import org.briarproject.bramble.api.db.DatabaseConfig
 import java.io.File
 
-internal class SwingDatabaseConfig(private val dbDir: File, private val keyDir: File) :
+internal class DesktopDatabaseConfig(private val dbDir: File, private val keyDir: File) :
     DatabaseConfig {
 
     override fun getDatabaseDirectory() = dbDir

src/main/kotlin/org/briarproject/briar/compose/SwingModule.kt → src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt

-package org.briarproject.briar.compose
+package org.briarproject.briar.desktop
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import dagger.Module
@@ -41,7 +41,7 @@ import javax.inject.Singleton
         SocksModule::class
     ]
 )
-internal class SwingModule(private val appDir: File) {
+internal class DesktopModule(private val appDir: File) {
 
     @Provides
     @Singleton
@@ -52,7 +52,7 @@ internal class SwingModule(private val appDir: File) {
     internal fun provideDatabaseConfig(): DatabaseConfig {
         val dbDir = File(appDir, "db")
         val keyDir = File(appDir, "key")
-        return SwingDatabaseConfig(dbDir, keyDir)
+        return DesktopDatabaseConfig(dbDir, keyDir)
     }
 
     @Provides

src/main/kotlin/org/briarproject/briar/desktop/Main.kt

+package org.briarproject.briar.desktop
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.parameters.options.counted
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.option
+import org.briarproject.bramble.BrambleCoreEagerSingletons
+import org.briarproject.briar.BriarCoreEagerSingletons
+import java.io.File
+import java.io.File.separator
+import java.io.IOException
+import java.lang.System.getProperty
+import java.nio.file.Files.setPosixFilePermissions
+import java.nio.file.attribute.PosixFilePermission
+import java.nio.file.attribute.PosixFilePermission.*
+import java.util.logging.Level.*
+import java.util.logging.LogManager
+
+private val DEFAULT_DATA_DIR = getProperty("user.home") + separator + ".briar"
+
+private class Main : CliktCommand(
+    name = "briar-desktop",
+    help = "Briar Desktop Client"
+) {
+    private val debug by option("--debug", "-d", help = "Enable printing of debug messages").flag(
+        default = false
+    )
+    private val verbosity by option(
+        "--verbose",
+        "-v",
+        help = "Print verbose log messages"
+    ).counted()
+    private val dataDir by option(
+        "--data-dir",
+        help = "The directory where Briar will store its files. Default: $DEFAULT_DATA_DIR",
+        metavar = "PATH",
+        envvar = "BRIAR_DATA_DIR"
+    ).default(DEFAULT_DATA_DIR)
+
+    override fun run() {
+        val level = if (debug) ALL else when (verbosity) {
+            0 -> WARNING
+            1 -> INFO
+            else -> ALL
+        }
+
+        LogManager.getLogManager().getLogger("").level = level
+
+        val dataDir = getDataDir()
+        val app =
+            DaggerBriarDesktopApp.builder().desktopModule(
+                DesktopModule(dataDir)
+            ).build()
+        // We need to load the eager singletons directly after making the
+        // dependency graphs
+        BrambleCoreEagerSingletons.Helper.injectEagerSingletons(app)
+        BriarCoreEagerSingletons.Helper.injectEagerSingletons(app)
+
+        app.getUI().startBriar()
+        app.getUI().startUI()
+    }
+
+    private fun getDataDir(): File {
+        val file = File(dataDir)
+        if (!file.exists() && !file.mkdirs()) {
+            throw IOException("Could not create directory: ${file.absolutePath}")
+        } else if (!file.isDirectory) {
+            throw IOException("Data dir is not a directory: ${file.absolutePath}")
+        }
+        val perms = HashSet<PosixFilePermission>()
+        perms.add(OWNER_READ)
+        perms.add(OWNER_WRITE)
+        perms.add(OWNER_EXECUTE)
+        setPosixFilePermissions(file.toPath(), perms)
+        return file
+    }
+}
+
+fun main(args: Array<String>) = Main().main(args)
\ No newline at end of file

src/main/kotlin/org/briarproject/briar/desktop/MainUI.kt

+package org.briarproject.briar.desktop
+
+import org.briarproject.bramble.api.account.AccountManager
+import org.briarproject.bramble.api.contact.ContactManager
+import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
+import org.briarproject.bramble.api.event.EventBus
+import org.briarproject.briar.api.conversation.ConversationManager
+import org.briarproject.briar.api.introduction.IntroductionManager
+import org.briarproject.briar.api.messaging.MessagingManager
+import org.briarproject.briar.api.messaging.PrivateMessageFactory
+
+class MainUI(
+    private val briarService: BriarService,
+    val accountManager: AccountManager,
+    val contactManager: ContactManager,
+    private val conversationManager: ConversationManager,
+    private val messagingManager: MessagingManager,
+    private val introductionManager: IntroductionManager,
+    private val privateMessageFactory: PrivateMessageFactory,
+    private val eventBus: EventBus,
+    val passwordStrengthEstimator: PasswordStrengthEstimator
+) {
+
+    init {
+        // Should be shown only when logged in
+//        val title = "Briar Desktop"
+//        Window (title = title) {
+//            Column(
+//                modifier = Modifier.padding(16.dp).fillMaxSize(),
+//                verticalArrangement = Arrangement.Center,
+//                horizontalAlignment = Alignment.CenterHorizontally
+//            ) {
+//                Text("Welcome to Briar")
+//            }
+//        }
+    }
+}

src/main/kotlin/org/briarproject/briar/compose/UI.kt → src/main/kotlin/org/briarproject/briar/desktop/UI.kt

-package org.briarproject.briar.compose
+package org.briarproject.briar.desktop
 
-import androidx.compose.desktop.Window
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Button
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.svgResource
-import androidx.compose.ui.unit.dp
 import org.briarproject.bramble.api.account.AccountManager
 import org.briarproject.bramble.api.contact.ContactManager
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
@@ -41,54 +30,27 @@ constructor(
 ) {
 
     private val logger = getLogger(UI::javaClass.name)
-//    private val configuration = Configuration()
 
     internal fun startBriar() {
         briarService.start();
     }
 
     internal fun startUI() {
-        Window {
-            Column(
-                modifier = Modifier.padding(16.dp)
-            ) {
-                TheImage()
-                Spacer(Modifier.height(32.dp))
-                TheText()
-                TheButton()
-            }
-        }
+        MainUI(
+            briarService,
+            accountManager,
+            contactManager,
+            conversationManager,
+            messagingManager,
+            introductionManager,
+            privateMessageFactory,
+            eventBus,
+            passwordStrengthEstimator
+        )
     }
 
     internal fun getContactManager(): ContactManager {
         return contactManager
     }
 
-}
-
+}
\ No newline at end of file
-
-@Composable
-private fun TheButton() {
-    var text by remember { mutableStateOf("Start chatting") }
-    Button(onClick = {
-        text = "Sorry, not yet available"
-    }) {
-        Text(text)
-    }
-}
-
-@Composable
-private fun TheImage() {
-    Image(
-        painter = svgResource("images/logo_circle.svg"),
-        contentDescription = "Briar logo",
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(shape = RoundedCornerShape(400.dp))
-    )
-}
-
-@Composable
-private fun TheText() {
-    Text("Welcome to Briar")
-}

src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt

+package org.briarproject.briar.desktop.dialogs
+
+import androidx.compose.desktop.Window
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.svgResource
+import androidx.compose.ui.unit.dp
+import org.briarproject.bramble.api.account.AccountManager
+import org.briarproject.bramble.api.lifecycle.LifecycleManager
+
+// TODO: Error handling
+fun Login(title: String, accountManager: AccountManager, lifecycleManager: LifecycleManager) =
+    Window(title = title) {
+        Column(
+            modifier = Modifier.padding(16.dp).fillMaxSize(),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            TheImage()
+            Spacer(Modifier.height(32.dp))
+            TheTextField(accountManager, lifecycleManager)
+        }
+    }
+
+@Composable
+private fun TheImage() {
+    Image(
+        painter = svgResource("images/logo_circle.svg"),
+        contentDescription = "Briar logo",
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(shape = RoundedCornerShape(400.dp))
+    )
+}
+
+@Composable
+private fun TheTextField(accountManager: AccountManager, lifecycleManager: LifecycleManager) {
+    var password by remember { mutableStateOf("") }
+    OutlinedTextField(password, { password = it }, label = { Text("Password") })
+    Spacer(Modifier.height(16.dp))
+    Button(onClick = {
+        accountManager.signIn(password)
+
+        val dbKey = accountManager.databaseKey ?: throw AssertionError()
+        lifecycleManager.startServices(dbKey)
+        lifecycleManager.waitForStartup()
+    }) {
+        Text("Login")
+    }
+}
\ No newline at end of file

src/main/kotlin/org/briarproject/briar/desktop/dialogs/Registration.kt

+package org.briarproject.briar.desktop.dialogs
+
+import androidx.compose.desktop.Window
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.svgResource
+import androidx.compose.ui.unit.dp
+import org.briarproject.bramble.api.account.AccountManager
+import org.briarproject.bramble.api.lifecycle.LifecycleManager
+
+// TODO: Error handling and password strength
+fun Registration(title: String, accountManager: AccountManager, lifecycleManager: LifecycleManager) =
+    Window(title = title) {
+        Column(
+            modifier = Modifier.padding(16.dp).fillMaxSize(),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            TheImage()
+            Spacer(Modifier.height(32.dp))
+            TheTextFields(accountManager, lifecycleManager)
+        }
+    }
+
+@Composable
+private fun TheImage() {
+    Image(
+        painter = svgResource("images/logo_circle.svg"),
+        contentDescription = "Briar logo",
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(shape = RoundedCornerShape(400.dp))
+    )
+}
+
+@Composable
+private fun TheTextFields(accountManager: AccountManager, lifecycleManager: LifecycleManager) {
+    var username by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
+    OutlinedTextField(username, { username = it }, label = { Text("Username") })
+    OutlinedTextField(password, { password = it }, label = { Text("Password") })
+    Spacer(Modifier.height(16.dp))
+    Button(onClick = {
+        accountManager.createAccount(username, password)
+        val dbKey = accountManager.databaseKey ?: throw AssertionError()
+        lifecycleManager.startServices(dbKey)
+        lifecycleManager.waitForStartup()
+    }) {
+        Text("Register")
+    }
+}
\ No newline at end of file