Merge remote-tracking branch 'origin/develop' into EXAMPLEAND-72

Author: Robert Szuba

app/build.gradle

@@ -45,7 +45,7 @@ allprojects {
 
 android {
   compileSdkVersion 29
-  buildToolsVersion '29.0.2'
+  buildToolsVersion '29.0.3'
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
@@ -54,10 +54,10 @@ android {
 
   defaultConfig {
     applicationId "com.onegini.mobile.exampleapp"
-    minSdkVersion 19
+    minSdkVersion 21
     targetSdkVersion 29
     versionCode 19
-    versionName "6.0.0"
+    versionName "6.1.0"
     multiDexEnabled true
   }
   buildTypes {
@@ -79,12 +79,12 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:10.0.1-SNAPSHOT@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:11.0.0-SNAPSHOT@aar') {
     transitive = true
   }
 
   // Rest Client
-  implementation 'com.squareup.retrofit2:adapter-rxjava:2.6.4'
+  implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0'
 
   // Google Support
   implementation 'androidx.appcompat:appcompat:1.1.0'

app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java

@@ -25,7 +25,7 @@ public class OneginiConfigModel implements OneginiClientConfigModel {
   private final String appIdentifier = "ExampleApp";
   private final String appPlatform = "android";
   private final String redirectionUri = "oneginiexample://loginsuccess";
-  private final String appVersion = "6.0.0";
+  private final String appVersion = "6.1.0";
   private final String baseURL = "https://demo-msp.onegini.com";
   private final String resourceBaseURL = "https://demo-msp.onegini.com/resources/";
   private final String keystoreHash = "b243b00e336e0b8f0c212779e0a276a382768a99706e452098ab0f3f77e8f616";

app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java

@@ -26,11 +26,6 @@
 import android.app.DialogFragment;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.appcompat.widget.SwitchCompat;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -39,11 +34,17 @@
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.appcompat.widget.SwitchCompat;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnCheckedChanged;
 import butterknife.OnClick;
 import butterknife.OnItemSelected;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.onegini.mobile.exampleapp.OneginiSDK;
 import com.onegini.mobile.exampleapp.R;
 import com.onegini.mobile.exampleapp.model.User;
@@ -178,7 +179,7 @@ private void showAvailableIdentityProvidersPopup() {
   @SuppressWarnings("unused")
   @OnClick(R.id.register_button)
   public void registerButtonClicked() {
-    if(usePreferredIdentityProviderSwitchCompat.isChecked()) {
+    if (usePreferredIdentityProviderSwitchCompat.isChecked()) {
       registerUser(null);
     } else {
       showAvailableIdentityProvidersPopup();
@@ -295,6 +296,14 @@ private void handleAuthenticationErrors(final OneginiAuthenticationError error,
         stringBuilder.append("Device deregistered.");
         new DeregistrationUtil(this).onDeviceDeregistered();
         break;
+      case OneginiAuthenticationError.AUTHENTICATOR_DEREGISTERED:
+      case OneginiAuthenticationError.AUTHENTICATOR_NOT_REGISTERED:
+      case OneginiAuthenticationError.CONFIGURATION_ERROR:
+      case OneginiAuthenticationError.CUSTOM_AUTHENTICATION_DISABLED:
+      case OneginiAuthenticationError.CUSTOM_AUTHENTICATOR_FAILURE:
+      case OneginiAuthenticationError.INVALID_AUTHENTICATOR:
+      case OneginiAuthenticationError.ACTION_ALREADY_IN_PROGRESS:
+      case OneginiAuthenticationError.DATA_STORAGE_NOT_AVAILABLE:
       case OneginiAuthenticationError.GENERAL_ERROR:
       default:
         // Just display the error for other, less relevant errors
@@ -395,6 +404,8 @@ private void handlePendingMobileRequestsErrors(final OneginiPendingMobileAuthWit
         stringBuilder.append("Device deregistered");
         new DeregistrationUtil(this).onDeviceDeregistered();
         break;
+      case OneginiPendingMobileAuthWithPushRequestError.DATA_STORAGE_NOT_AVAILABLE:
+      case OneginiPendingMobileAuthWithPushRequestError.ACTION_ALREADY_IN_PROGRESS:
       case OneginiPendingMobileAuthWithPushRequestError.GENERAL_ERROR:
       case OneginiPendingMobileAuthWithPushRequestError.CONFIGURATION_ERROR:
       default:

app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java

@@ -29,6 +29,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -162,6 +163,12 @@ private void handleRegistrationErrors(final OneginiRegistrationError oneginiRegi
       case OneginiRegistrationError.CUSTOM_REGISTRATION_FAILURE:
         showToast("Custom registration request has failed, see logcat for more details.");
         break;
+      case OneginiRegistrationError.ACTION_ALREADY_IN_PROGRESS:
+      case OneginiRegistrationError.CONFIGURATION_ERROR:
+      case OneginiRegistrationError.DEVICE_REGISTRATION_ERROR:
+      case OneginiRegistrationError.INVALID_REQUEST:
+      case OneginiRegistrationError.INVALID_STATE:
+      case OneginiRegistrationError.DATA_STORAGE_NOT_AVAILABLE:
       case OneginiRegistrationError.GENERAL_ERROR:
       default:
         // General error handling for other, less relevant errors

app/src/main/java/com/onegini/mobile/exampleapp/view/handler/CreatePinRequestHandler.java

@@ -29,6 +29,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+
 import com.onegini.mobile.exampleapp.OneginiSDK;
 import com.onegini.mobile.exampleapp.R;
 import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
@@ -114,7 +115,7 @@ public void secondPinProvided(final char[] pin) {
       }
     }
 
-    public void pinCancelled(){
+    public void pinCancelled() {
       nullifyPinArray();
       originalHandler.denyAuthenticationRequest();
     }
@@ -153,6 +154,8 @@ private void handlePinValidationError(final OneginiPinValidationError oneginiPin
         new DeregistrationUtil(context).onDeviceDeregistered();
         startLoginActivity(parseErrorMessage(oneginiPinValidationError));
         break;
+      case OneginiPinValidationError.DATA_STORAGE_NOT_AVAILABLE:
+      case OneginiPinValidationError.ACTION_ALREADY_IN_PROGRESS:
       case OneginiPinValidationError.GENERAL_ERROR:
       default:
         notifyActivity(context.getString(R.string.pin_title_choose_pin), oneginiPinValidationError.getMessage());

build.gradle

@@ -22,7 +22,7 @@ buildscript {
     google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.2'
+    classpath 'com.android.tools.build:gradle:3.6.3'
     classpath 'com.google.gms:google-services:4.3.2'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Nov 26 11:33:20 CET 2019
+#Mon May 04 17:01:20 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip