Updated network package

app/src/main/java/io/elixxir/dapp/model/DappConfig.kt

@@ -2,7 +2,7 @@ package io.elixxir.dapp.model
 
 import io.elixxir.dapp.android.model.AndroidConfig
 import io.elixxir.dapp.logger.model.LoggerConfig
-import io.elixxir.dapp.session.model.NetworkConfig
+import io.elixxir.dapp.network.model.NetworkConfig
 
 /**
  * Describes configurable options, and satisfies dependencies for,

app/src/main/java/io/elixxir/dapp/session/data/NdfDataSource.kt → app/src/main/java/io/elixxir/dapp/network/data/NdfDataSource.kt

@@ -4,7 +4,7 @@ import androidx.annotation.RawRes
 import bindings.Bindings
 import io.elixxir.dapp.model.CommonProperties
 import io.elixxir.dapp.model.RetryStrategy
-import io.elixxir.dapp.session.model.NdfSettings
+import io.elixxir.dapp.network.model.NdfSettings
 import kotlinx.coroutines.*
 typealias Ndf = String
 

app/src/main/java/io/elixxir/dapp/networking/data/Networking.kt → app/src/main/java/io/elixxir/dapp/network/data/NetworkManager.kt

-package io.elixxir.dapp.networking.data
+package io.elixxir.dapp.network.data
 
-import bindings.AuthCallbacks
 import bindings.Bindings
 import bindings.Cmix
+import io.elixxir.dapp.model.CommonProperties
+import io.elixxir.dapp.network.model.*
 import io.elixxir.dapp.session.model.*
 import kotlinx.coroutines.withContext
 
-class Networking(private val cmix: Cmix) {
+internal interface NetworkManager {
+
+}
+
+internal class DappNetworkManager private constructor(
+    properties: CommonProperties
+): NetworkManager, CommonProperties by properties {
 
     private fun login(
         cmixId: Long,
-        authCallbacks: AuthCallbacks,
+        authCallbacks: AuthCallbacksMediator,
         identity: ReceptionIdentity,
         e2eParamsJson: E2eParams
     ): E2eMediator {
         return E2eMediator(
-            Bindings.login(cmixId, authCallbacks, identity.value, e2eParamsJson.value)
+            Bindings.login(cmixId, authCallbacks.value, identity.value, e2eParamsJson.value)
         )
     }
 
@@ -60,4 +67,8 @@ class Networking(private val cmix: Cmix) {
     private fun initUserDiscovery() {
 
     }
+
+    companion object {
+        internal fun newInstance(properties: CommonProperties) = DappNetworkManager(properties)
+    }
 }
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/network/model/AuthCallbacksMediator.kt

+package io.elixxir.dapp.network.model
+
+import bindings.AuthCallbacks
+
+@JvmInline
+internal value class AuthCallbacksMediator(val value: AuthCallbacks)
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/network/model/CmixMediator.kt

+package io.elixxir.dapp.network.model
+
+import bindings.Cmix
+
+@JvmInline
+internal value class CmixMediator(private val value: Cmix)
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/network/model/E2eMediator.kt

+package io.elixxir.dapp.network.model
+
+import bindings.E2e
+
+@JvmInline
+internal value class E2eMediator(private val value: E2e)
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/network/model/E2eParams.kt

+package io.elixxir.dapp.network.model
+
+@JvmInline
+internal value class E2eParams(val value: ByteArray)
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/session/model/Environment.kt → app/src/main/java/io/elixxir/dapp/network/model/Environment.kt

-package io.elixxir.dapp.session.model
+package io.elixxir.dapp.network.model
 
 enum class Environment {
     MainNet, ReleaseNet

app/src/main/java/io/elixxir/dapp/session/model/NetworkConfig.kt → app/src/main/java/io/elixxir/dapp/network/model/NetworkConfig.kt

-package io.elixxir.dapp.session.model
+package io.elixxir.dapp.network.model
 
 import androidx.annotation.RawRes
 import io.elixxir.dapp.R

app/src/main/java/io/elixxir/dapp/network/model/ReceptionIdentity.kt

+package io.elixxir.dapp.network.model
+
+@JvmInline
+internal value class ReceptionIdentity(val value: ByteArray)

app/src/main/java/io/elixxir/dapp/networking/model/NetworkConfig.kt

-package io.elixxir.dapp.networking.model
-
-interface NetworkConfig {
-    // Main or Alt UD
-}
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/session/model/SessionModels.kt

-package io.elixxir.dapp.session.model
-
-import bindings.Cmix
-import bindings.E2e
-
-@JvmInline
-value class SessionPassword(val value: ByteArray)
-
-@JvmInline
-value class CmixMediator(private val value: Cmix)
-
-@JvmInline
-value class E2eMediator(private val value: E2e)
-
-@JvmInline
-value class ReceptionIdentity(val value: ByteArray)
-
-@JvmInline
-value class E2eParams(val value: ByteArray)
\ No newline at end of file

app/src/main/java/io/elixxir/dapp/session/model/SessionPassword.kt

+package io.elixxir.dapp.session.model
+
+@JvmInline
+value class SessionPassword(val value: ByteArray)
\ No newline at end of file