feature: Make Certificate Selectable in TestApp

Closes: #15 Signed-Off-By: Andre Weber <andre.weber3@etas.com>
eclipse-kuksa · Oct 12, 2023 · 1110c72 · 1110c72
1 parent 617ff9f
commit 1110c72
Show file tree

Hide file tree

Showing 16 changed files with 487 additions and 262 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -102,4 +102,6 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling.test.manifest)
 
     implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.constraintlayout.compose)
+}
 }
diff --git a/app/src/main/assets/CA.pem b/app/src/main/assets/CA.pem
diff --git a/app/src/main/java/org/eclipse/kuksa/testapp/databroker/JavaDataBrokerEngine.java b/app/src/main/java/org/eclipse/kuksa/testapp/databroker/JavaDataBrokerEngine.java
@@ -19,7 +19,7 @@
 
 package org.eclipse.kuksa.testapp.databroker;
 
-import android.content.res.AssetManager;
+import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -34,7 +34,6 @@
 import org.eclipse.kuksa.proto.v1.KuksaValV1.GetResponse;
 import org.eclipse.kuksa.proto.v1.KuksaValV1.SetResponse;
 import org.eclipse.kuksa.proto.v1.Types.Datapoint;
-import org.eclipse.kuksa.testapp.extension.AssetManagerExtensionKt;
 import org.eclipse.kuksa.testapp.model.Certificate;
 import org.eclipse.kuksa.testapp.model.ConnectionInfo;
 import org.jetbrains.annotations.NotNull;
@@ -59,24 +58,18 @@ public class JavaDataBrokerEngine implements DataBrokerEngine {
     private static final String TAG = JavaDataBrokerEngine.class.getSimpleName();
     private static final long TIMEOUT_CONNECTION = 5;
 
-    @NonNull
-    private final AssetManager assetManager;
-
     @Nullable
     private DataBrokerConnection dataBrokerConnection = null;
 
     private final Set<DisconnectListener> disconnectListeners = new HashSet<>();
 
-    public JavaDataBrokerEngine(@NonNull AssetManager assetManager) {
-        this.assetManager = assetManager;
-    }
-
     public void connect(
+        @NonNull Context context,
         @NonNull ConnectionInfo connectionInfo,
         @NonNull CoroutineCallback<DataBrokerConnection> callback
     ) {
         if (connectionInfo.isTlsEnabled()) {
-            connectSecure(connectionInfo, callback);
+            connectSecure(context, connectionInfo, callback);
         } else {
             connectInsecure(connectionInfo, callback);
         }
@@ -99,26 +92,27 @@ private void connectInsecure(
     }
 
     private void connectSecure(
+        @NotNull Context context,
         @NotNull ConnectionInfo connectInfo,
         @NotNull CoroutineCallback<DataBrokerConnection> callback
     ) {
-        Certificate rootCert = connectInfo.getCertificate();
+        Certificate certificate = connectInfo.getCertificate();
 
         ChannelCredentials tlsCredentials = null;
         try {
-            InputStream rootCertFile = AssetManagerExtensionKt.open(assetManager, rootCert);
+            InputStream rootCertFile = context.getContentResolver().openInputStream(certificate.getUri());
             tlsCredentials = TlsChannelCredentials.newBuilder()
                 .trustManager(rootCertFile)
                 .build();
         } catch (IOException e) {
-            Log.w(TAG, "Could not find file for certificate: " + rootCert);
+            Log.w(TAG, "Could not find file for certificate: " + certificate);
         }
 
         try {
             ManagedChannelBuilder<?> channelBuilder = Grpc
                 .newChannelBuilderForAddress(connectInfo.getHost(), connectInfo.getPort(), tlsCredentials);
 
-            String overrideAuthority = rootCert.getOverrideAuthority().trim();
+            String overrideAuthority = certificate.getOverrideAuthority().trim();
             boolean hasOverrideAuthority = !overrideAuthority.isEmpty();
             if (hasOverrideAuthority) {
                 channelBuilder.overrideAuthority(overrideAuthority);

diff --git a/app/src/main/kotlin/org/eclipse/kuksa/testapp/KuksaDataBrokerActivity.kt b/app/src/main/kotlin/org/eclipse/kuksa/testapp/KuksaDataBrokerActivity.kt
@@ -52,11 +52,16 @@ import org.eclipse.kuksa.testapp.databroker.viewmodel.VSSPropertiesViewModel
 import org.eclipse.kuksa.testapp.extension.TAG
 import org.eclipse.kuksa.testapp.extension.valueType
 import org.eclipse.kuksa.testapp.model.ConnectionInfo
+import org.eclipse.kuksa.testapp.preferences.ConnectionInfoRepository
 import org.eclipse.kuksa.testapp.ui.theme.KuksaAppAndroidTheme
 
 class KuksaDataBrokerActivity : ComponentActivity() {
+    private lateinit var connectionInfoRepository: ConnectionInfoRepository
+
     private val topAppBarViewModel: TopAppBarViewModel by viewModels()
-    private val connectionViewModel: ConnectionViewModel by viewModels()
+    private val connectionViewModel: ConnectionViewModel by viewModels {
+        ConnectionViewModel.Factory(connectionInfoRepository)
+    }
     private val vssPropertiesViewModel: VSSPropertiesViewModel by viewModels()
     private val outputViewModel: OutputViewModel by viewModels()
 
@@ -80,11 +85,11 @@ class KuksaDataBrokerActivity : ComponentActivity() {
 
     private lateinit var dataBrokerEngine: DataBrokerEngine
     private val kotlinDataBrokerEngine by lazy {
-        KotlinDataBrokerEngine(lifecycleScope, assets)
+        KotlinDataBrokerEngine(lifecycleScope)
     }
 
     private val javaDataBrokerEngine by lazy {
-        JavaDataBrokerEngine(assets)
+        JavaDataBrokerEngine()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -101,6 +106,8 @@ class KuksaDataBrokerActivity : ComponentActivity() {
             }
         }
 
+        connectionInfoRepository = ConnectionInfoRepository(this)
+
         dataBrokerEngine = kotlinDataBrokerEngine
         topAppBarViewModel.onCompatibilityModeChanged = { isCompatibilityModeEnabled ->
             dataBrokerEngine = if (isCompatibilityModeEnabled) {
@@ -146,7 +153,7 @@ class KuksaDataBrokerActivity : ComponentActivity() {
         connectionViewModel.updateConnectionState(ConnectionViewState.CONNECTING)
 
         dataBrokerEngine.registerDisconnectListener(onDisconnectListener)
-        dataBrokerEngine.connect(connectionInfo, dataBrokerConnectionCallback)
+        dataBrokerEngine.connect(this, connectionInfo, dataBrokerConnectionCallback)
     }
 
     private fun disconnect() {

diff --git a/app/src/main/kotlin/org/eclipse/kuksa/testapp/databroker/DataBrokerEngine.kt b/app/src/main/kotlin/org/eclipse/kuksa/testapp/databroker/DataBrokerEngine.kt
@@ -19,6 +19,7 @@
 
 package org.eclipse.kuksa.testapp.databroker
 
+import android.content.Context
 import org.eclipse.kuksa.CoroutineCallback
 import org.eclipse.kuksa.DataBrokerConnection
 import org.eclipse.kuksa.DisconnectListener
@@ -32,8 +33,17 @@ import org.eclipse.kuksa.testapp.model.ConnectionInfo
 interface DataBrokerEngine {
     var dataBrokerConnection: DataBrokerConnection?
 
-    fun connect(connectionInfo: ConnectionInfo, callback: CoroutineCallback<DataBrokerConnection>)
-    fun fetchProperty(property: Property, callback: CoroutineCallback<GetResponse>)
+    fun connect(
+        context: Context,
+        connectionInfo: ConnectionInfo,
+        callback: CoroutineCallback<DataBrokerConnection>,
+    )
+
+    fun fetchProperty(
+        property: Property,
+        callback: CoroutineCallback<GetResponse>,
+    )
+
     fun updateProperty(
         property: Property,
         datapoint: Datapoint,

diff --git a/app/src/main/kotlin/org/eclipse/kuksa/testapp/databroker/KotlinDataBrokerEngine.kt b/app/src/main/kotlin/org/eclipse/kuksa/testapp/databroker/KotlinDataBrokerEngine.kt
@@ -19,7 +19,7 @@
 
 package org.eclipse.kuksa.testapp.databroker
 
-import android.content.res.AssetManager
+import android.content.Context
 import androidx.lifecycle.LifecycleCoroutineScope
 import io.grpc.ChannelCredentials
 import io.grpc.Grpc
@@ -38,24 +38,23 @@ import org.eclipse.kuksa.model.Property
 import org.eclipse.kuksa.proto.v1.KuksaValV1.GetResponse
 import org.eclipse.kuksa.proto.v1.KuksaValV1.SetResponse
 import org.eclipse.kuksa.proto.v1.Types.Datapoint
-import org.eclipse.kuksa.testapp.extension.open
 import org.eclipse.kuksa.testapp.model.ConnectionInfo
 import java.io.IOException
 
 class KotlinDataBrokerEngine(
     private val lifecycleScope: LifecycleCoroutineScope,
-    private val assetManager: AssetManager,
 ) : DataBrokerEngine {
     override var dataBrokerConnection: DataBrokerConnection? = null
 
     private val disconnectListeners = mutableSetOf<DisconnectListener>()
 
     override fun connect(
+        context: Context,
         connectionInfo: ConnectionInfo,
         callback: CoroutineCallback<DataBrokerConnection>,
     ) {
         if (connectionInfo.isTlsEnabled) {
-            connectSecure(connectionInfo, callback)
+            connectSecure(context, connectionInfo, callback)
         } else {
             connectInsecure(connectionInfo, callback)
         }
@@ -78,14 +77,15 @@ class KotlinDataBrokerEngine(
     }
 
     private fun connectSecure(
+        context: Context,
         connectInfo: ConnectionInfo,
         callback: CoroutineCallback<DataBrokerConnection>,
     ) {
-        val rootCert = connectInfo.certificate
+        val certificate = connectInfo.certificate
 
         val tlsCredentials: ChannelCredentials
         try {
-            val rootCertFile = assetManager.open(rootCert)
+            val rootCertFile = context.contentResolver.openInputStream(certificate.uri)
             tlsCredentials = TlsChannelCredentials.newBuilder()
                 .trustManager(rootCertFile)
                 .build()
@@ -100,7 +100,7 @@ class KotlinDataBrokerEngine(
             val channelBuilder = Grpc
                 .newChannelBuilderForAddress(host, port, tlsCredentials)
 
-            val overrideAuthority = rootCert.overrideAuthority.trim()
+            val overrideAuthority = certificate.overrideAuthority.trim()
             val hasOverrideAuthority = overrideAuthority.isNotEmpty()
             if (hasOverrideAuthority) {
                 channelBuilder.overrideAuthority(overrideAuthority)