Rename some classes and variables copied from cli module

mailbox-lib/build.gradle

@@ -145,7 +145,7 @@ void jarFactory(Jar jarTask, jarArchitecture) {
         destStream.close()
         srcJarFile.close()
         println 'Building ' + jarArchitecture + ' version has finished'
-        println 'JAR: mailbox-cli/build/libs/mailbox-cli-linux-x86_64.jar'
+        println 'JAR: mailbox-lib/build/libs/mailbox-lib-linux-x86_64.jar'
     }
 }
 

mailbox-lib/src/main/java/org/briarproject/mailbox/core/JavaCliEagerSingletons.kt → mailbox-lib/src/main/java/org/briarproject/mailbox/core/JavaLibEagerSingletons.kt

@@ -24,7 +24,7 @@ import org.briarproject.mailbox.core.tor.TorPlugin
 import javax.inject.Inject
 
 @Suppress("unused")
-internal class JavaCliEagerSingletons @Inject constructor(
+internal class JavaLibEagerSingletons @Inject constructor(
     val taskScheduler: TaskScheduler,
     val javaTorPlugin: TorPlugin,
 )

mailbox-lib/src/main/java/org/briarproject/mailbox/core/tor/JavaCliNetworkManager.java → mailbox-lib/src/main/java/org/briarproject/mailbox/core/tor/JavaLibNetworkManager.java

@@ -33,12 +33,12 @@ import static org.briarproject.mailbox.core.util.LogUtils.logException;
 import static org.briarproject.mailbox.core.util.NetworkUtils.getNetworkInterfaces;
 import static org.slf4j.LoggerFactory.getLogger;
 
-class JavaCliNetworkManager implements NetworkManager {
+class JavaLibNetworkManager implements NetworkManager {
 
-	private static final Logger LOG = getLogger(JavaCliNetworkManager.class);
+	private static final Logger LOG = getLogger(JavaLibNetworkManager.class);
 
 	@Inject
-	JavaCliNetworkManager() {
+	JavaLibNetworkManager() {
 	}
 
 	@Override

mailbox-lib/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt

@@ -109,7 +109,7 @@ internal class JavaTorModule {
 
     @Provides
     @Singleton
-    fun provideNetworkManager(networkManager: JavaCliNetworkManager): NetworkManager {
+    fun provideNetworkManager(networkManager: JavaLibNetworkManager): NetworkManager {
         return networkManager
     }
 

mailbox-lib/src/main/java/org/briarproject/mailbox/lib/Mailbox.kt

@@ -22,7 +22,7 @@ package org.briarproject.mailbox.lib
 import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.runBlocking
 import org.briarproject.mailbox.core.CoreEagerSingletons
-import org.briarproject.mailbox.core.JavaCliEagerSingletons
+import org.briarproject.mailbox.core.JavaLibEagerSingletons
 import org.briarproject.mailbox.core.db.TransactionManager
 import org.briarproject.mailbox.core.lifecycle.LifecycleManager
 import org.briarproject.mailbox.core.setup.QrCodeEncoder
@@ -45,7 +45,7 @@ class Mailbox {
     internal lateinit var coreEagerSingletons: CoreEagerSingletons
 
     @Inject
-    internal lateinit var javaCliEagerSingletons: JavaCliEagerSingletons
+    internal lateinit var javaLibEagerSingletons: JavaLibEagerSingletons
 
     @Inject
     internal lateinit var lifecycleManager: LifecycleManager
@@ -67,8 +67,8 @@ class Mailbox {
 
     fun init() {
         LOG.info { "Hello Mailbox" }
-        val javaCliComponent = DaggerJavaLibComponent.builder().build()
-        javaCliComponent.inject(this)
+        val javaLibComponent = DaggerJavaLibComponent.builder().build()
+        javaLibComponent.inject(this)
     }
 
     fun wipe() {