Merge pull request #17 from openconnectivity/develop

Merge develop into master

otgc/build.gradle

@@ -30,7 +30,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 13
-        versionName "2.4.0"
+        versionName "2.5.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         compileOptions {

otgc/src/main/assets/kyrio-ee-cert.pem

 -----BEGIN CERTIFICATE-----
-MIIEEzCCA7mgAwIBAgIJAI0K+3tTskzXMAoGCCqGSM49BAMCMFsxDDAKBgNVBAoM
+MIIEEzCCA7mgAwIBAgIJAI0K+3tTsk0AMAoGCCqGSM49BAMCMFsxDDAKBgNVBAoM
 A09DRjEiMCAGA1UECwwZS3lyaW8gVGVzdCBJbmZyYXN0cnVjdHVyZTEnMCUGA1UE
-AwweS3lyaW8gVEVTVCBJbnRlcm1lZGlhdGUgQ0EwMDAyMB4XDTE5MDkyMzA5MjUx
-OFoXDTE5MTAyMzA5MjUxOFowYTEMMAoGA1UECgwDT0NGMSIwIAYDVQQLDBlLeXJp
+AwweS3lyaW8gVEVTVCBJbnRlcm1lZGlhdGUgQ0EwMDAyMB4XDTE5MTAyNDA5NDg1
+NFoXDTE5MTEyMzA5NDg1NFowYTEMMAoGA1UECgwDT0NGMSIwIAYDVQQLDBlLeXJp
 byBUZXN0IEluZnJhc3RydWN0dXJlMS0wKwYDVQQDDCQxZTFiZWJmYi04ZjAzLTQ3
-ODUtNWZhNy0xYjcwNGU2NTQzNjAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQj
-V7MJwkO4J4PWR4KgbVHrFHSQipHMRNu704OPmnAQQ3tnEhjnYxn0TODDvN8YekE5
-voDDOX98mYpxhPa5hz52o4ICXjCCAlowCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMC
+ODUtNWZhNy0xYjcwNGU2NTQzNjAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATW
+d0t/5GahEMUSb8dhaOIZdTDHDTelbWWfjSxA6OhcMy1uKGewCg7e2R2ZTK7ZM/th
+KSXuMywN0JXA6BoW9on8o4ICXjCCAlowCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMC
 A4gwKQYDVR0lBCIwIAYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYLefAEGMB0G
-A1UdDgQWBBRjlMq7Dkw3IN1X1CTuDLEITgjQGTAfBgNVHSMEGDAWgBQZc2oEGgsH
+A1UdDgQWBBS+4P5iaPJfppBg66266sma6Ffe9jAfBgNVHSMEGDAWgBQZc2oEGgsH
 cE9TeVM2h/wMunyuCzCBlgYIKwYBBQUHAQEEgYkwgYYwXQYIKwYBBQUHMAKGUWh0
 dHA6Ly90ZXN0cGtpLmt5cmlvLmNvbS9vY2YvY2FjZXJ0cy9CQkU2NEY5QTdFRTM3
 RDI5QTA1RTRCQjc3NTk1RjMwOEJFNDFFQjA3LmNydDAlBggrBgEFBQcwAYYZaHR0
@@ -19,6 +19,6 @@ AjBgBgorBgEEAYORVgEABFIwUDAJAgECAgEAAgEAMDYMGTEuMy42LjEuNC4xLjUx
 NDE0LjAuMC4xLjAMGTEuMy42LjEuNC4xLjUxNDE0LjAuMC4yLjAMBE9UR0MMBURF
 S1JBMCoGCisGAQQBg5FWAQEEHDAaBgsrBgEEAYORVgEBAAYLKwYBBAGDkVYBAQEw
 MAYKKwYBBAGDkVYBAgQiMCAMDjEuMy42LjEuNC4xLjcxDAlEaXNjb3ZlcnkMAzEu
-MDAKBggqhkjOPQQDAgNIADBFAiBLKD1R5LUOUJdMq2VWlzbzpZjvLeN1CFQIPS4y
-cjbm9wIhANmGPf7y8/s/fKWy/dEaIGjo79lButKOe0JWZaburW3P
+MDAKBggqhkjOPQQDAgNIADBFAiEA3Ay4oPSGwARJWub9/k58xiqARpRKjCDaGGZi
+mHTurqYCIC/e7Y9NAMiweZZ2JaGAYXC7T8YTqAFneT9jaq2o3c9m
 -----END CERTIFICATE-----

otgc/src/main/assets/kyrio-ee-key.pem

+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIChO1xeRf0WA/npKbjLKPzlnTDhE7v95O5ZG2fhZbBjLoAoGCCqGSM49
-AwEHoUQDQgAEI1ezCcJDuCeD1keCoG1R6xR0kIqRzETbu9ODj5pwEEN7ZxIY52MZ
-9Ezgw7zfGHpBOb6Awzl/fJmKcYT2uYc+dg==
+MHcCAQEEIDUCAKRYHFbz7MVYj4LASsOxX54sYcVNbE4MLwIa/0j/oAoGCCqGSM49
+AwEHoUQDQgAE1ndLf+RmoRDFEm/HYWjiGXUwxw03pW1ln40sQOjoXDMtbihnsAoO
+3tkdmUyu2TP7YSkl7jMsDdCVwOgaFvaJ/A==
 -----END EC PRIVATE KEY-----

otgc/src/main/java/org/openconnectivity/otgc/data/repository/IORepository.java

@@ -147,6 +147,9 @@ public class IORepository {
             } catch (IOException e) {
                 Timber.e("%s file storage failed", path);
                 emitter.onError(e);
+            } catch (Exception e) {
+                Timber.e(e.getMessage());
+                emitter.onError(e);
             }
         });
     }

otgc/src/main/java/org/openconnectivity/otgc/view/trustanchor/TrustAnchorActivity.java

@@ -25,6 +25,7 @@ import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ProgressBar;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -238,7 +239,16 @@ public class TrustAnchorActivity extends AppCompatActivity implements Injectable
     }
 
     private void handleError(@NonNull ViewModelError error) {
-        // TODO:
+        int errorId = -1;
+        switch ((TrustAnchorViewModel.Error)error.getType()) {
+            case ADD_ROOT_CERT:
+                errorId = R.string.trust_anchor_create_error;
+                break;
+        }
+
+        if (errorId != 0) {
+            Toast.makeText(this, errorId, Toast.LENGTH_SHORT).show();
+        }
     }
 
     private void processCredential(@NonNull OcCredential credential) {

otgc/src/main/java/org/openconnectivity/otgc/viewmodel/TrustAnchorViewModel.java

@@ -12,6 +12,7 @@ import org.openconnectivity.otgc.domain.usecase.trustanchor.RemoveTrustAnchorByC
 import org.openconnectivity.otgc.domain.usecase.trustanchor.StoreTrustAnchorUseCase;
 import org.openconnectivity.otgc.utils.rx.SchedulersFacade;
 import org.openconnectivity.otgc.utils.viewmodel.ViewModelError;
+import org.openconnectivity.otgc.utils.viewmodel.ViewModelErrorType;
 
 import java.io.File;
 
@@ -90,7 +91,7 @@ public class TrustAnchorViewModel extends ViewModel {
             .observeOn(schedulersFacade.ui())
             .subscribe(
                     () -> retrieveTrustAnchors(),
-                    throwable -> {}
+                    throwable -> mError.setValue(new ViewModelError(Error.ADD_ROOT_CERT, throwable.getMessage()))
             ));
     }
 
@@ -103,4 +104,8 @@ public class TrustAnchorViewModel extends ViewModel {
                     throwable -> {}
             ));
     }
+
+    public enum Error implements ViewModelErrorType {
+        ADD_ROOT_CERT
+    }
 }

otgc/src/main/res/values-es/strings.xml

@@ -166,6 +166,7 @@
     <string name="credentials_cardview_role">ID de rol: %1$s, Autoridad de rol: %2$s</string>
     <string name="credentials_cardview_credid">ID Credencial: %1$s</string>
     <string name="credentials_cardview_credusage">Uso: %1$s</string>
+    <string name="trust_anchor_create_error">No se puede almacenar el certificado raíz desde la ubicación seleccionada</string>
     <string name="devices_dialog_wifi_scan_error">Error escaneando las redes Wi-Fi</string>
     <string name="devices_dialog_wifi_easy_setup_connecting">Configurando y conectado el dispositivo mediante Wi-Fi Easy Setup</string>
     <string name="devices_dialog_wifi_easy_setup_error">Wi-Fi Easy Setup ha fallado</string>

otgc/src/main/res/values/strings.xml

@@ -216,6 +216,7 @@
     <string name="credentials_cardview_credid">Credential ID: %1$s</string>
     <string name="credentials_cardview_credusage">Usage: %1$s</string>
     <string name="credentials_cardview_role">Role ID: %1$s, Role Authority: %2$s</string>
+    <string name="trust_anchor_create_error">Cannot store the root certificate from the selected location</string>
 
     <string name="client_title_no_name">Unnamed</string>
     <string name="client_menu_item_info">Info</string>