Merge pull request #285 from martenrebane/MOPPAND-942

Fixed Mobile-ID signing

Author: kristelmerilain

app/src/main/java/ee/ria/DigiDoc/android/signature/update/SignatureAddSource.java

@@ -1,7 +1,6 @@
 package ee.ria.DigiDoc.android.signature.update;
 
 import java.io.File;
-import java.nio.charset.StandardCharsets;
 
 import javax.inject.Inject;
 
@@ -19,11 +18,12 @@
 import ee.ria.DigiDoc.android.signature.update.smartid.SmartIdOnSubscribe;
 import ee.ria.DigiDoc.android.signature.update.smartid.SmartIdRequest;
 import ee.ria.DigiDoc.android.signature.update.smartid.SmartIdResponse;
+import ee.ria.DigiDoc.android.utils.LocaleService;
 import ee.ria.DigiDoc.android.utils.navigator.Navigator;
 import ee.ria.DigiDoc.idcard.CodeVerificationException;
 import ee.ria.DigiDoc.mobileid.dto.response.MobileCreateSignatureSessionStatusResponse;
-import ee.ria.DigiDoc.smartid.dto.response.SessionStatusResponse;
 import ee.ria.DigiDoc.sign.SignedContainer;
+import ee.ria.DigiDoc.smartid.dto.response.SessionStatusResponse;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
@@ -36,16 +36,19 @@ final class SignatureAddSource {
     private final SignatureContainerDataSource signatureContainerDataSource;
     private final SettingsDataStore settingsDataStore;
     private final IdCardService idCardService;
+    private final LocaleService localeService;
 
     private static final String EMPTY_VALUE = "";
 
     @Inject SignatureAddSource(Navigator navigator,
                                SignatureContainerDataSource signatureContainerDataSource,
-                               SettingsDataStore settingsDataStore, IdCardService idCardService) {
+                               SettingsDataStore settingsDataStore, IdCardService idCardService,
+                               LocaleService localeService) {
         this.navigator = navigator;
         this.signatureContainerDataSource = signatureContainerDataSource;
         this.settingsDataStore = settingsDataStore;
         this.idCardService = idCardService;
+        this.localeService = localeService;
     }
 
     Observable<Result.SignatureAddResult> show(int method) {
@@ -83,7 +86,8 @@ Observable<? extends SignatureAddResponse> sign(File containerFile,
             return signatureContainerDataSource
                     .get(containerFile)
                     .flatMapObservable(container ->
-                            Observable.create(new MobileIdOnSubscribe(navigator, container, settingsDataStore.getLocale(),
+                            Observable.create(new MobileIdOnSubscribe(navigator, container,
+                                            localeService.applicationLocale(),
                                     settingsDataStore.getUuid(), mobileIdRequest.personalCode(),
                                     mobileIdRequest.phoneNo())))
                     .switchMap(response -> {

app/src/main/java/ee/ria/DigiDoc/android/signature/update/mobileid/MobileCreateSignatureRequestHelper.java

@@ -1,5 +1,7 @@
 package ee.ria.DigiDoc.android.signature.update.mobileid;
 
+import android.util.Log;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
@@ -11,6 +13,7 @@
 import ee.ria.DigiDoc.mobileid.dto.request.MobileCreateSignatureRequest;
 import ee.ria.DigiDoc.sign.Signature;
 import ee.ria.DigiDoc.sign.SignedContainer;
+import timber.log.Timber;
 
 final class MobileCreateSignatureRequestHelper {
 
@@ -62,6 +65,7 @@ private static String getLanguage(Locale locale) {
             String language = locale.getISO3Language().toUpperCase();
             return SUPPORTED_LANGUAGES.contains(language) ? language : DEFAULT_LANGUAGE;
         } catch (Exception e) {
+            Timber.log(Log.ERROR, "Unable to get language from locale", e);
             return DEFAULT_LANGUAGE;
         }
     }

gradle.properties

@@ -1,5 +1,5 @@
-appVersionCode=40
-appVersionName=2.4.6
+appVersionCode=41
+appVersionName=2.4.7
 
 appAbiFilters=arm64-v8a;armeabi-v7a;x86;x86_64