Add domain for user profile

bisqapps/androidClient/build.gradle.kts

@@ -63,6 +63,9 @@ android {
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            excludes.add("META-INF/LICENSE.md")
+            excludes.add("META-INF/NOTICE.md")
+            excludes.add("META-INF/NOTICE.markdown")
         }
     }
     buildTypes {
@@ -82,6 +85,8 @@ android {
 dependencies {
     implementation(project(":shared:presentation"))
     implementation(project(":shared:domain"))
+    // FIXME hack to avoid the issue that org.slf4j is not found as we exclude it in shared
+    implementation(libs.ktor.client.cio)
     debugImplementation(compose.uiTooling)
 }
 

bisqapps/androidClient/src/androidMain/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".MainApplication"
         android:allowBackup="true"

bisqapps/androidClient/src/androidMain/kotlin/network/bisq/mobile/client/MainActivity.kt

@@ -12,6 +12,7 @@ import org.koin.android.ext.android.inject
 
 class MainActivity : ComponentActivity() {
     private val presenter: MainPresenter by inject()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         presenter.attachView(this)

bisqapps/androidClient/src/androidMain/kotlin/network/bisq/mobile/client/MainApplication.kt

@@ -1,7 +1,8 @@
 package network.bisq.mobile.client
 
 import android.app.Application
-import network.bisq.mobile.client.di.androidModule
+import network.bisq.mobile.client.di.androidClientModule
+import network.bisq.mobile.client.di.clientModule
 import network.bisq.mobile.domain.di.domainModule
 import network.bisq.mobile.presentation.di.presentationModule
 import org.koin.android.ext.koin.androidContext
@@ -14,7 +15,7 @@ class MainApplication: Application() {
 
         startKoin {
             androidContext(this@MainApplication)
-            modules(listOf(domainModule, presentationModule, androidModule)) 
+            modules(listOf(domainModule, presentationModule, clientModule, androidClientModule))
         }
     }
 }

bisqapps/androidClient/src/androidMain/kotlin/network/bisq/mobile/client/di/AndroidClientModule.kt

@@ -0,0 +1,22 @@
+package network.bisq.mobile.client.di
+
+import network.bisq.mobile.android.node.main.bootstrap.ClientApplicationBootstrapFacade
+import network.bisq.mobile.client.presentation.AndroidClientMainPresenter
+import network.bisq.mobile.client.service.ApiRequestService
+import network.bisq.mobile.domain.client.main.user_profile.ClientUserProfileServiceFacade
+import network.bisq.mobile.domain.client.main.user_profile.UserProfileApiGateway
+import network.bisq.mobile.domain.data.repository.main.bootstrap.ApplicationBootstrapFacade
+import network.bisq.mobile.domain.user_profile.UserProfileServiceFacade
+import network.bisq.mobile.presentation.MainPresenter
+import network.bisq.mobile.presentation.ui.AppPresenter
+import org.koin.dsl.bind
+import org.koin.dsl.module
+
+val androidClientModule = module {
+    single<ApplicationBootstrapFacade> { ClientApplicationBootstrapFacade() }
+
+    single { ApiRequestService(get(), "10.0.2.2") }
+    single { UserProfileApiGateway(get()) }
+    single<UserProfileServiceFacade> { ClientUserProfileServiceFacade(get()) }
+    single<MainPresenter> { AndroidClientMainPresenter(get()) } bind AppPresenter::class
+}

bisqapps/androidClient/src/androidMain/kotlin/network/bisq/mobile/client/presentation/AndroidClientMainPresenter.kt

@@ -0,0 +1,20 @@
+package network.bisq.mobile.client.presentation
+
+import network.bisq.mobile.domain.data.repository.GreetingRepository
+import network.bisq.mobile.domain.data.repository.main.bootstrap.ApplicationBootstrapFacade
+import network.bisq.mobile.presentation.MainPresenter
+
+@Suppress("UNCHECKED_CAST")
+class AndroidClientMainPresenter(
+    private val applicationBootstrapFacade: ApplicationBootstrapFacade
+) : MainPresenter(GreetingRepository()) {
+    var applicationServiceInited = false
+    override fun onViewAttached() {
+        super.onViewAttached()
+
+        if (!applicationServiceInited) {
+            applicationServiceInited = true
+            applicationBootstrapFacade.initialize()
+        }
+    }
+}

bisqapps/androidNode/build.gradle.kts

@@ -1,7 +1,8 @@
+
+import com.google.protobuf.gradle.proto
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.apache.tools.ant.taskdefs.condition.Os
-import com.google.protobuf.gradle.proto
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -81,6 +82,10 @@ android {
             // Exclude the conflicting META-INF files
             excludes.add("META-INF/versions/9/OSGI-INF/MANIFEST.MF")
             excludes.add("META-INF/DEPENDENCIES")
+            excludes.add("META-INF/LICENSE.md")
+            excludes.add("META-INF/NOTICE.md")
+            excludes.add("META-INF/INDEX.LIST")
+            excludes.add("META-INF/NOTICE.markdown")
             pickFirsts.add("**/protobuf/**/*.class")
         }
     }
@@ -161,6 +166,7 @@ dependencies {
 
     implementation(libs.koin.core)
     implementation(libs.koin.android)
+    implementation(libs.logging.kermit)
 }
 
 // ensure tests run on J17

bisqapps/androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/service/AndroidApplicationService.kt → bisqapps/androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/AndroidApplicationService.kt

@@ -14,8 +14,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
-package network.bisq.mobile.android.node.service
+package network.bisq.mobile.android.node
 
+import androidx.core.util.Supplier
 import bisq.account.AccountService
 import bisq.application.ApplicationService
 import bisq.application.State
@@ -39,7 +40,9 @@ import bisq.trade.TradeService
 import bisq.user.UserService
 import com.google.common.base.Preconditions
 import lombok.Getter
+import lombok.Setter
 import lombok.extern.slf4j.Slf4j
+import network.bisq.mobile.android.node.service.AndroidMemoryReportService
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.nio.file.Path
@@ -55,12 +58,52 @@ import java.util.concurrent.TimeUnit
  */
 @Slf4j
 @Getter
-class AndroidApplicationService(androidMemoryService: AndroidMemoryReportService, userDataDir: Path?) :
+class AndroidApplicationService(androidMemoryReportService: AndroidMemoryReportService, userDataDir: Path?) :
     ApplicationService("android", arrayOf<String>(), userDataDir) {
+
+    @Getter
+    class Supplier {
+        @Setter
+        lateinit var applicationService: AndroidApplicationService
+        var stateSupplier: androidx.core.util.Supplier<Observable<State>> =
+            Supplier { applicationService.state }
+        var securityServiceSupplier: androidx.core.util.Supplier<SecurityService> =
+            Supplier { applicationService.securityService }
+        var networkServiceSupplier: androidx.core.util.Supplier<NetworkService> =
+            Supplier { applicationService.networkService }
+        var identityServiceSupplier: androidx.core.util.Supplier<IdentityService> =
+            Supplier { applicationService.identityService }
+        var bondedRolesServiceSupplier: androidx.core.util.Supplier<BondedRolesService> =
+            Supplier { applicationService.bondedRolesService }
+        var accountServiceSupplier: androidx.core.util.Supplier<AccountService> =
+            Supplier { applicationService.accountService }
+        var offerServiceSupplier: androidx.core.util.Supplier<OfferService> =
+            Supplier { applicationService.offerService }
+        var contractServiceSupplier: androidx.core.util.Supplier<ContractService> =
+            Supplier { applicationService.contractService }
+        var userServiceSupplier: androidx.core.util.Supplier<UserService> =
+            Supplier { applicationService.userService }
+        var chatServiceSupplier: androidx.core.util.Supplier<ChatService> =
+            Supplier { applicationService.chatService }
+        var settingsServiceSupplier: androidx.core.util.Supplier<SettingsService> =
+            Supplier { applicationService.settingsService }
+        var supportServiceSupplier: androidx.core.util.Supplier<SupportService> =
+            Supplier { applicationService.supportService }
+        var systemNotificationServiceSupplier: androidx.core.util.Supplier<SystemNotificationService> =
+            Supplier { applicationService.systemNotificationService }
+        var tradeServiceSupplier: androidx.core.util.Supplier<TradeService> =
+            Supplier { applicationService.tradeService }
+        var alertNotificationsServiceSupplier: androidx.core.util.Supplier<AlertNotificationsService> =
+            Supplier { applicationService.alertNotificationsService }
+        var favouriteMarketsServiceSupplier: androidx.core.util.Supplier<FavouriteMarketsService> =
+            Supplier { applicationService.favouriteMarketsService }
+        var dontShowAgainServiceSupplier: androidx.core.util.Supplier<DontShowAgainService> =
+            Supplier { applicationService.dontShowAgainService }
+    }
+
     companion object {
         const val STARTUP_TIMEOUT_SEC: Long = 300
         const val SHUTDOWN_TIMEOUT_SEC: Long = 10
-        private val INSTANCE: AndroidApplicationService? = null
         val log: Logger = LoggerFactory.getLogger(ApplicationService::class.java)
     }
 
@@ -70,6 +113,7 @@ class AndroidApplicationService(androidMemoryService: AndroidMemoryReportService
 
     val securityService =
         SecurityService(persistenceService, SecurityService.Config.from(getConfig("security")))
+
     val networkService = NetworkService(
         NetworkServiceConfig.from(
             config.baseDir,
@@ -79,9 +123,9 @@ class AndroidApplicationService(androidMemoryService: AndroidMemoryReportService
         securityService.keyBundleService,
         securityService.hashCashProofOfWorkService,
         securityService.equihashProofOfWorkService,
-        androidMemoryService
+        androidMemoryReportService
     )
-    private val identityService = IdentityService(
+    val identityService = IdentityService(
         persistenceService,
         securityService.keyBundleService,
         networkService
@@ -91,9 +135,9 @@ class AndroidApplicationService(androidMemoryService: AndroidMemoryReportService
         getPersistenceService(),
         networkService
     )
-    private val accountService = AccountService(persistenceService)
-    private val offerService = OfferService(networkService, identityService, persistenceService)
-    private val contractService = ContractService(securityService)
+    val accountService = AccountService(persistenceService)
+    val offerService = OfferService(networkService, identityService, persistenceService)
+    val contractService = ContractService(securityService)
     val userService = UserService(
         persistenceService,
         securityService,
@@ -103,12 +147,12 @@ class AndroidApplicationService(androidMemoryService: AndroidMemoryReportService
     )
     val chatService: ChatService
     val settingsService = SettingsService(persistenceService)
-    private val supportService: SupportService
-    private val systemNotificationService = SystemNotificationService(Optional.empty())
-    private val tradeService: TradeService
-    private val alertNotificationsService: AlertNotificationsService
-    private val favouriteMarketsService: FavouriteMarketsService
-    private val dontShowAgainService: DontShowAgainService
+    val supportService: SupportService
+    val systemNotificationService = SystemNotificationService(Optional.empty())
+    val tradeService: TradeService
+    val alertNotificationsService: AlertNotificationsService
+    val favouriteMarketsService: FavouriteMarketsService
+    val dontShowAgainService: DontShowAgainService
 
 
     init {
@@ -152,8 +196,16 @@ class AndroidApplicationService(androidMemoryService: AndroidMemoryReportService
     }
 
     override fun initialize(): CompletableFuture<Boolean> {
+        var ts = System.currentTimeMillis()
+        pruneAllBackups().join()
+        log.info("pruneAllBackups took {} ms", System.currentTimeMillis() - ts)
+
+        ts = System.currentTimeMillis()
+        readAllPersisted().join()
+        log.info("readAllPersisted took {} ms", System.currentTimeMillis() - ts)
+
         return securityService.initialize()
-            .thenCompose<Boolean> { result: Boolean? ->
+            .thenCompose { result: Boolean? ->
                 setState(State.INITIALIZE_NETWORK)
                 networkService.initialize()
             }

bisqapps/androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/di/AndroidNodeModule.kt

@@ -1,11 +1,13 @@
 package network.bisq.mobile.android.node.di
 
-import bisq.security.SecurityService
-import bisq.user.identity.UserIdentityService
+import network.bisq.mobile.android.node.AndroidApplicationService
+import network.bisq.mobile.android.node.domain.bootstrap.NodeApplicationBootstrapFacade
 import network.bisq.mobile.android.node.domain.data.repository.NodeGreetingRepository
-import network.bisq.mobile.android.node.presentation.MainNodePresenter
-import network.bisq.mobile.android.node.service.AndroidApplicationService
+import network.bisq.mobile.android.node.domain.user_profile.NodeUserProfileServiceFacade
+import network.bisq.mobile.android.node.presentation.NodeMainPresenter
 import network.bisq.mobile.android.node.service.AndroidMemoryReportService
+import network.bisq.mobile.domain.data.repository.main.bootstrap.ApplicationBootstrapFacade
+import network.bisq.mobile.domain.user_profile.UserProfileServiceFacade
 import network.bisq.mobile.presentation.MainPresenter
 import network.bisq.mobile.presentation.ui.AppPresenter
 import org.koin.android.ext.koin.androidContext
@@ -15,27 +17,19 @@ import org.koin.dsl.module
 val androidNodeModule = module {
     // this one is for example properties, will be eliminated soon
     single<NodeGreetingRepository> { NodeGreetingRepository() }
-    // this line showcases both, the posibility to change behaviour of the app by changing one definiton
+
+    single<AndroidMemoryReportService> {
+        AndroidMemoryReportService(androidContext())
+    }
+
+    single { AndroidApplicationService.Supplier() }
+
+    single<ApplicationBootstrapFacade> { NodeApplicationBootstrapFacade(get()) }
+
+    single<UserProfileServiceFacade> { NodeUserProfileServiceFacade(get()) }
+
+
+    // this line showcases both, the possibility to change behaviour of the app by changing one definition
     // and binding the same obj to 2 different abstractions
-    single<MainPresenter> { MainNodePresenter(get()) } bind AppPresenter::class
-
-    // Services
-//    TODO might not work because of the jars dependencies, needs more work
-//    single <AndroidMemoryReportService> {
-//        val context = androidContext()
-//        AndroidMemoryReportService(context)
-//    }
-//    single <AndroidApplicationService> {
-//        val filesDirsPath = androidContext().filesDir.toPath()
-//        val androidMemoryService: AndroidMemoryReportService = get()
-//        AndroidApplicationService(androidMemoryService, filesDirsPath)
-//    }
-//    single <UserIdentityService> {
-//        val applicationService: AndroidApplicationService = get()
-//        applicationService.userService.userIdentityService
-//    }
-//    single <SecurityService> {
-//        val applicationService: AndroidApplicationService = get()
-//        applicationService.securityService
-//    }
+    single<MainPresenter> { NodeMainPresenter(get(), get(), get(), get()) } bind AppPresenter::class
 }

bisqapps/androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/domain/bootstrap/NodeApplicationBootstrapFacade.kt

@@ -0,0 +1,46 @@
+package network.bisq.mobile.android.node.domain.bootstrap
+
+import bisq.application.State
+import network.bisq.mobile.android.node.AndroidApplicationService
+import network.bisq.mobile.domain.data.repository.main.bootstrap.ApplicationBootstrapFacade
+
+class NodeApplicationBootstrapFacade(
+    private val supplier: AndroidApplicationService.Supplier
+) :
+    ApplicationBootstrapFacade() {
+
+    override fun initialize() {
+        supplier.stateSupplier.get().addObserver { state: State ->
+            when (state) {
+                State.INITIALIZE_APP -> {
+                   setState("Starting Bisq")
+                   setProgress(0f)
+                }
+
+                State.INITIALIZE_NETWORK -> {
+                   setState("Initialize P2P network")
+                   setProgress(0.5f)
+                }
+
+                // not used
+                State.INITIALIZE_WALLET -> {
+                }
+
+                State.INITIALIZE_SERVICES -> {
+                   setState("Initialize services")
+                   setProgress(0.75f)
+                }
+
+                State.APP_INITIALIZED -> {
+                   setState("Bisq started")
+                   setProgress(1f)
+                }
+
+                State.FAILED -> {
+                   setState("Startup failed")
+                   setProgress(0f)
+                }
+            }
+        }
+    }
+}