From 6402a29e575c1e21ebe3616bcfaef9f6ddb375ed Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Fri, 15 Dec 2017 13:52:36 +0100
Subject: [PATCH 01/31] SDKAND-533 Remove fido related classes

---
 app/build.gradle                              |  6 +-
 app/proguard-rules-onegini-sdk.pro            |  3 -
 app/src/main/AndroidManifest.xml              | 12 ---
 .../onegini/mobile/exampleapp/OneginiSDK.java |  4 -
 .../view/activity/FidoActivity.java           | 84 -------------------
 .../MobileAuthenticationFidoActivity.java     | 49 -----------
 .../FidoAuthenticationRequestHandler.java     | 63 --------------
 ...obileAuthenticationFidoRequestHandler.java | 71 ----------------
 .../OneginiAuthenticatorComperator.java       | 10 +--
 app/src/main/res/layout/activity_fido.xml     | 54 ------------
 app/src/main/res/values/strings.xml           |  2 -
 11 files changed, 10 insertions(+), 348 deletions(-)
 delete mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FidoActivity.java
 delete mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFidoActivity.java
 delete mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FidoAuthenticationRequestHandler.java
 delete mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFidoRequestHandler.java
 delete mode 100644 app/src/main/res/layout/activity_fido.xml

diff --git a/app/build.gradle b/app/build.gradle
index ba01b220..c577f9f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,7 +59,11 @@ android {
   }
   buildTypes {
     release {
-      minifyEnabled false
+      minifyEnabled true
+      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-onegini-sdk.pro', 'proguard-rules-example-app.pro'
+    }
+    debug {
+      minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-onegini-sdk.pro', 'proguard-rules-example-app.pro'
     }
   }
diff --git a/app/proguard-rules-onegini-sdk.pro b/app/proguard-rules-onegini-sdk.pro
index 54572e47..0f074783 100644
--- a/app/proguard-rules-onegini-sdk.pro
+++ b/app/proguard-rules-onegini-sdk.pro
@@ -39,9 +39,6 @@
     @retrofit2.http.* <methods>;
 }
 
-# Samsung FIDO
--keep class com.samsung.sds.fido.** { *; }
--dontwarn com.samsung.sds.fido.**
 -dontnote **
 
 # SQLCipher
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f17e5573..b189f5d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
           package="com.onegini.mobile.exampleapp">
 
-    <uses-permission android:name="org.fidoalliance.uaf.permissions.FIDO_CLIENT"/>
-
     <application
         android:name=".ExampleApplication"
         android:allowBackup="false"
@@ -62,10 +60,6 @@
             android:name=".view.activity.FingerprintActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.FidoActivity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTask"/>
         <activity
             android:name=".view.activity.CustomAuthActivity"
             android:screenOrientation="portrait"
@@ -99,12 +93,6 @@
             android:taskAffinity=""
             android:excludeFromRecents="true"
             android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.MobileAuthenticationFidoActivity"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:excludeFromRecents="true"
-            android:screenOrientation="portrait"/>
         <activity
             android:name=".view.activity.MobileAuthenticationCustomActivity"
             android:launchMode="singleTask"
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index 01db04af..97ebd7c4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -22,11 +22,9 @@
 import com.onegini.mobile.exampleapp.model.BasicCustomAuthenticator;
 import com.onegini.mobile.exampleapp.view.handler.BasicCustomAuthenticationRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.CreatePinRequestHandler;
-import com.onegini.mobile.exampleapp.view.handler.FidoAuthenticationRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.FingerprintAuthenticationRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.MobileAuthOtpRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.MobileAuthenticationBasicCustomRequestHandler;
-import com.onegini.mobile.exampleapp.view.handler.MobileAuthenticationFidoRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.MobileAuthenticationFingerprintRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.MobileAuthenticationPinRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.MobileAuthenticationRequestHandler;
@@ -56,12 +54,10 @@ private static OneginiClient buildSDK(final Context context) {
     return new OneginiClientBuilder(applicationContext, registrationRequestHandler, createPinRequestHandler, pinAuthenticationRequestHandler)
         // handlers for optional functionalities
         .setFingerprintAuthenticatioRequestHandler(new FingerprintAuthenticationRequestHandler(applicationContext))
-        .setFidoAuthenticationRequestHandler(new FidoAuthenticationRequestHandler(applicationContext))
         .setCustomAuthenticationRequestHandler(new BasicCustomAuthenticationRequestHandler(applicationContext))
         .setMobileAuthWithPushRequestHandler(new MobileAuthenticationRequestHandler(applicationContext))
         .setMobileAuthWithPushPinRequestHandler(new MobileAuthenticationPinRequestHandler(applicationContext))
         .setMobileAuthWithPushFingerprintRequestHandler(new MobileAuthenticationFingerprintRequestHandler(applicationContext))
-        .setMobileAuthWithPushFidoRequestHandler(new MobileAuthenticationFidoRequestHandler(applicationContext))
         .setMobileAuthWithPushCustomRequestHandler(new MobileAuthenticationBasicCustomRequestHandler(applicationContext))
         .setMobileAuthWithOtpRequestHandler(new MobileAuthOtpRequestHandler())
         .addCustomAuthenticator(basicCustomAuthenticator)
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FidoActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FidoActivity.java
deleted file mode 100644
index f8b4ca39..00000000
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FidoActivity.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2016-2017 Onegini B.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.onegini.mobile.exampleapp.view.activity;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import com.onegini.mobile.exampleapp.R;
-import com.onegini.mobile.exampleapp.view.handler.FidoAuthenticationRequestHandler;
-
-public class FidoActivity extends AuthenticationActivity {
-
-  @BindView(R.id.content_accept_deny)
-  LinearLayout layoutAcceptDeny;
-  @BindView(R.id.fallback_to_pin_button)
-  Button fallbackToPinButton;
-  @BindView(R.id.fido_progressbar)
-  ProgressBar progressBar;
-
-  @Override
-  protected void onCreate(final Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_fido);
-    ButterKnife.bind(this);
-    initialize();
-  }
-
-  @SuppressWarnings("unused")
-  @OnClick(R.id.auth_accept_button)
-  public void onAcceptClicked() {
-    if (FidoAuthenticationRequestHandler.CALLBACK != null) {
-      FidoAuthenticationRequestHandler.CALLBACK.acceptAuthenticationRequest();
-      setFidoAuthenticationPermissionVisibility(false);
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @OnClick(R.id.auth_deny_button)
-  public void onDenyClicked() {
-    if (FidoAuthenticationRequestHandler.CALLBACK != null) {
-      FidoAuthenticationRequestHandler.CALLBACK.denyAuthenticationRequest();
-    }
-  }
-
-
-  @SuppressWarnings("unused")
-  @OnClick(R.id.fallback_to_pin_button)
-  public void onFallbackClicked() {
-    if (FidoAuthenticationRequestHandler.CALLBACK != null) {
-      FidoAuthenticationRequestHandler.CALLBACK.fallbackToPin();
-    }
-  }
-
-  protected void initialize() {
-    parseIntent();
-    updateTexts();
-    setFidoAuthenticationPermissionVisibility(true);
-  }
-
-  protected void setFidoAuthenticationPermissionVisibility(final boolean isVisible) {
-    layoutAcceptDeny.setVisibility(isVisible ? View.VISIBLE : View.GONE);
-    fallbackToPinButton.setVisibility(isVisible ? View.VISIBLE : View.GONE);
-    progressBar.setVisibility(isVisible ? View.GONE : View.VISIBLE);
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFidoActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFidoActivity.java
deleted file mode 100644
index cb33804d..00000000
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFidoActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2016-2017 Onegini B.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.onegini.mobile.exampleapp.view.activity;
-
-import butterknife.OnClick;
-import com.onegini.mobile.exampleapp.R;
-import com.onegini.mobile.exampleapp.view.handler.MobileAuthenticationFidoRequestHandler;
-
-public class MobileAuthenticationFidoActivity extends FidoActivity {
-
-  @SuppressWarnings("unused")
-  @OnClick(R.id.auth_accept_button)
-  public void onAcceptClicked() {
-    if (MobileAuthenticationFidoRequestHandler.CALLBACK != null) {
-      MobileAuthenticationFidoRequestHandler.CALLBACK.acceptAuthenticationRequest();
-      setFidoAuthenticationPermissionVisibility(false);
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @OnClick(R.id.auth_deny_button)
-  public void onDenyClicked() {
-    if (MobileAuthenticationFidoRequestHandler.CALLBACK != null) {
-      MobileAuthenticationFidoRequestHandler.CALLBACK.denyAuthenticationRequest();
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @OnClick(R.id.fallback_to_pin_button)
-  public void onFallbackClicked() {
-    if (MobileAuthenticationFidoRequestHandler.CALLBACK != null) {
-      MobileAuthenticationFidoRequestHandler.CALLBACK.fallbackToPin();
-    }
-  }
-}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FidoAuthenticationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FidoAuthenticationRequestHandler.java
deleted file mode 100644
index eeaeb873..00000000
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FidoAuthenticationRequestHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2016-2017 Onegini B.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.onegini.mobile.exampleapp.view.handler;
-
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static com.onegini.mobile.exampleapp.Constants.COMMAND_FINISH;
-import static com.onegini.mobile.exampleapp.Constants.COMMAND_START;
-import static com.onegini.mobile.exampleapp.Constants.EXTRA_COMMAND;
-import static com.onegini.mobile.exampleapp.view.activity.AuthenticationActivity.EXTRA_USER_PROFILE_ID;
-
-import android.content.Context;
-import android.content.Intent;
-import com.onegini.mobile.exampleapp.view.activity.FidoActivity;
-import com.onegini.mobile.sdk.android.handlers.request.OneginiFidoAuthenticationRequestHandler;
-import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiFidoCallback;
-import com.onegini.mobile.sdk.android.model.entity.UserProfile;
-
-public class FidoAuthenticationRequestHandler implements OneginiFidoAuthenticationRequestHandler {
-
-  public static OneginiFidoCallback CALLBACK;
-
-  private String userProfileId;
-
-  private final Context context;
-
-  public FidoAuthenticationRequestHandler(final Context context) {
-    this.context = context;
-  }
-
-  @Override
-  public void startAuthentication(final UserProfile userProfile, final OneginiFidoCallback oneginiFidoCallback) {
-    CALLBACK = oneginiFidoCallback;
-    userProfileId = userProfile.getProfileId();
-    notifyActivity(COMMAND_START);
-  }
-
-  @Override
-  public void finishAuthentication() {
-    notifyActivity(COMMAND_FINISH);
-  }
-
-  private void notifyActivity(final String command) {
-    final Intent intent = new Intent(context, FidoActivity.class);
-    intent.putExtra(EXTRA_COMMAND, command);
-    intent.putExtra(EXTRA_USER_PROFILE_ID, userProfileId);
-    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
-    context.startActivity(intent);
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFidoRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFidoRequestHandler.java
deleted file mode 100644
index af344368..00000000
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFidoRequestHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2016-2017 Onegini B.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.onegini.mobile.exampleapp.view.handler;
-
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static com.onegini.mobile.exampleapp.Constants.COMMAND_FINISH;
-import static com.onegini.mobile.exampleapp.Constants.COMMAND_START;
-import static com.onegini.mobile.exampleapp.Constants.EXTRA_COMMAND;
-import static com.onegini.mobile.exampleapp.view.activity.AuthenticationActivity.EXTRA_USER_PROFILE_ID;
-import static com.onegini.mobile.exampleapp.view.activity.MobileAuthenticationFidoActivity.EXTRA_MESSAGE;
-
-import android.content.Context;
-import android.content.Intent;
-import com.onegini.mobile.exampleapp.view.activity.MobileAuthenticationFidoActivity;
-import com.onegini.mobile.sdk.android.handlers.request.OneginiMobileAuthWithPushFidoRequestHandler;
-import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiFidoCallback;
-import com.onegini.mobile.sdk.android.model.entity.OneginiMobileAuthenticationRequest;
-
-public class MobileAuthenticationFidoRequestHandler implements OneginiMobileAuthWithPushFidoRequestHandler {
-
-  public static OneginiFidoCallback CALLBACK;
-
-  private final Context context;
-  private String userProfileId;
-  private String message;
-
-  public MobileAuthenticationFidoRequestHandler(final Context context) {
-    this.context = context;
-  }
-
-  @Override
-  public void startAuthentication(final OneginiMobileAuthenticationRequest oneginiMobileAuthenticationRequest, final OneginiFidoCallback oneginiFidoCallback) {
-    CALLBACK = oneginiFidoCallback;
-    userProfileId = oneginiMobileAuthenticationRequest.getUserProfile().getProfileId();
-    message = oneginiMobileAuthenticationRequest.getMessage();
-    notifyActivity(COMMAND_START);
-  }
-
-  @Override
-  public void finishAuthentication() {
-    notifyActivity(COMMAND_FINISH);
-  }
-
-  private void notifyActivity(final String command) {
-    final Intent intent = prepareActivityIntent(command);
-    context.startActivity(intent);
-  }
-
-  private Intent prepareActivityIntent(final String command) {
-    final Intent intent = new Intent(context, MobileAuthenticationFidoActivity.class);
-    intent.putExtra(EXTRA_COMMAND, command);
-    intent.putExtra(EXTRA_USER_PROFILE_ID, userProfileId);
-    intent.putExtra(EXTRA_MESSAGE, message);
-    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
-    return intent;
-  }
-}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java
index ecc50d31..442f8c74 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java
@@ -24,7 +24,7 @@
  * Order provided authenticators in following order:
  * 1. PIN authenticator
  * 2. Android fingerprint authenticator
- * 3. FIDO authenticators ordered by name
+ * 3. Custom authenticators ordered by name
  */
 public class OneginiAuthenticatorComperator implements Comparator<OneginiAuthenticator> {
 
@@ -43,22 +43,22 @@ private int compareByType(final int o1, final int o2) {
       return 0;
     }
 
-    // o1 == PIN && o2 == FINGERPRINT || FIDO
+    // o1 == PIN && o2 == FINGERPRINT || CUSTOM
     if (o1 == OneginiAuthenticator.PIN) {
       return -1;
     }
 
-    // o2 == PIN && o1 == FINGERPRINT || FIDO
+    // o2 == PIN && o1 == FINGERPRINT || CUSTOM
     if (o2 == OneginiAuthenticator.PIN) {
       return 1;
     }
 
-    // o1 == FINGERPRINT && o2 == FIDO
+    // o1 == FINGERPRINT && o2 == CUSTOM
     if (o1 == OneginiAuthenticator.FINGERPRINT) {
       return -1;
     }
 
-    // o2 == FINGERPRINT && o1 == FIDO
+    // o2 == FINGERPRINT && o1 == CUSTOM
     return 1;
   }
 
diff --git a/app/src/main/res/layout/activity_fido.xml b/app/src/main/res/layout/activity_fido.xml
deleted file mode 100644
index 35dac863..00000000
--- a/app/src/main/res/layout/activity_fido.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2016-2017 Onegini B.V.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/welcome_user_text"
-        layout="@layout/view_welcome_user_text"/>
-
-    <TextView
-        android:id="@+id/authenticator_message"
-        android:text="@string/do_you_want_to_confirm_with_fido"
-        android:layout_below="@id/welcome_user_text"
-        style="@style/AuthenticatorMessageStyle"/>
-
-    <include
-        layout="@layout/view_auth_accept_deny_buttons"
-        android:layout_below="@+id/authenticator_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <ProgressBar
-        android:id="@+id/fido_progressbar"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:visibility="gone"/>
-
-    <Button
-        android:id="@+id/fallback_to_pin_button"
-        style="@style/ButtonStyle"
-        android:layout_marginBottom="24dp"
-        android:text="@string/use_pin_authentication"
-        android:layout_alignParentBottom="true"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8949194..f61b3e16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,8 +33,6 @@
     <string name="btn_your_devices">Your devices</string>
     <string name="confirm">Confirm</string>
     <string name="confirm_with_fingerprint">Confirm with fingerprint</string>
-    <string name="confirm_with_fido">Authenticate with FIDO</string>
-    <string name="do_you_want_to_confirm_with_fido">Do you want to authenticate with FIDO?</string>
     <string name="scan_fingerprint">Touch sensor</string>
     <string name="use_pin_authentication">Use PIN code</string>
     <string name="try_again">Try again…</string>

From 48e7bafab027eae9d371a89496a90b9fc370b7b3 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 19 Dec 2017 12:54:30 +0100
Subject: [PATCH 02/31] bump sdk to next development version

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f6aec459..c988c445 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,7 +76,7 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:8.1.0@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:8.1.1-SNAPSHOT@aar') {
     transitive = true
   }
 

From 744ddacf02f351b31b411bfb6fc2330874a6f5b5 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Thu, 21 Dec 2017 08:30:24 +0100
Subject: [PATCH 03/31] SDKAND-533 remove code minification for the debug build
 because of the instant run issues

---
 app/build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 75757026..bcd365f0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,10 +62,6 @@ android {
       minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-onegini-sdk.pro', 'proguard-rules-example-app.pro'
     }
-    debug {
-      minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-onegini-sdk.pro', 'proguard-rules-example-app.pro'
-    }
   }
   dexOptions {
     javaMaxHeapSize "4g"

From f5166e4a7c6813c46720b21ea6a16a4b2608448f Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Wed, 3 Jan 2018 15:29:33 +0100
Subject: [PATCH 04/31] EXAMPLEAND-41 Add second dummy custom authenticator

---
 .../onegini/mobile/exampleapp/OneginiSDK.java | 15 ++++-
 .../model/PasswordCustomAuthenticator.java    | 58 +++++++++++++++++++
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index 97ebd7c4..1aab334b 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -16,10 +16,13 @@
 
 package com.onegini.mobile.exampleapp;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import android.content.Context;
 import com.onegini.mobile.exampleapp.model.BasicCustomAuthenticator;
+import com.onegini.mobile.exampleapp.model.PasswordCustomAuthenticator;
 import com.onegini.mobile.exampleapp.view.handler.BasicCustomAuthenticationRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.CreatePinRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.FingerprintAuthenticationRequestHandler;
@@ -32,6 +35,7 @@
 import com.onegini.mobile.exampleapp.view.handler.RegistrationRequestHandler;
 import com.onegini.mobile.sdk.android.client.OneginiClient;
 import com.onegini.mobile.sdk.android.client.OneginiClientBuilder;
+import com.onegini.mobile.sdk.android.model.OneginiCustomAuthenticator;
 
 public class OneginiSDK {
 
@@ -48,7 +52,6 @@ private static OneginiClient buildSDK(final Context context) {
     final RegistrationRequestHandler registrationRequestHandler = new RegistrationRequestHandler(applicationContext);
     final CreatePinRequestHandler createPinRequestHandler = new CreatePinRequestHandler(applicationContext);
     final PinAuthenticationRequestHandler pinAuthenticationRequestHandler = new PinAuthenticationRequestHandler(applicationContext);
-    final BasicCustomAuthenticator basicCustomAuthenticator = new BasicCustomAuthenticator(applicationContext);
 
     // will throw OneginiConfigNotFoundException if OneginiConfigModel class can't be found
     return new OneginiClientBuilder(applicationContext, registrationRequestHandler, createPinRequestHandler, pinAuthenticationRequestHandler)
@@ -60,10 +63,18 @@ private static OneginiClient buildSDK(final Context context) {
         .setMobileAuthWithPushFingerprintRequestHandler(new MobileAuthenticationFingerprintRequestHandler(applicationContext))
         .setMobileAuthWithPushCustomRequestHandler(new MobileAuthenticationBasicCustomRequestHandler(applicationContext))
         .setMobileAuthWithOtpRequestHandler(new MobileAuthOtpRequestHandler())
-        .addCustomAuthenticator(basicCustomAuthenticator)
+        // add custom authenticators
+        .setCustomAuthenticators(prepareCustomAuthenticators(applicationContext))
         // Set http connect / read timeout
         .setHttpConnectTimeout((int) TimeUnit.SECONDS.toMillis(5))
         .setHttpReadTimeout((int) TimeUnit.SECONDS.toMillis(20))
         .build();
   }
+
+  private static Set<OneginiCustomAuthenticator> prepareCustomAuthenticators(final Context applicationContext) {
+    final Set<OneginiCustomAuthenticator> authenticators = new HashSet<>(2);
+    authenticators.add(new BasicCustomAuthenticator(applicationContext));
+    authenticators.add(new PasswordCustomAuthenticator(applicationContext));
+    return authenticators;
+  }
 }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
new file mode 100644
index 00000000..9e086f9f
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016-2018 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.model;
+
+import android.content.Context;
+import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthAuthenticationAction;
+import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthDeregistrationAction;
+import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
+import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
+import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.model.OneginiCustomAuthenticator;
+
+public class PasswordCustomAuthenticator implements OneginiCustomAuthenticator {
+
+  private final OneginiCustomAuthRegistrationAction registrationAction;
+  private final OneginiCustomAuthDeregistrationAction deregistrationAction;
+  private final OneginiCustomAuthAuthenticationAction authAuthenticationAction;
+
+  public PasswordCustomAuthenticator(final Context context) {
+    registrationAction = new BasicCustomAuthRegistrationAction(context);
+    deregistrationAction = new BasicCustomAuthDeregistrationAction(context);
+    authAuthenticationAction = new BasicCustomAuthAuthenticationAction(context);
+  }
+
+  @Override
+  public OneginiCustomAuthRegistrationAction getRegistrationAction() {
+    return registrationAction;
+  }
+
+  @Override
+  public OneginiCustomAuthDeregistrationAction getDeregistrationAction() {
+    return deregistrationAction;
+  }
+
+  @Override
+  public OneginiCustomAuthAuthenticationAction getAuthenticationAction() {
+    return authAuthenticationAction;
+  }
+
+  @Override
+  public String getId() {
+    return "PASSWORD_CA_ID";
+  }
+}

From f5b0d215717912f54646fdc056df933dbefd47bb Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Wed, 3 Jan 2018 16:25:06 +0100
Subject: [PATCH 05/31] EXAMPLEAND-41 Separate actions for password
 authentiator

---
 .../model/BasicCustomAuthenticator.java       |  6 +--
 .../model/PasswordCustomAuthenticator.java    | 12 ++---
 .../BasicCustomAuthAuthenticationAction.java  |  2 +-
 .../BasicCustomAuthDeregistrationAction.java  |  2 +-
 .../BasicCustomAuthRegistrationAction.java    |  2 +-
 ...asswordCustomAuthAuthenticationAction.java | 44 ++++++++++++++++++
 ...asswordCustomAuthDeregistrationAction.java | 44 ++++++++++++++++++
 .../PasswordCustomAuthRegistrationAction.java | 45 +++++++++++++++++++
 .../activity/BasicAuthenticatorActivity.java  |  2 +-
 ...icAuthenticatorAuthenticationActivity.java |  2 +-
 ...icAuthenticatorDeregistrationActivity.java |  2 +-
 ...asicAuthenticatorRegistrationActivity.java |  2 +-
 ...n.xml => activity_basic_authenticator.xml} |  0
 13 files changed, 149 insertions(+), 16 deletions(-)
 rename app/src/main/java/com/onegini/mobile/exampleapp/view/action/{ => basicauth}/BasicCustomAuthAuthenticationAction.java (96%)
 rename app/src/main/java/com/onegini/mobile/exampleapp/view/action/{ => basicauth}/BasicCustomAuthDeregistrationAction.java (96%)
 rename app/src/main/java/com/onegini/mobile/exampleapp/view/action/{ => basicauth}/BasicCustomAuthRegistrationAction.java (96%)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
 rename app/src/main/res/layout/{activity_custom_auth_registration.xml => activity_basic_authenticator.xml} (100%)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
index f666be89..f9a2633f 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
@@ -17,9 +17,9 @@
 package com.onegini.mobile.exampleapp.model;
 
 import android.content.Context;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthAuthenticationAction;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthDeregistrationAction;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthRegistrationAction;
+import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthAuthenticationAction;
+import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthDeregistrationAction;
+import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
index 9e086f9f..3dd414cc 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
@@ -16,9 +16,9 @@
 package com.onegini.mobile.exampleapp.model;
 
 import android.content.Context;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthAuthenticationAction;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthDeregistrationAction;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthRegistrationAction;
+import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthAuthenticationAction;
+import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthDeregistrationAction;
+import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
@@ -31,9 +31,9 @@ public class PasswordCustomAuthenticator implements OneginiCustomAuthenticator {
   private final OneginiCustomAuthAuthenticationAction authAuthenticationAction;
 
   public PasswordCustomAuthenticator(final Context context) {
-    registrationAction = new BasicCustomAuthRegistrationAction(context);
-    deregistrationAction = new BasicCustomAuthDeregistrationAction(context);
-    authAuthenticationAction = new BasicCustomAuthAuthenticationAction(context);
+    registrationAction = new PasswordCustomAuthRegistrationAction(context);
+    deregistrationAction = new PasswordCustomAuthDeregistrationAction(context);
+    authAuthenticationAction = new PasswordCustomAuthAuthenticationAction(context);
   }
 
   @Override
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
similarity index 96%
rename from app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthAuthenticationAction.java
rename to app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
index d48a1d6e..7dbfb9f9 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthAuthenticationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.onegini.mobile.exampleapp.view.action;
+package com.onegini.mobile.exampleapp.view.action.basicauth;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
similarity index 96%
rename from app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthDeregistrationAction.java
rename to app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
index 39cfe2fb..2adc778f 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthDeregistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.onegini.mobile.exampleapp.view.action;
+package com.onegini.mobile.exampleapp.view.action.basicauth;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
similarity index 96%
rename from app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthRegistrationAction.java
rename to app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
index 059251fd..8a1100e8 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/BasicCustomAuthRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.onegini.mobile.exampleapp.view.action;
+package com.onegini.mobile.exampleapp.view.action.basicauth;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
new file mode 100644
index 00000000..d8cfa2c8
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.view.action.passwordauth;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Context;
+import android.content.Intent;
+import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorAuthenticationActivity;
+import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
+import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthAuthenticationCallback;
+
+public class PasswordCustomAuthAuthenticationAction implements OneginiCustomAuthAuthenticationAction {
+  public static OneginiCustomAuthAuthenticationCallback CALLBACK;
+
+  private final Context context;
+
+  public PasswordCustomAuthAuthenticationAction(final Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public void finishAuthentication(final OneginiCustomAuthAuthenticationCallback callback, final String s) {
+    CALLBACK = callback;
+
+    final Intent intent = new Intent(context, BasicAuthenticatorAuthenticationActivity.class);
+    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+  }
+
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
new file mode 100644
index 00000000..ea0bc94a
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.view.action.passwordauth;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Context;
+import android.content.Intent;
+import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorDeregistrationActivity;
+import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
+import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthDeregistrationCallback;
+
+public class PasswordCustomAuthDeregistrationAction implements OneginiCustomAuthDeregistrationAction {
+
+  public static OneginiCustomAuthDeregistrationCallback CALLBACK;
+
+  private final Context context;
+
+  public PasswordCustomAuthDeregistrationAction(final Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public void finishDeregistration(final OneginiCustomAuthDeregistrationCallback callback, final String s) {
+    CALLBACK = callback;
+
+    final Intent intent = new Intent(context, BasicAuthenticatorDeregistrationActivity.class);
+    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
new file mode 100644
index 00000000..7e07384c
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegini.mobile.exampleapp.view.action.passwordauth;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Context;
+import android.content.Intent;
+import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorRegistrationActivity;
+import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthRegistrationCallback;
+
+public class PasswordCustomAuthRegistrationAction implements OneginiCustomAuthRegistrationAction {
+
+  public static OneginiCustomAuthRegistrationCallback CALLBACK;
+
+  private final Context context;
+
+  public PasswordCustomAuthRegistrationAction(final Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public void finishRegistration(final OneginiCustomAuthRegistrationCallback callback) {
+    CALLBACK = callback;
+
+    final Intent intent = new Intent(context, BasicAuthenticatorRegistrationActivity.class);
+    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java
index d5c4c093..13c969f9 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java
@@ -43,7 +43,7 @@ public abstract class BasicAuthenticatorActivity extends AppCompatActivity {
   @Override
   protected void onCreate(final Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_custom_auth_registration);
+    setContentView(R.layout.activity_basic_authenticator);
     ButterKnife.bind(this);
     setTitle();
   }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java
index 4e5276d5..4782442f 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java
@@ -18,7 +18,7 @@
 
 import com.onegini.mobile.exampleapp.R;
 import com.onegini.mobile.exampleapp.model.BasicCustomAuthenticator;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthAuthenticationAction;
+import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthAuthenticationAction;
 
 public class BasicAuthenticatorAuthenticationActivity extends BasicAuthenticatorActivity {
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java
index 2bcca56e..c6564659 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java
@@ -17,7 +17,7 @@
 package com.onegini.mobile.exampleapp.view.activity;
 
 import com.onegini.mobile.exampleapp.R;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthDeregistrationAction;
+import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthDeregistrationAction;
 
 public class BasicAuthenticatorDeregistrationActivity extends BasicAuthenticatorActivity {
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java
index 41c7620e..7fa150da 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java
@@ -18,7 +18,7 @@
 
 import com.onegini.mobile.exampleapp.R;
 import com.onegini.mobile.exampleapp.model.BasicCustomAuthenticator;
-import com.onegini.mobile.exampleapp.view.action.BasicCustomAuthRegistrationAction;
+import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthRegistrationAction;
 
 public class BasicAuthenticatorRegistrationActivity extends BasicAuthenticatorActivity {
 
diff --git a/app/src/main/res/layout/activity_custom_auth_registration.xml b/app/src/main/res/layout/activity_basic_authenticator.xml
similarity index 100%
rename from app/src/main/res/layout/activity_custom_auth_registration.xml
rename to app/src/main/res/layout/activity_basic_authenticator.xml

From fa00e157cc1b3cd0490611483350609d6e6dcc4e Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Wed, 3 Jan 2018 17:50:18 +0100
Subject: [PATCH 06/31] EXAMPLEAND-41 Password authenticator activities

---
 app/src/main/AndroidManifest.xml              | 12 ++++
 ...asswordCustomAuthAuthenticationAction.java |  5 +-
 ...asswordCustomAuthDeregistrationAction.java |  4 +-
 .../PasswordCustomAuthRegistrationAction.java |  4 +-
 .../PasswordAuthenticatorActivity.java        | 62 +++++++++++++++++++
 ...rdAuthenticatorAuthenticationActivity.java | 36 +++++++++++
 ...rdAuthenticatorDeregistrationActivity.java | 35 +++++++++++
 ...wordAuthenticatorRegistrationActivity.java | 35 +++++++++++
 .../activity_password_authenticator.xml       | 48 ++++++++++++++
 app/src/main/res/values/strings.xml           |  3 +
 10 files changed, 237 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java
 create mode 100644 app/src/main/res/layout/activity_password_authenticator.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b189f5d2..0969412f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -119,6 +119,18 @@
             android:name=".view.activity.BasicAuthenticatorAuthenticationActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PasswordAuthenticatorRegistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PasswordAuthenticatorDeregistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PasswordAuthenticatorAuthenticationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
 
         <service
             android:name=".network.fcm.FCMListenerService">
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
index d8cfa2c8..b92343a4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorAuthenticationActivity;
+import com.onegini.mobile.exampleapp.view.activity.PasswordAuthenticatorAuthenticationActivity;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthAuthenticationCallback;
 
@@ -36,9 +36,8 @@ public PasswordCustomAuthAuthenticationAction(final Context context) {
   public void finishAuthentication(final OneginiCustomAuthAuthenticationCallback callback, final String s) {
     CALLBACK = callback;
 
-    final Intent intent = new Intent(context, BasicAuthenticatorAuthenticationActivity.class);
+    final Intent intent = new Intent(context, PasswordAuthenticatorAuthenticationActivity.class);
     intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
     context.startActivity(intent);
   }
-
 }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
index ea0bc94a..ad5dc0ad 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorDeregistrationActivity;
+import com.onegini.mobile.exampleapp.view.activity.PasswordAuthenticatorDeregistrationActivity;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthDeregistrationCallback;
 
@@ -37,7 +37,7 @@ public PasswordCustomAuthDeregistrationAction(final Context context) {
   public void finishDeregistration(final OneginiCustomAuthDeregistrationCallback callback, final String s) {
     CALLBACK = callback;
 
-    final Intent intent = new Intent(context, BasicAuthenticatorDeregistrationActivity.class);
+    final Intent intent = new Intent(context, PasswordAuthenticatorDeregistrationActivity.class);
     intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
     context.startActivity(intent);
   }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
index 7e07384c..08976490 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
@@ -20,7 +20,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorRegistrationActivity;
+import com.onegini.mobile.exampleapp.view.activity.PasswordAuthenticatorRegistrationActivity;
 import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthRegistrationCallback;
 
@@ -38,7 +38,7 @@ public PasswordCustomAuthRegistrationAction(final Context context) {
   public void finishRegistration(final OneginiCustomAuthRegistrationCallback callback) {
     CALLBACK = callback;
 
-    final Intent intent = new Intent(context, BasicAuthenticatorRegistrationActivity.class);
+    final Intent intent = new Intent(context, PasswordAuthenticatorRegistrationActivity.class);
     intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
     context.startActivity(intent);
   }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java
new file mode 100644
index 00000000..06170369
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegini.mobile.exampleapp.view.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.EditText;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import com.onegini.mobile.exampleapp.R;
+
+public abstract class PasswordAuthenticatorActivity extends AppCompatActivity {
+
+  @SuppressWarnings({ "unused" })
+  @BindView(R.id.custom_auth_password)
+  EditText passwordEditText;
+
+  @Override
+  protected void onCreate(final Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_password_authenticator);
+    ButterKnife.bind(this);
+  }
+
+  @SuppressWarnings("unused")
+  @OnClick(R.id.custom_auth_password_send)
+  public void onPositiveButtonClicked() {
+    onSuccess(passwordEditText.getText().toString());
+    finish();
+  }
+
+  @SuppressWarnings("unused")
+  @OnClick(R.id.custom_auth_password_cancel)
+  public void onNegativeButtonClicked() {
+    onCanceled();
+    finish();
+  }
+
+  @Override
+  public void onBackPressed() {
+    onNegativeButtonClicked();
+  }
+
+  protected abstract void onSuccess(final String password);
+
+  protected abstract void onCanceled();
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java
new file mode 100644
index 00000000..8a57af1b
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java
@@ -0,0 +1,36 @@
+package com.onegini.mobile.exampleapp.view.activity;
+
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthAuthenticationAction;
+
+public class PasswordAuthenticatorAuthenticationActivity extends PasswordAuthenticatorActivity {
+
+  @Override
+  protected void onSuccess(final String password) {
+    if (PasswordCustomAuthAuthenticationAction.CALLBACK != null) {
+      PasswordCustomAuthAuthenticationAction.CALLBACK.returnSuccess(password);
+    }
+  }
+
+  @Override
+  protected void onCanceled() {
+    if (PasswordCustomAuthAuthenticationAction.CALLBACK != null) {
+      PasswordCustomAuthAuthenticationAction.CALLBACK.returnError(new Exception("Authentication canceled"));
+    }
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java
new file mode 100644
index 00000000..e1a9f36b
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.view.activity;
+
+import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthDeregistrationAction;
+
+public class PasswordAuthenticatorDeregistrationActivity extends PasswordAuthenticatorActivity {
+
+  @Override
+  protected void onSuccess(final String password) {
+    if (PasswordCustomAuthDeregistrationAction.CALLBACK != null) {
+      PasswordCustomAuthDeregistrationAction.CALLBACK.acceptDeregistrationRequest(password);
+    }
+  }
+
+  @Override
+  protected void onCanceled() {
+    if (PasswordCustomAuthDeregistrationAction.CALLBACK != null) {
+      PasswordCustomAuthDeregistrationAction.CALLBACK.denyDeregistrationRequest();
+    }
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java
new file mode 100644
index 00000000..c4810191
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016-2017 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.view.activity;
+
+import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthRegistrationAction;
+
+public class PasswordAuthenticatorRegistrationActivity extends PasswordAuthenticatorActivity {
+
+  @Override
+  protected void onSuccess(final String password) {
+    if (PasswordCustomAuthRegistrationAction.CALLBACK != null) {
+      PasswordCustomAuthRegistrationAction.CALLBACK.acceptRegistrationRequest(password);
+    }
+  }
+
+  @Override
+  protected void onCanceled() {
+    if (PasswordCustomAuthRegistrationAction.CALLBACK != null) {
+      PasswordCustomAuthRegistrationAction.CALLBACK.denyRegistrationRequest();
+    }
+  }
+}
diff --git a/app/src/main/res/layout/activity_password_authenticator.xml b/app/src/main/res/layout/activity_password_authenticator.xml
new file mode 100644
index 00000000..13f2b39c
--- /dev/null
+++ b/app/src/main/res/layout/activity_password_authenticator.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2016-2018 Onegini B.V.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <EditText
+        android:id="@+id/custom_auth_password"
+        android:inputType="textPassword"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:hint="@string/custom_auth_password"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="@dimen/activity_login_logo_margin_top">
+
+        <Button
+            android:id="@+id/custom_auth_password_send"
+            style="@style/ButtonStyle"
+            android:text="@string/custom_auth_password_enter"/>
+
+        <Button
+            android:id="@+id/custom_auth_password_cancel"
+            style="@style/ButtonStyle"
+            android:text="@string/custom_auth_password_cancel"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f61b3e16..eefac7ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,6 +70,9 @@
     <string name="custom_auth_positive_action">Return success</string>
     <string name="custom_auth_negative_action">Return failure</string>
     <string name="custom_auth_error_action">Return error</string>
+    <string name="custom_auth_password_enter">Confirm</string>
+    <string name="custom_auth_password_cancel">Cancel</string>
+    <string name="custom_auth_password">Password</string>
     <string name="do_you_want_to_confirm_with_custom_auth">Do you want to authenticate with custom authenticator?</string>
     <string name="custom_auth_registration_title">Auth registration</string>
     <string name="custom_auth_deregistration_title">Auth deregistration</string>

From 7bbdff85e8f8f38ddf248038f60f6a7ed8324da0 Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Wed, 10 Jan 2018 16:43:34 +0100
Subject: [PATCH 07/31] EXAMPLEAND-43 Update copyrights

---
 app/build.gradle                                                | 2 +-
 app/proguard-rules-example-app.pro                              | 2 +-
 app/proguard-rules-onegini-sdk.pro                              | 2 +-
 app/src/main/AndroidManifest.xml                                | 2 +-
 app/src/main/java/com/onegini/mobile/exampleapp/Constants.java  | 2 +-
 .../java/com/onegini/mobile/exampleapp/ExampleApplication.java  | 2 +-
 .../java/com/onegini/mobile/exampleapp/OneginiConfigModel.java  | 2 +-
 app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java | 2 +-
 .../java/com/onegini/mobile/exampleapp/SecurityController.java  | 2 +-
 .../mobile/exampleapp/adapter/AuthenticatorsAdapter.java        | 2 +-
 .../com/onegini/mobile/exampleapp/adapter/DevicesAdapter.java   | 2 +-
 .../mobile/exampleapp/adapter/PendingPushMessagesAdapter.java   | 2 +-
 .../com/onegini/mobile/exampleapp/model/ApplicationDetails.java | 2 +-
 .../onegini/mobile/exampleapp/model/AuthenticatorListItem.java  | 2 +-
 .../mobile/exampleapp/model/BasicCustomAuthenticator.java       | 2 +-
 .../main/java/com/onegini/mobile/exampleapp/model/Device.java   | 2 +-
 .../onegini/mobile/exampleapp/model/ImplicitUserDetails.java    | 2 +-
 .../com/onegini/mobile/exampleapp/model/NotificationId.java     | 2 +-
 app/src/main/java/com/onegini/mobile/exampleapp/model/User.java | 2 +-
 .../com/onegini/mobile/exampleapp/network/AnonymousService.java | 2 +-
 .../onegini/mobile/exampleapp/network/ImplicitUserService.java  | 2 +-
 .../java/com/onegini/mobile/exampleapp/network/UserService.java | 2 +-
 .../mobile/exampleapp/network/client/AnonymousClient.java       | 2 +-
 .../mobile/exampleapp/network/client/AnonymousClient2.java      | 2 +-
 .../mobile/exampleapp/network/client/ImplicitUserClient.java    | 2 +-
 .../mobile/exampleapp/network/client/ImplicitUserClient2.java   | 2 +-
 .../mobile/exampleapp/network/client/SecureResourceClient.java  | 2 +-
 .../onegini/mobile/exampleapp/network/client/UserClient.java    | 2 +-
 .../onegini/mobile/exampleapp/network/client/UserClient2.java   | 2 +-
 .../mobile/exampleapp/network/fcm/FCMInstanceIdService.java     | 2 +-
 .../mobile/exampleapp/network/fcm/FCMListenerService.java       | 2 +-
 .../mobile/exampleapp/network/fcm/FCMRegistrationService.java   | 2 +-
 .../exampleapp/network/fcm/MobileAuthenticationService.java     | 2 +-
 .../mobile/exampleapp/network/fcm/NotificationHelper.java       | 2 +-
 .../mobile/exampleapp/network/response/DevicesResponse.java     | 2 +-
 .../mobile/exampleapp/storage/DeviceSettingsStorage.java        | 2 +-
 .../java/com/onegini/mobile/exampleapp/storage/FCMStorage.java  | 2 +-
 .../java/com/onegini/mobile/exampleapp/storage/UserStorage.java | 2 +-
 .../java/com/onegini/mobile/exampleapp/util/AnimationUtils.java | 2 +-
 .../com/onegini/mobile/exampleapp/util/DeregistrationUtil.java  | 2 +-
 .../action/basicauth/BasicCustomAuthAuthenticationAction.java   | 2 +-
 .../action/basicauth/BasicCustomAuthDeregistrationAction.java   | 2 +-
 .../action/basicauth/BasicCustomAuthRegistrationAction.java     | 2 +-
 .../passwordauth/PasswordCustomAuthAuthenticationAction.java    | 2 +-
 .../passwordauth/PasswordCustomAuthDeregistrationAction.java    | 2 +-
 .../passwordauth/PasswordCustomAuthRegistrationAction.java      | 2 +-
 .../mobile/exampleapp/view/activity/AuthenticationActivity.java | 2 +-
 .../exampleapp/view/activity/BasicAuthenticatorActivity.java    | 2 +-
 .../view/activity/BasicAuthenticatorAuthenticationActivity.java | 2 +-
 .../view/activity/BasicAuthenticatorDeregistrationActivity.java | 2 +-
 .../view/activity/BasicAuthenticatorRegistrationActivity.java   | 2 +-
 .../mobile/exampleapp/view/activity/CustomAuthActivity.java     | 2 +-
 .../mobile/exampleapp/view/activity/DashboardActivity.java      | 2 +-
 .../mobile/exampleapp/view/activity/DevicesListActivity.java    | 2 +-
 .../mobile/exampleapp/view/activity/FingerprintActivity.java    | 2 +-
 .../onegini/mobile/exampleapp/view/activity/LoginActivity.java  | 2 +-
 .../exampleapp/view/activity/MobileAuthenticationActivity.java  | 2 +-
 .../view/activity/MobileAuthenticationCustomActivity.java       | 2 +-
 .../view/activity/MobileAuthenticationFingerprintActivity.java  | 2 +-
 .../view/activity/MobileAuthenticationPinActivity.java          | 2 +-
 .../exampleapp/view/activity/PasswordAuthenticatorActivity.java | 2 +-
 .../activity/PasswordAuthenticatorAuthenticationActivity.java   | 2 +-
 .../activity/PasswordAuthenticatorDeregistrationActivity.java   | 2 +-
 .../activity/PasswordAuthenticatorRegistrationActivity.java     | 2 +-
 .../exampleapp/view/activity/PendingPushMessagesActivity.java   | 2 +-
 .../onegini/mobile/exampleapp/view/activity/PinActivity.java    | 2 +-
 .../mobile/exampleapp/view/activity/RegistrationActivity.java   | 2 +-
 .../mobile/exampleapp/view/activity/SettingsActivity.java       | 2 +-
 .../view/activity/SettingsAuthenticatorsActivity.java           | 2 +-
 .../mobile/exampleapp/view/activity/SplashScreenActivity.java   | 2 +-
 .../view/handler/BasicCustomAuthenticationRequestHandler.java   | 2 +-
 .../mobile/exampleapp/view/handler/CreatePinRequestHandler.java | 2 +-
 .../view/handler/FingerprintAuthenticationRequestHandler.java   | 2 +-
 .../exampleapp/view/handler/MobileAuthOtpRequestHandler.java    | 2 +-
 .../handler/MobileAuthenticationBasicCustomRequestHandler.java  | 2 +-
 .../handler/MobileAuthenticationFingerprintRequestHandler.java  | 2 +-
 .../view/handler/MobileAuthenticationPinRequestHandler.java     | 2 +-
 .../view/handler/MobileAuthenticationRequestHandler.java        | 2 +-
 .../view/handler/PinAuthenticationRequestHandler.java           | 2 +-
 .../exampleapp/view/handler/RegistrationRequestHandler.java     | 2 +-
 .../mobile/exampleapp/view/helper/AlertDialogFragment.java      | 2 +-
 .../mobile/exampleapp/view/helper/AppLifecycleListener.java     | 2 +-
 .../exampleapp/view/helper/OneginiAuthenticatorComperator.java  | 2 +-
 .../onegini/mobile/exampleapp/view/helper/PinInputFields.java   | 2 +-
 .../com/onegini/mobile/exampleapp/view/helper/PinKeyboard.java  | 2 +-
 .../exampleapp/view/helper/RegisteredAuthenticatorsMenu.java    | 2 +-
 app/src/main/res/drawable/circle_empty.xml                      | 2 +-
 app/src/main/res/drawable/circle_filled.xml                     | 2 +-
 app/src/main/res/drawable/circle_focused.xml                    | 2 +-
 app/src/main/res/layout/activity_basic_authenticator.xml        | 2 +-
 app/src/main/res/layout/activity_custom.xml                     | 2 +-
 app/src/main/res/layout/activity_dashboard.xml                  | 2 +-
 app/src/main/res/layout/activity_devices_list.xml               | 2 +-
 app/src/main/res/layout/activity_fingerprint.xml                | 2 +-
 app/src/main/res/layout/activity_login.xml                      | 2 +-
 app/src/main/res/layout/activity_pending_notifications.xml      | 2 +-
 app/src/main/res/layout/activity_pin.xml                        | 2 +-
 app/src/main/res/layout/activity_push_simple.xml                | 2 +-
 app/src/main/res/layout/activity_registration.xml               | 2 +-
 app/src/main/res/layout/activity_settings.xml                   | 2 +-
 app/src/main/res/layout/activity_settings_authenticators.xml    | 2 +-
 app/src/main/res/layout/activity_splashscreen.xml               | 2 +-
 app/src/main/res/layout/cancel_button.xml                       | 2 +-
 app/src/main/res/layout/get_user_name_view.xml                  | 2 +-
 app/src/main/res/layout/pin_keyboard.xml                        | 2 +-
 app/src/main/res/layout/row_item_authenticator.xml              | 2 +-
 app/src/main/res/layout/row_item_device.xml                     | 2 +-
 app/src/main/res/layout/row_item_pending_message.xml            | 2 +-
 app/src/main/res/layout/view_auth_accept_deny_buttons.xml       | 2 +-
 app/src/main/res/layout/view_custom_auth_buttons.xml            | 2 +-
 app/src/main/res/layout/view_welcome_user_text.xml              | 2 +-
 app/src/main/res/values-v21/dimens.xml                          | 2 +-
 app/src/main/res/values-v21/styles.xml                          | 2 +-
 app/src/main/res/values-w820dp/dimens.xml                       | 2 +-
 app/src/main/res/values/colors.xml                              | 2 +-
 app/src/main/res/values/dimens.xml                              | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 app/src/main/res/values/styles.xml                              | 2 +-
 build.gradle                                                    | 2 +-
 settings.gradle                                                 | 2 +-
 120 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bcd365f0..376d2895 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/proguard-rules-example-app.pro b/app/proguard-rules-example-app.pro
index 1e561f16..c15dc2b2 100644
--- a/app/proguard-rules-example-app.pro
+++ b/app/proguard-rules-example-app.pro
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Onegini B.V.
+# Copyright (c) 2016-2018 Onegini B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/app/proguard-rules-onegini-sdk.pro b/app/proguard-rules-onegini-sdk.pro
index de7631fc..7afe26a2 100644
--- a/app/proguard-rules-onegini-sdk.pro
+++ b/app/proguard-rules-onegini-sdk.pro
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Onegini B.V.
+# Copyright (c) 2016-2018 Onegini B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0969412f..9f9ef047 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/Constants.java b/app/src/main/java/com/onegini/mobile/exampleapp/Constants.java
index 06b9858c..ac1f6bd4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/Constants.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/ExampleApplication.java b/app/src/main/java/com/onegini/mobile/exampleapp/ExampleApplication.java
index 5ac2c84a..29889ea6 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/ExampleApplication.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/ExampleApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java
index add650c3..69613edf 100755
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index 1aab334b..8d66524c 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/SecurityController.java b/app/src/main/java/com/onegini/mobile/exampleapp/SecurityController.java
index 4f1018d4..1e8bd07e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/SecurityController.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/SecurityController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/adapter/AuthenticatorsAdapter.java b/app/src/main/java/com/onegini/mobile/exampleapp/adapter/AuthenticatorsAdapter.java
index 749bf60e..166f5da6 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/adapter/AuthenticatorsAdapter.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/adapter/AuthenticatorsAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/adapter/DevicesAdapter.java b/app/src/main/java/com/onegini/mobile/exampleapp/adapter/DevicesAdapter.java
index c6937083..b2c73a7a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/adapter/DevicesAdapter.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/adapter/DevicesAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/adapter/PendingPushMessagesAdapter.java b/app/src/main/java/com/onegini/mobile/exampleapp/adapter/PendingPushMessagesAdapter.java
index f3e3f971..b637d465 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/adapter/PendingPushMessagesAdapter.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/adapter/PendingPushMessagesAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java
index 9d1a0d2f..cf3ef214 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/AuthenticatorListItem.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/AuthenticatorListItem.java
index f5c7b9ae..46208f80 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/AuthenticatorListItem.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/AuthenticatorListItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
index f9a2633f..3ec4dedd 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/Device.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/Device.java
index 946aa490..b64ceea9 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/Device.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/Device.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/ImplicitUserDetails.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/ImplicitUserDetails.java
index 6a3f4ad3..64347ac5 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/ImplicitUserDetails.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/ImplicitUserDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/NotificationId.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/NotificationId.java
index c800f506..65839b25 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/NotificationId.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/NotificationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/User.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/User.java
index fe0a5fb2..baae1067 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/User.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/AnonymousService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/AnonymousService.java
index ecd75b39..982bfc99 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/AnonymousService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/AnonymousService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/ImplicitUserService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/ImplicitUserService.java
index 42a024eb..a5f88d49 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/ImplicitUserService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/ImplicitUserService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/UserService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/UserService.java
index 7577e1d5..a51d8c91 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/UserService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/UserService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient.java
index e2565160..908b3545 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient2.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient2.java
index 4004bb4c..3583e3b5 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient2.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient.java
index 9e587281..c6e0d224 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient2.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient2.java
index 114d0b6d..ce92eae0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient2.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/ImplicitUserClient2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/SecureResourceClient.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/SecureResourceClient.java
index b6c773c5..3cc71b36 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/SecureResourceClient.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/SecureResourceClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient.java
index 4613bba4..c5b7dcd4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient2.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient2.java
index ae5a8122..ccfd4c10 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient2.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/client/UserClient2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMInstanceIdService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMInstanceIdService.java
index 0cec3af0..2939a492 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMInstanceIdService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMInstanceIdService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMListenerService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMListenerService.java
index fd662789..ec094280 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMListenerService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMListenerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMRegistrationService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMRegistrationService.java
index abc03c2f..0b8b1cb4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMRegistrationService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMRegistrationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java
index c268995d..06dafe38 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/NotificationHelper.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/NotificationHelper.java
index 289e1c50..acaa87df 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/NotificationHelper.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/NotificationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/response/DevicesResponse.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/response/DevicesResponse.java
index 5c3d6c42..968c9be9 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/response/DevicesResponse.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/response/DevicesResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/storage/DeviceSettingsStorage.java b/app/src/main/java/com/onegini/mobile/exampleapp/storage/DeviceSettingsStorage.java
index 0e99642e..f2bcd6c5 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/storage/DeviceSettingsStorage.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/storage/DeviceSettingsStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/storage/FCMStorage.java b/app/src/main/java/com/onegini/mobile/exampleapp/storage/FCMStorage.java
index a3a87e41..2262f62a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/storage/FCMStorage.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/storage/FCMStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/storage/UserStorage.java b/app/src/main/java/com/onegini/mobile/exampleapp/storage/UserStorage.java
index 2d5dd61f..bed12625 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/storage/UserStorage.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/storage/UserStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/util/AnimationUtils.java b/app/src/main/java/com/onegini/mobile/exampleapp/util/AnimationUtils.java
index 9c54ce02..9ea7aed0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/util/AnimationUtils.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/util/AnimationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/util/DeregistrationUtil.java b/app/src/main/java/com/onegini/mobile/exampleapp/util/DeregistrationUtil.java
index d05811c0..d49e6517 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/util/DeregistrationUtil.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/util/DeregistrationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
index 7dbfb9f9..caed7223 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
index 2adc778f..e2307f44 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
index 8a1100e8..cfc102d4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
index b92343a4..d7d9e44f 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
index ad5dc0ad..a9b03b7a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
index 08976490..e10ac2d6 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/AuthenticationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/AuthenticationActivity.java
index 49b374cf..96b1a4e3 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/AuthenticationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/AuthenticationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java
index 13c969f9..74e1d340 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java
index 4782442f..9f1c8667 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorAuthenticationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java
index c6564659..f3fe6d44 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorDeregistrationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java
index 7fa150da..493ff5e5 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/BasicAuthenticatorRegistrationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/CustomAuthActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/CustomAuthActivity.java
index 3a100ace..42753a31 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/CustomAuthActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/CustomAuthActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DashboardActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DashboardActivity.java
index 0c5d9e17..e0f73324 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DashboardActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DashboardActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DevicesListActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DevicesListActivity.java
index f5449ec2..48d2fe26 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DevicesListActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/DevicesListActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FingerprintActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FingerprintActivity.java
index f73b973a..15ddabaf 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FingerprintActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/FingerprintActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index 303dc363..371551cb 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationActivity.java
index d31124dc..0f8de67d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationCustomActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationCustomActivity.java
index 1a714ac1..2e0855f2 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationCustomActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationCustomActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFingerprintActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFingerprintActivity.java
index fa773db1..5f699008 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFingerprintActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationFingerprintActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationPinActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationPinActivity.java
index c7816237..23ce8362 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationPinActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/MobileAuthenticationPinActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java
index 06170369..84718cf4 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java
index 8a57af1b..b1e1b33d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorAuthenticationActivity.java
@@ -1,7 +1,7 @@
 package com.onegini.mobile.exampleapp.view.activity;
 
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java
index e1a9f36b..46abb603 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorDeregistrationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java
index c4810191..4a07825a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PasswordAuthenticatorRegistrationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
index b5eaeb68..b339de03 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PinActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PinActivity.java
index 30562c7e..61b17007 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PinActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PinActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
index 3b22e447..fbd76cdb 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsActivity.java
index ae9f78b8..acffc899 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java
index 702584ce..ab4c1fd0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SplashScreenActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SplashScreenActivity.java
index 41416a78..96184a2e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SplashScreenActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SplashScreenActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/BasicCustomAuthenticationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/BasicCustomAuthenticationRequestHandler.java
index d6e5a8d9..7814a4e0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/BasicCustomAuthenticationRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/BasicCustomAuthenticationRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/CreatePinRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/CreatePinRequestHandler.java
index 356e699c..1d55c98d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/CreatePinRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/CreatePinRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FingerprintAuthenticationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FingerprintAuthenticationRequestHandler.java
index 769b62de..cde3ca0e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FingerprintAuthenticationRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/FingerprintAuthenticationRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthOtpRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthOtpRequestHandler.java
index 10356f52..9ed8d9c8 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthOtpRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthOtpRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationBasicCustomRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationBasicCustomRequestHandler.java
index 513eda60..fd2fd314 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationBasicCustomRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationBasicCustomRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFingerprintRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFingerprintRequestHandler.java
index 7de03dca..187939a8 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFingerprintRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationFingerprintRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationPinRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationPinRequestHandler.java
index ab1e88a8..d465ae23 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationPinRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationPinRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationRequestHandler.java
index b1752554..71e74d33 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/MobileAuthenticationRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/PinAuthenticationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/PinAuthenticationRequestHandler.java
index b5da0529..05504f7d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/PinAuthenticationRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/PinAuthenticationRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java
index f9d525b3..9430bfd0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AlertDialogFragment.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AlertDialogFragment.java
index c85e7a40..07b7a89a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AlertDialogFragment.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AlertDialogFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AppLifecycleListener.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AppLifecycleListener.java
index 2ac60231..8a085ee1 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AppLifecycleListener.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AppLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java
index 442f8c74..4f49bc46 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/OneginiAuthenticatorComperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinInputFields.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinInputFields.java
index 276d5f84..d59c893a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinInputFields.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinInputFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinKeyboard.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinKeyboard.java
index 67c39998..1239b702 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinKeyboard.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/PinKeyboard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/RegisteredAuthenticatorsMenu.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/RegisteredAuthenticatorsMenu.java
index 4472b2be..7a2f75b5 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/RegisteredAuthenticatorsMenu.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/RegisteredAuthenticatorsMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/drawable/circle_empty.xml b/app/src/main/res/drawable/circle_empty.xml
index b721c4d0..34685f49 100644
--- a/app/src/main/res/drawable/circle_empty.xml
+++ b/app/src/main/res/drawable/circle_empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/drawable/circle_filled.xml b/app/src/main/res/drawable/circle_filled.xml
index 3b60af88..2803ea8a 100644
--- a/app/src/main/res/drawable/circle_filled.xml
+++ b/app/src/main/res/drawable/circle_filled.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/drawable/circle_focused.xml b/app/src/main/res/drawable/circle_focused.xml
index 312ea280..b003cd18 100644
--- a/app/src/main/res/drawable/circle_focused.xml
+++ b/app/src/main/res/drawable/circle_focused.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_basic_authenticator.xml b/app/src/main/res/layout/activity_basic_authenticator.xml
index 7c94f9d9..0e0aef37 100644
--- a/app/src/main/res/layout/activity_basic_authenticator.xml
+++ b/app/src/main/res/layout/activity_basic_authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_custom.xml b/app/src/main/res/layout/activity_custom.xml
index de6a7e93..caf43550 100644
--- a/app/src/main/res/layout/activity_custom.xml
+++ b/app/src/main/res/layout/activity_custom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
index b726fc82..cd24684e 100644
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_devices_list.xml b/app/src/main/res/layout/activity_devices_list.xml
index 556e071e..58ee6509 100644
--- a/app/src/main/res/layout/activity_devices_list.xml
+++ b/app/src/main/res/layout/activity_devices_list.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_fingerprint.xml b/app/src/main/res/layout/activity_fingerprint.xml
index 215c538e..f5cd8ffe 100644
--- a/app/src/main/res/layout/activity_fingerprint.xml
+++ b/app/src/main/res/layout/activity_fingerprint.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7f11b000..a5282288 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_pending_notifications.xml b/app/src/main/res/layout/activity_pending_notifications.xml
index 328ee7b0..53bf2278 100644
--- a/app/src/main/res/layout/activity_pending_notifications.xml
+++ b/app/src/main/res/layout/activity_pending_notifications.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_pin.xml b/app/src/main/res/layout/activity_pin.xml
index e34597f1..a026cb12 100644
--- a/app/src/main/res/layout/activity_pin.xml
+++ b/app/src/main/res/layout/activity_pin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_push_simple.xml b/app/src/main/res/layout/activity_push_simple.xml
index 65dfe927..152684fe 100644
--- a/app/src/main/res/layout/activity_push_simple.xml
+++ b/app/src/main/res/layout/activity_push_simple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml
index c4445b6e..4bce1516 100644
--- a/app/src/main/res/layout/activity_registration.xml
+++ b/app/src/main/res/layout/activity_registration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 32d18bce..01dc77ba 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_settings_authenticators.xml b/app/src/main/res/layout/activity_settings_authenticators.xml
index 9290f3c1..377f7b3e 100644
--- a/app/src/main/res/layout/activity_settings_authenticators.xml
+++ b/app/src/main/res/layout/activity_settings_authenticators.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/activity_splashscreen.xml b/app/src/main/res/layout/activity_splashscreen.xml
index cd1de169..6738a534 100644
--- a/app/src/main/res/layout/activity_splashscreen.xml
+++ b/app/src/main/res/layout/activity_splashscreen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/cancel_button.xml b/app/src/main/res/layout/cancel_button.xml
index 45814628..3975febe 100644
--- a/app/src/main/res/layout/cancel_button.xml
+++ b/app/src/main/res/layout/cancel_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/get_user_name_view.xml b/app/src/main/res/layout/get_user_name_view.xml
index e96991b8..d161bae2 100644
--- a/app/src/main/res/layout/get_user_name_view.xml
+++ b/app/src/main/res/layout/get_user_name_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/pin_keyboard.xml b/app/src/main/res/layout/pin_keyboard.xml
index a9d01c22..8bfb908b 100644
--- a/app/src/main/res/layout/pin_keyboard.xml
+++ b/app/src/main/res/layout/pin_keyboard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/row_item_authenticator.xml b/app/src/main/res/layout/row_item_authenticator.xml
index e6db93b9..03210349 100644
--- a/app/src/main/res/layout/row_item_authenticator.xml
+++ b/app/src/main/res/layout/row_item_authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/row_item_device.xml b/app/src/main/res/layout/row_item_device.xml
index 909abdfb..7be47192 100644
--- a/app/src/main/res/layout/row_item_device.xml
+++ b/app/src/main/res/layout/row_item_device.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/row_item_pending_message.xml b/app/src/main/res/layout/row_item_pending_message.xml
index 6de8b667..bb640031 100644
--- a/app/src/main/res/layout/row_item_pending_message.xml
+++ b/app/src/main/res/layout/row_item_pending_message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/view_auth_accept_deny_buttons.xml b/app/src/main/res/layout/view_auth_accept_deny_buttons.xml
index d6fc7ea2..045d1137 100644
--- a/app/src/main/res/layout/view_auth_accept_deny_buttons.xml
+++ b/app/src/main/res/layout/view_auth_accept_deny_buttons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/view_custom_auth_buttons.xml b/app/src/main/res/layout/view_custom_auth_buttons.xml
index d776bd84..d41db939 100644
--- a/app/src/main/res/layout/view_custom_auth_buttons.xml
+++ b/app/src/main/res/layout/view_custom_auth_buttons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/layout/view_welcome_user_text.xml b/app/src/main/res/layout/view_welcome_user_text.xml
index bb952a97..1bfc9f7f 100644
--- a/app/src/main/res/layout/view_welcome_user_text.xml
+++ b/app/src/main/res/layout/view_welcome_user_text.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
index f7582dba..58581f1f 100644
--- a/app/src/main/res/values-v21/dimens.xml
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 7da186d2..28031365 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 29215e8f..34c8fe3d 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8d574439..7a29aab0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 95c35d36..2d2c41f5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eefac7ed..af389cec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f2b0d6e6..8572508d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016-2017 Onegini B.V.
+  Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/build.gradle b/build.gradle
index c4c389ea..1cabd615 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/settings.gradle b/settings.gradle
index 6d13c598..067d2b7a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Onegini B.V.
+ * Copyright (c) 2016-2018 Onegini B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 3cc5a6603b12024d4fc37db23b69fe6f0a9cbc54 Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Fri, 26 Jan 2018 11:32:31 +0100
Subject: [PATCH 08/31] SDKAND-561 Target the latest Android 8.1

---
 app/build.gradle | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 376d2895..b2fa8c55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,8 +41,8 @@ allprojects {
 }
 
 android {
-  compileSdkVersion 26
-  buildToolsVersion '26.0.2'
+  compileSdkVersion 27
+  buildToolsVersion '27.0.3'
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
@@ -52,7 +52,7 @@ android {
   defaultConfig {
     applicationId "com.onegini.mobile.exampleapp"
     minSdkVersion 16
-    targetSdkVersion 26
+    targetSdkVersion 27
     versionCode 12
     versionName "4.1.0"
     multiDexEnabled true
@@ -87,11 +87,11 @@ dependencies {
   implementation 'com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0'
 
   // Google Support
-  implementation 'com.android.support:appcompat-v7:26.1.0'
-  implementation 'com.android.support:cardview-v7:26.1.0'
-  implementation 'com.android.support:design:26.1.0'
-  implementation 'com.android.support:recyclerview-v7:26.1.0'
-  implementation 'com.android.support:support-core-ui:26.1.0'
+  implementation 'com.android.support:appcompat-v7:27.0.2'
+  implementation 'com.android.support:cardview-v7:27.0.2'
+  implementation 'com.android.support:design:27.0.2'
+  implementation 'com.android.support:recyclerview-v7:27.0.2'
+  implementation 'com.android.support:support-core-ui:27.0.2'
 
   // Google Play Services availability check
   implementation 'com.google.android.gms:play-services-base:11.6.0'

From 7d741649e34db84522f2e5233cd5730d2a928f1d Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 30 Jan 2018 14:21:18 +0100
Subject: [PATCH 09/31] EXAMPLEAND-45 move resource calls to a separate tab

---
 app/src/main/AndroidManifest.xml              | 267 +++++++++---------
 .../view/activity/InfoActivity.java           | 241 ++++++++++++++++
 .../view/activity/LoginActivity.java          | 159 +----------
 .../activity/PendingPushMessagesActivity.java |  16 +-
 .../res/drawable-hdpi/ic_http_white_24dp.png  | Bin 228 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 0 -> 485 bytes
 .../res/drawable-mdpi/ic_http_white_24dp.png  | Bin 145 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 0 -> 320 bytes
 .../res/drawable-xhdpi/ic_http_white_24dp.png | Bin 145 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 0 -> 655 bytes
 .../drawable-xxhdpi/ic_http_white_24dp.png    | Bin 223 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 0 -> 953 bytes
 .../drawable-xxxhdpi/ic_http_white_24dp.png   | Bin 210 -> 0 bytes
 .../ic_info_outline_white_24dp.png            | Bin 0 -> 1279 bytes
 app/src/main/res/layout/activity_info.xml     | 186 ++++++++++++
 app/src/main/res/layout/activity_login.xml    |  36 +--
 .../main/res/menu/bottom_navigation_menu.xml  |   6 +-
 app/src/main/res/values/strings.xml           |  14 +-
 18 files changed, 605 insertions(+), 320 deletions(-)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_http_white_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_http_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_http_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_http_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_http_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
 create mode 100644 app/src/main/res/layout/activity_info.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f9ef047..5341e7fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Copyright (c) 2016-2018 Onegini B.V.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,145 +12,143 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-          package="com.onegini.mobile.exampleapp">
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.onegini.mobile.exampleapp">
 
-    <application
-        android:name=".ExampleApplication"
-        android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        tools:replace="android:allowBackup">
+  <application
+      android:name=".ExampleApplication"
+      android:allowBackup="false"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/app_name"
+      android:supportsRtl="true"
+      android:theme="@style/AppTheme"
+      tools:replace="android:allowBackup">
+    <activity
+        android:name=".view.activity.SplashScreenActivity"
+        android:screenOrientation="portrait">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
 
-        <activity
-            android:name=".view.activity.SplashScreenActivity"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+    <activity
+        android:name=".view.activity.LoginActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"></activity>
+    <activity
+        android:name=".view.activity.RegistrationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
 
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".view.activity.LoginActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait">
-        </activity>
-        <activity
-            android:name=".view.activity.RegistrationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="oneginiexample"/>
+      </intent-filter>
+    </activity>
+    <activity
+        android:name=".view.activity.PinActivity"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.FingerprintActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.CustomAuthActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.DashboardActivity"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.SettingsAuthenticatorsActivity"
+        android:parentActivityName=".view.activity.SettingsActivity"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.SettingsActivity"
+        android:parentActivityName=".view.activity.DashboardActivity"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.MobileAuthenticationActivity"
+        android:excludeFromRecents="true"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"
+        android:taskAffinity=""/>
+    <activity
+        android:name=".view.activity.MobileAuthenticationPinActivity"
+        android:excludeFromRecents="true"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"
+        android:taskAffinity=""/>
+    <activity
+        android:name=".view.activity.MobileAuthenticationFingerprintActivity"
+        android:excludeFromRecents="true"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"
+        android:taskAffinity=""/>
+    <activity
+        android:name=".view.activity.MobileAuthenticationCustomActivity"
+        android:excludeFromRecents="true"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"
+        android:taskAffinity=""/>
+    <activity
+        android:name=".view.activity.DevicesListActivity"
+        android:parentActivityName=".view.activity.DashboardActivity"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.PendingPushMessagesActivity"
+        android:parentActivityName=".view.activity.DashboardActivity"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.BasicAuthenticatorRegistrationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.BasicAuthenticatorDeregistrationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.BasicAuthenticatorAuthenticationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.PasswordAuthenticatorRegistrationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.PasswordAuthenticatorDeregistrationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
+    <activity
+        android:name=".view.activity.PasswordAuthenticatorAuthenticationActivity"
+        android:launchMode="singleTask"
+        android:screenOrientation="portrait"/>
 
-                <data android:scheme="oneginiexample"/>
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".view.activity.PinActivity"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.FingerprintActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.CustomAuthActivity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTask"/>
-        <activity
-            android:name=".view.activity.DashboardActivity"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.SettingsAuthenticatorsActivity"
-            android:screenOrientation="portrait"
-            android:parentActivityName=".view.activity.SettingsActivity"/>
-        <activity
-            android:name=".view.activity.SettingsActivity"
-            android:screenOrientation="portrait"
-            android:parentActivityName=".view.activity.DashboardActivity"/>
-        <activity
-            android:name=".view.activity.MobileAuthenticationActivity"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:excludeFromRecents="true"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.MobileAuthenticationPinActivity"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:excludeFromRecents="true"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.MobileAuthenticationFingerprintActivity"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:excludeFromRecents="true"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.MobileAuthenticationCustomActivity"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:excludeFromRecents="true"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.DevicesListActivity"
-            android:parentActivityName=".view.activity.DashboardActivity"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.PendingPushMessagesActivity"
-            android:parentActivityName=".view.activity.DashboardActivity"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.BasicAuthenticatorRegistrationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.BasicAuthenticatorDeregistrationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.BasicAuthenticatorAuthenticationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.PasswordAuthenticatorRegistrationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.PasswordAuthenticatorDeregistrationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".view.activity.PasswordAuthenticatorAuthenticationActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
+    <service android:name=".network.fcm.FCMListenerService">
+      <intent-filter>
+        <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+      </intent-filter>
+    </service>
+    <service android:name=".network.fcm.FCMInstanceIdService">
+      <intent-filter>
+        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+      </intent-filter>
+    </service>
+    <service
+        android:name=".network.fcm.MobileAuthenticationService"
+        android:exported="false"/>
 
-        <service
-            android:name=".network.fcm.FCMListenerService">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
-            </intent-filter>
-        </service>
-        <service
-            android:name=".network.fcm.FCMInstanceIdService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
-        <service
-            android:name=".network.fcm.MobileAuthenticationService"
-            android:exported="false"/>
+    <meta-data
+        android:name="com.google.android.gms.version"
+        android:value="@integer/google_play_services_version"/>
 
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
-
-    </application>
+    <activity android:name=".view.activity.InfoActivity"></activity>
+  </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
new file mode 100644
index 00000000..cf0027e9
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
@@ -0,0 +1,241 @@
+package com.onegini.mobile.exampleapp.view.activity;
+
+import static com.onegini.mobile.exampleapp.view.helper.ErrorMessageParser.parseErrorMessage;
+
+import android.app.DialogFragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.BottomNavigationView;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import com.onegini.mobile.exampleapp.OneginiSDK;
+import com.onegini.mobile.exampleapp.R;
+import com.onegini.mobile.exampleapp.model.ApplicationDetails;
+import com.onegini.mobile.exampleapp.model.ImplicitUserDetails;
+import com.onegini.mobile.exampleapp.model.User;
+import com.onegini.mobile.exampleapp.network.AnonymousService;
+import com.onegini.mobile.exampleapp.network.ImplicitUserService;
+import com.onegini.mobile.exampleapp.storage.DeviceSettingsStorage;
+import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
+import com.onegini.mobile.exampleapp.view.helper.AlertDialogFragment;
+import com.onegini.mobile.sdk.android.handlers.OneginiDeviceAuthenticationHandler;
+import com.onegini.mobile.sdk.android.handlers.OneginiImplicitAuthenticationHandler;
+import com.onegini.mobile.sdk.android.handlers.error.OneginiDeviceAuthenticationError;
+import com.onegini.mobile.sdk.android.handlers.error.OneginiError;
+import com.onegini.mobile.sdk.android.handlers.error.OneginiImplicitTokenRequestError;
+import com.onegini.mobile.sdk.android.model.entity.UserProfile;
+import rx.Subscription;
+
+public class InfoActivity extends AppCompatActivity {
+
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.toolbar)
+  Toolbar toolbar;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.user_profile_id)
+  TextView userProfileId;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.user_profile_name)
+  TextView userProfileName;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.implicit_details)
+  TextView implicitDetails;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.device_details)
+  RelativeLayout deviceDetails;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.application_id)
+  TextView applicationId;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.application_version)
+  TextView applicationVersion;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.platform)
+  TextView platform;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.device_details_fetch_failed)
+  TextView deviceDetailsFetchFailed;
+  @BindView(R.id.bottom_navigation)
+  BottomNavigationView bottomNavigationView;
+
+
+  private DeviceSettingsStorage deviceSettingsStorage;
+  private Subscription subscription;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_info);
+    ButterKnife.bind(this);
+    setupUi();
+    deviceSettingsStorage = new DeviceSettingsStorage(this);
+    authenticateDevice();
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    overridePendingTransition(0, 0);
+  }
+
+  @Override
+  public void onDestroy() {
+    if (subscription != null) {
+      subscription.unsubscribe();
+    }
+    super.onDestroy();
+  }
+
+  private void setupUi() {
+    setupActionBar();
+    setupNavigationBar();
+    setupUserDetails();
+  }
+
+  private void setupUserDetails() {
+    final User user = LoginActivity.selectedUser;
+    if(user == null) {
+      return;
+    }
+
+    userProfileId.setText(user.getUserProfile().getProfileId());
+    userProfileName.setText(user.getName());
+    getImplicitUserDetails(user.getUserProfile());
+  }
+
+  private void showError(final String errorMessage) {
+    final DialogFragment dialog = AlertDialogFragment.newInstance(errorMessage);
+    dialog.show(getFragmentManager(), "alert_dialog");
+  }
+
+  private void setupActionBar() {
+    setSupportActionBar(toolbar);
+
+    final ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setLogo(R.mipmap.ic_launcher);
+      actionBar.setDisplayUseLogoEnabled(true);
+      actionBar.setDisplayShowTitleEnabled(false);
+    }
+  }
+
+  private void setupNavigationBar() {
+    bottomNavigationView.setOnNavigationItemSelectedListener(item -> {
+      final int itemId = item.getItemId();
+      if (itemId == R.id.action_home) {
+        onHomeClicked();
+      } else if (itemId == R.id.action_notifications) {
+        onNotificationsClicked();
+      }
+      return true;
+    });
+  }
+
+  private void onNotificationsClicked() {
+    startActivity(new Intent(this, PendingPushMessagesActivity.class));
+    finish();
+  }
+
+  private void onHomeClicked() {
+    final UserProfile authenticatedUserProfile = OneginiSDK.getOneginiClient(this).getUserClient().getAuthenticatedUserProfile();
+    if (authenticatedUserProfile == null) {
+      startActivity(new Intent(this, LoginActivity.class));
+    } else {
+      startActivity(new Intent(this, DashboardActivity.class));
+    }
+    finish();
+  }
+
+  private void authenticateDevice() {
+    final UserProfile authenticatedUserProfile = OneginiSDK.getOneginiClient(this).getUserClient().getAuthenticatedUserProfile();
+    OneginiSDK.getOneginiClient(this).getDeviceClient()
+        .authenticateDevice(new String[]{ "application-details" }, new OneginiDeviceAuthenticationHandler() {
+              @Override
+              public void onSuccess() {
+                callAnonymousResourceCallToFetchApplicationDetails();
+              }
+
+              @Override
+              public void onError(final OneginiDeviceAuthenticationError error) {
+                onApplicationDetailsFetchFailed();
+                final @OneginiDeviceAuthenticationError.DeviceAuthenticationErrorType int errorType = error.getErrorType();
+
+                if (errorType == OneginiDeviceAuthenticationError.DEVICE_DEREGISTERED) {
+                  new DeregistrationUtil(InfoActivity.this).onDeviceDeregistered();
+                } else if (errorType == OneginiDeviceAuthenticationError.USER_DEREGISTERED) {
+                  new DeregistrationUtil(InfoActivity.this).onUserDeregistered(authenticatedUserProfile);
+                }
+                InfoActivity.this.onError(error);
+              }
+            }
+        );
+  }
+
+  private void callAnonymousResourceCallToFetchApplicationDetails() {
+    final boolean useRetrofit2 = deviceSettingsStorage.shouldUseRetrofit2();
+    subscription = AnonymousService.getInstance(this)
+        .getApplicationDetails(useRetrofit2)
+        .subscribe(this::onApplicationDetailsFetched, throwable -> onApplicationDetailsFetchFailed());
+  }
+
+  private void onApplicationDetailsFetched(final ApplicationDetails details) {
+    deviceDetails.setVisibility(View.VISIBLE);
+    deviceDetailsFetchFailed.setVisibility(View.GONE);
+    applicationId.setText(details.getApplicationIdentifier());
+    applicationVersion.setText(details.getApplicationVersion());
+    platform.setText(details.getApplicationPlatform());
+  }
+
+  private void onApplicationDetailsFetchFailed() {
+    deviceDetails.setVisibility(View.GONE);
+    deviceDetailsFetchFailed.setVisibility(View.VISIBLE);
+  }
+
+  private void onError(final OneginiError error) {
+    error.printStackTrace();
+    showError(parseErrorMessage(error) + " Check logcat for more details.");
+  }
+
+  private void getImplicitUserDetails(final UserProfile userProfile) {
+    OneginiSDK.getOneginiClient(this).getUserClient()
+        .authenticateUserImplicitly(userProfile, new String[]{ "read" }, new OneginiImplicitAuthenticationHandler() {
+          @Override
+          public void onSuccess(final UserProfile profile) {
+            callImplicitResourceCallToFetchImplicitUserDetails();
+          }
+
+          @Override
+          public void onError(final OneginiImplicitTokenRequestError error) {
+            onImplicitDetailsFetchFailed(error);
+            @OneginiImplicitTokenRequestError.ImplicitTokenRequestErrorType int errorType = error.getErrorType();
+            if (errorType == OneginiDeviceAuthenticationError.DEVICE_DEREGISTERED) {
+              new DeregistrationUtil(InfoActivity.this).onDeviceDeregistered();
+            } else if (errorType == OneginiDeviceAuthenticationError.USER_DEREGISTERED) {
+              new DeregistrationUtil(InfoActivity.this).onUserDeregistered(userProfile);
+            }
+          }
+        });
+  }
+
+  private void callImplicitResourceCallToFetchImplicitUserDetails() {
+    final boolean useRetrofit2 = deviceSettingsStorage.shouldUseRetrofit2();
+    subscription = ImplicitUserService.getInstance(this)
+        .getImplicitUserDetails(useRetrofit2)
+        .subscribe(this::onImplicitUserDetailsFetched, this::onImplicitDetailsFetchFailed);
+  }
+
+  private void onImplicitUserDetailsFetched(final ImplicitUserDetails implicitUserDetails) {
+    implicitDetails.setText(implicitUserDetails.toString());
+  }
+
+  private void onImplicitDetailsFetchFailed(final Throwable throwable) {
+    implicitDetails.setText(R.string.implicit_user_details_fetch_failed_label);
+    throwable.printStackTrace();
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index 371551cb..d156e96a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -16,8 +16,6 @@
 
 package com.onegini.mobile.exampleapp.view.activity;
 
-import static com.onegini.mobile.exampleapp.view.helper.ErrorMessageParser.parseErrorMessage;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -39,7 +37,6 @@
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnCheckedChanged;
@@ -47,31 +44,21 @@
 import butterknife.OnItemSelected;
 import com.onegini.mobile.exampleapp.OneginiSDK;
 import com.onegini.mobile.exampleapp.R;
-import com.onegini.mobile.exampleapp.model.ApplicationDetails;
-import com.onegini.mobile.exampleapp.model.ImplicitUserDetails;
 import com.onegini.mobile.exampleapp.model.User;
-import com.onegini.mobile.exampleapp.network.AnonymousService;
-import com.onegini.mobile.exampleapp.network.ImplicitUserService;
-import com.onegini.mobile.exampleapp.storage.DeviceSettingsStorage;
 import com.onegini.mobile.exampleapp.storage.UserStorage;
 import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
 import com.onegini.mobile.exampleapp.view.helper.AlertDialogFragment;
 import com.onegini.mobile.exampleapp.view.helper.RegisteredAuthenticatorsMenu;
 import com.onegini.mobile.sdk.android.client.UserClient;
 import com.onegini.mobile.sdk.android.handlers.OneginiAuthenticationHandler;
-import com.onegini.mobile.sdk.android.handlers.OneginiDeviceAuthenticationHandler;
-import com.onegini.mobile.sdk.android.handlers.OneginiImplicitAuthenticationHandler;
 import com.onegini.mobile.sdk.android.handlers.OneginiPendingMobileAuthWithPushRequestsHandler;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticationError;
-import com.onegini.mobile.sdk.android.handlers.error.OneginiDeviceAuthenticationError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiError;
-import com.onegini.mobile.sdk.android.handlers.error.OneginiImplicitTokenRequestError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiPendingMobileAuthWithPushRequestError;
 import com.onegini.mobile.sdk.android.model.OneginiAuthenticator;
 import com.onegini.mobile.sdk.android.model.entity.CustomAuthenticatorInfo;
 import com.onegini.mobile.sdk.android.model.entity.OneginiMobileAuthWithPushRequest;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
-import rx.Subscription;
 
 public class LoginActivity extends Activity {
 
@@ -94,24 +81,17 @@ public class LoginActivity extends Activity {
   @BindView(R.id.layout_login_content)
   RelativeLayout layoutLoginContent;
   @SuppressWarnings({ "unused", "WeakerAccess" })
-  @BindView(R.id.application_details)
-  TextView applicationDetailsTextView;
-  @SuppressWarnings({ "unused", "WeakerAccess" })
   @BindView(R.id.login_with_preferred_authenticator)
   SwitchCompat usePreferredAuthenticatorSwitchCompat;
-  @SuppressWarnings({ "unused", "WeakerAccess" })
-  @BindView(R.id.implicit_user_details)
-  TextView implicitUserDetailsTextView;
   @BindView(R.id.bottom_navigation)
   BottomNavigationView bottomNavigationView;
 
   public static final String ERROR_MESSAGE_EXTRA = "error_message";
 
+  public static User selectedUser;
+
   private List<User> listOfUsers = new ArrayList<>();
   private boolean userIsLoggingIn = false;
-  private Subscription subscription;
-  private UserProfile authenticatedUserProfile;
-  private DeviceSettingsStorage deviceSettingsStorage;
   private String errorMessage;
 
   @Override
@@ -119,16 +99,6 @@ protected void onCreate(final Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_login);
     ButterKnife.bind(this);
-    deviceSettingsStorage = new DeviceSettingsStorage(this);
-    authenticateDevice();
-  }
-
-  @Override
-  public void onDestroy() {
-    if (subscription != null) {
-      subscription.unsubscribe();
-    }
-    super.onDestroy();
   }
 
   @Override
@@ -138,52 +108,18 @@ protected void onResume() {
     setupUserInterface();
   }
 
+  @Override
+  protected void onPause() {
+    super.onPause();
+    overridePendingTransition(0, 0);
+  }
+
   private void getErrorMessage() {
     if (getIntent().hasExtra(ERROR_MESSAGE_EXTRA)) {
       errorMessage = getIntent().getStringExtra(ERROR_MESSAGE_EXTRA);
     }
   }
 
-  private void authenticateDevice() {
-    authenticatedUserProfile = OneginiSDK.getOneginiClient(this).getUserClient().getAuthenticatedUserProfile();
-    OneginiSDK.getOneginiClient(this).getDeviceClient()
-        .authenticateDevice(new String[]{ "application-details" }, new OneginiDeviceAuthenticationHandler() {
-              @Override
-              public void onSuccess() {
-                callAnonymousResourceCallToFetchApplicationDetails();
-              }
-
-              @Override
-              public void onError(final OneginiDeviceAuthenticationError error) {
-                final @OneginiDeviceAuthenticationError.DeviceAuthenticationErrorType int errorType = error.getErrorType();
-                errorMessage = parseErrorMessage(error);
-                if (errorType == OneginiDeviceAuthenticationError.DEVICE_DEREGISTERED) {
-                  onDeviceDeregistered();
-                } else if (errorType == OneginiDeviceAuthenticationError.USER_DEREGISTERED) {
-                  onUserDeregistered();
-                } else {
-                  LoginActivity.this.onError(error);
-                }
-              }
-            }
-        );
-  }
-
-  private void callAnonymousResourceCallToFetchApplicationDetails() {
-    final boolean useRetrofit2 = deviceSettingsStorage.shouldUseRetrofit2();
-    subscription = AnonymousService.getInstance(this)
-        .getApplicationDetails(useRetrofit2)
-        .subscribe(this::onApplicationDetailsFetched, throwable -> onApplicationDetailsFetchFailed());
-  }
-
-  private void onApplicationDetailsFetched(final ApplicationDetails applicationDetails) {
-    applicationDetailsTextView.setText(applicationDetails.getApplicationDetailsCombined());
-  }
-
-  private void onApplicationDetailsFetchFailed() {
-    applicationDetailsTextView.setText("Application details fetch failed");
-  }
-
   @SuppressWarnings("unused")
   @OnCheckedChanged(R.id.login_with_preferred_authenticator)
   public void usePreferredAuthenticatorSwitchStateChanged() {
@@ -197,11 +133,10 @@ public void usePreferredAuthenticatorSwitchStateChanged() {
   @SuppressWarnings("unused")
   @OnClick(R.id.login_button)
   public void loginButtonClicked() {
-    final UserProfile userProfile = listOfUsers.get(usersSpinner.getSelectedItemPosition()).getUserProfile();
     if (usePreferredAuthenticatorSwitchCompat.isChecked()) {
-      authenticate(userProfile, null);
+      authenticate(selectedUser.getUserProfile(), null);
     } else {
-      showRegisteredAuthenticatorsPopup(userProfile);
+      showRegisteredAuthenticatorsPopup(selectedUser.getUserProfile());
     }
   }
 
@@ -222,61 +157,7 @@ public void registerButtonClicked() {
   @SuppressWarnings("unused")
   @OnItemSelected(R.id.users_spinner)
   void onItemSelected(int position) {
-    final User user = listOfUsers.get(position);
-    getImplicitUserDetails(user.getUserProfile());
-  }
-
-  private void getImplicitUserDetails(final UserProfile userProfile) {
-    OneginiSDK.getOneginiClient(this).getUserClient()
-        .authenticateUserImplicitly(userProfile, new String[]{ "read" }, new OneginiImplicitAuthenticationHandler() {
-          @Override
-          public void onSuccess(final UserProfile profile) {
-            callImplicitResourceCallToFetchImplicitUserDetails();
-          }
-
-          @Override
-          public void onError(final OneginiImplicitTokenRequestError oneginiImplicitTokenRequestError) {
-            handleImplicitAuthenticationErrors(oneginiImplicitTokenRequestError, userProfile);
-            implicitUserDetailsTextView.setText(oneginiImplicitTokenRequestError.getErrorType() + ": " +
-                getString(R.string.implicit_user_details_fetch_failed_label));
-          }
-        });
-  }
-
-  private void callImplicitResourceCallToFetchImplicitUserDetails() {
-    final boolean useRetrofit2 = deviceSettingsStorage.shouldUseRetrofit2();
-    subscription = ImplicitUserService.getInstance(this)
-        .getImplicitUserDetails(useRetrofit2)
-        .subscribe(this::onImplicitUserDetailsFetched, this::onImplicitDetailsFetchFailed);
-  }
-
-  private void onImplicitUserDetailsFetched(final ImplicitUserDetails implicitUserDetails) {
-    implicitUserDetailsTextView.setText(implicitUserDetails.toString());
-  }
-
-  private void onImplicitDetailsFetchFailed(final Throwable throwable) {
-    implicitUserDetailsTextView.setText(R.string.implicit_user_details_fetch_failed_label);
-    throwable.printStackTrace();
-  }
-
-  private void handleImplicitAuthenticationErrors(final OneginiImplicitTokenRequestError error, final UserProfile userProfile) {
-    @OneginiImplicitTokenRequestError.ImplicitTokenRequestErrorType int errorType = error.getErrorType();
-    switch (errorType) {
-      case OneginiImplicitTokenRequestError.USER_DEREGISTERED:
-        new DeregistrationUtil(this).onUserDeregistered(userProfile);
-        break;
-      case OneginiImplicitTokenRequestError.DEVICE_DEREGISTERED:
-        new DeregistrationUtil(this).onDeviceDeregistered();
-        break;
-      case OneginiImplicitTokenRequestError.NETWORK_CONNECTIVITY_PROBLEM:
-      case OneginiImplicitTokenRequestError.SERVER_NOT_REACHABLE:
-      case OneginiImplicitTokenRequestError.CONFIGURATION_ERROR:
-      case OneginiImplicitTokenRequestError.GENERAL_ERROR:
-      default:
-        // Just display the error for other, less relevant errors
-        error.printStackTrace();
-        break;
-    }
+    selectedUser = listOfUsers.get(position);
   }
 
   private void setupUserInterface() {
@@ -382,16 +263,6 @@ private void handleAuthenticationErrors(final OneginiAuthenticationError error,
     }
   }
 
-  private void onDeviceDeregistered() {
-    new DeregistrationUtil(this).onDeviceDeregistered();
-    showError();
-  }
-
-  private void onUserDeregistered() {
-    new DeregistrationUtil(this).onUserDeregistered(authenticatedUserProfile);
-    showError();
-  }
-
   private void onError(final OneginiError error) {
     error.printStackTrace();
     errorMessage = error.getMessage() + " Check logcat for more details.";
@@ -435,12 +306,10 @@ private void setupNavigationDrawer() {
       final int itemId = item.getItemId();
       if (itemId == R.id.action_notifications) {
         startActivity(new Intent(LoginActivity.this, PendingPushMessagesActivity.class));
-        return true;
-      } else if (itemId == R.id.action_resources) {
-        Toast.makeText(LoginActivity.this, "Not implemented yet", Toast.LENGTH_SHORT).show();
-        return true;
+      } else if (itemId == R.id.action_info) {
+        startActivity(new Intent(LoginActivity.this, InfoActivity.class));
       }
-      return false;
+      return true;
     });
 
     OneginiSDK.getOneginiClient(this).getUserClient().getPendingMobileAuthWithPushRequests(new OneginiPendingMobileAuthWithPushRequestsHandler() {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
index b339de03..10ecb69d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
@@ -30,7 +30,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.onegini.mobile.exampleapp.OneginiSDK;
@@ -73,6 +72,12 @@ protected void onResume() {
     fetchPendingTransactions();
   }
 
+  @Override
+  protected void onPause() {
+    super.onPause();
+    overridePendingTransition(0, 0);
+  }
+
   private void setupUi() {
     setupActionBar();
     setupListView();
@@ -90,8 +95,8 @@ private void setupNavigationBar() {
     bottomNavigationView.getMenu().findItem(R.id.action_notifications).setChecked(true);
     bottomNavigationView.setOnNavigationItemSelectedListener(item -> {
       final int itemId = item.getItemId();
-      if (itemId == R.id.action_resources) {
-        onHttpClicked();
+      if (itemId == R.id.action_info) {
+        onInfoClicked();
       } else if (itemId == R.id.action_notifications) {
         onNotificationsClicked();
       } else {
@@ -156,8 +161,9 @@ private void onNotificationsClicked() {
     fetchPendingTransactions();
   }
 
-  private void onHttpClicked() {
-    Toast.makeText(this, "Not implemented yet", Toast.LENGTH_SHORT).show();
+  private void onInfoClicked() {
+    startActivity(new Intent(this, InfoActivity.class));
+    finish();
   }
 
   private void showError(final String text) {
diff --git a/app/src/main/res/drawable-hdpi/ic_http_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_http_white_24dp.png
deleted file mode 100644
index bc8056e119a76ca41b1f893e004e9481a800478e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpYEKu(kP61PlP+=|3gB@y?kr<*
zuUK5t`6}P-rH14}WsAnL=GUqsLKPfh-3m|U%)iai9yI0AdkroV4L1(i1y}S>HfC*d
zymYyDKbOlN4v8boNAzd98FM*4>-@a?!inccw_oHo^{Ozf|DAhz>T9Wm)>F<!Yq&d4
zxR(3)5(n%2_D8+TIM&w1l(jUm`~5Y)B|K|k36t^tmZZ}U7yjd)S-zs=MOjPVMkmo#
c7xJC-7pPunZu_pk5a?_MPgg&ebxsLQ0K)=XlK=n!

diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7b1113cfef22bcec86ead7ae67be12326276cab
GIT binary patch
literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00053Nkl<Zcmd_s
zK}sWE5C`CAx5mX^4Q|E5xDiCrg^NfKZz9sTP|yJlM(_gSUuBLV9>W+#V#f>U=9~3v
zy5k#|%`o-bRp5gvNWBjKU}@RX_o(#cOX<;tO*2A$>f4JBeW<IkLOT`eDov`9&i7F6
z3c!;itCqC1ELnAI0H80Q1m%7L26kjZC7G@v;7;BQT>-BBCp2Wv4dAi~>H>ZU-{cI?
zse=}k;97{XqEJ|gdQ)z}NLv+h2nN-m6riYd=e>Y~D%A1;c7!A-*ac%VF|-AqWJ2?3
zQF6~<BZm6mNRXZr(2Jo*uqsH;8hD7I5-bVHqXo<0J%+wOOGsXJFbh8aI24VR2t}hM
zEIWb{mwf?_e+xPV=P|Si2C`%*Hw5d|zsMMLlc7COnvS8M07G+0(1KU6FI1tn5x7Y@
zBlqCVyecH<0M1Manlq&b*ls$teZZ~xMrOf1pf~CG-vM6i$_3Tm_q+oBmrZ_-E&)6{
zv1Zw<S<BX(8UpCazJDM)Mkdvp?bIi`?Z8-FmG<lR7c^zYhMouSK7D%k;M}_Dw2z2{
b{5{Yw40E*CJGBE$00000NkvXXu0mjfPuAE+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_http_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_http_white_24dp.png
deleted file mode 100644
index c3a7a0f6250bce97c9817fa788a23422ad5deab8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i2u~Ns5R21q`z^T+81S%s&#b#8
z)>z~HzbGL{VrIkR3D+KEmK=C7!E7~C#36-=66v>gi$B+x!QitnL1DucB}d<d=e<7e
t{Oz0ZbUH(TW!vOsP3r#th0L^zn71;`ta!Fibtcdb22WQ%mvv4FO#o8BH3a|w

diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..353e064951788a29a64eef439284fd97e904f374
GIT binary patch
literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco00038Nkl<ZcmciA
zL2BY)6u|K>T_h)IX%8`!xx#?O($dW=BI;pgAmAMoJ&FVmpak^_M&10n8om%>Hp0CB
z>RbH6BfRjxN9M~)<?5=k^eGdX1<i(z+H>&M4Ia$ETJBLQ^<<<3g$He5hLhidW{F&l
zq78;P`5|=ls>YxRGDkGO4)Ha@UK+s{*1}DYDDe@&3c1kJ7>fuhJobWT>>{`#?O7?v
zaJd6ic<Kc&*ha9#s25BzkKhxfr02J8@E$?tfcz$yppr%qyrK3gboA31zuL!Fpq5Ko
z$2W1t->&m6Kxyn*Ci7xy1O7D6yV<~Ad#ZoSbb%oCVPWUuVr%YQDrkfL?gZZ)JBOfu
SH&bZ<0000<MNUMnLSTaQqmeiO

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_http_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_http_white_24dp.png
deleted file mode 100644
index f13c8085f0b3e4b1f13464a12f05ac478dc9079f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D2u~Nskcif|=N-8k40sq0%6<JW
zQoHO|<JX*M0}jTibE9V+xD=$~`HPp~g}T+l>&;UwjTttiuz$OKprS9v^tR*QwT<1n
t)&a@)tHo}t@ZoIycFMs-!SmAdx!aYM^ir4_Rsii_@O1TaS?83{1OUzxGr9l(

diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c571b2e3e776762bb90733f664f9d66e2c7f321c
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00073Nkl<ZcmeI#
zK}*|y9LMqBza|xR7io#OO`pL~gi3uN!aR79mOg=v);<8;yeblKyDI(*y@=qm7#2^~
zDvDmzZlIz~F7F+_{GgD8B)<;Ez}M#*`i7(liTW43BEtf8nw-$Z$EV8)O;#zALB%cZ
zfN3_kA<8vhm@*GI?BEl}!zFJLSmq~5by-Rmu=!5E2X-k@AV-!gc?y)-<B@(YR?@&I
zM`&=$3L}IcSE7vuhm0l(*c_of^9c(TJ#4DH^d+qLz&EruA5aN4LkG=`3oN7kz(FP4
z1jlF}i4NfK3(-#T^OEQw?#V?5b`Z}ICr48uo27@?jtWfUBR->22NX4g$Gh;r2I3UU
zC}4AjSPu(ixIwI-i~@=>;)?%*fd#|^BPhd-@r0NU2I`1i6z1DU)PjK~qBKyTf@lN-
zCy2s8fg++640I7Wl<`GYIEcGoz(-^U3JfE>zYypm@_+0U8C+z9*+p(5%4UK1zv(Js
zZ=k^ch-xrUL_9KT9C*VMq7V#ZxJHzW0~N$&*uzfo7172v3S>D)tf9gJQ}~FgQJ{|K
z@irKcxri5LQU~VfAvRG_fjnJAhY3`QO>%*_Wjs2dSVB8ak(i`~wix%~<)U?%MJ3oA
z7ie3kxPZkW+6y&o6w%94r-ydHP_ma_Nr*Gbj78j570v<efRUuH?-nlo9@(ct5r<)h
zaVS!u!4v(q7)tj6vcx?}-Lh!%36*0Tk2pOx88`n3e9t;pM7d;5?po7;EW<oC8nn2>
p!{d$?4XPC6k!Bt+*lWOGzX87wDYF(rDzN|n002ovPDHLkV1ir08p{9x

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_http_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_http_white_24dp.png
deleted file mode 100644
index eebe0bfe1508a48df688d51504f13ec8fb09966e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawmU+53hGg7(d)b?>$w0&{QEivr
zG*^kz_#-W~4c-UmvuHXQPR-`IQefv6Gpp#3@@b$J28M>YHs-S}?Rl=P+4=O>))RdE
zcSB#z^1E<Z*Tc%jLo1j&>#bv+&8zFLKAvcQ{j=oV)jFX&sk6?Py*}eO|Jld8J>{Kt
zXM|ZK<8InHzBgIPDtcS~nVjQPz58`}`}tm7S;0}%_vbBdw1CTncy>mxb-7g!eljH1
S&YCF-;(EIJxvX<aXaWHHW?3%)

diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41a5fcffa8c4dc3684252fbfd61623837e19d50
GIT binary patch
literal 953
zcmV;q14jIbP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000AkNkl<ZcmeI&
z-%C_!9LMn|ta0niXvoYO-HLy}(l08pXtxHu3D%4Lijq@=;-3(-f(i=Dn!|47)=e@J
zLBUj#$P)VxEMs1!HH<@d&6%P1diUkwcz(<|&jVh}>+=u1!Si^=c~o6pU56D8MW!jS
z$u@O7JnC$-Nr`E0Z~~QViq1F4UDojk)8rj4KiUtv${KCrYEfp?UeGn(lf*h#%m<z3
zZ_;?oDU(6B_)1z0#?1uvvdF=9dBOxmh8Q5TzX66QGQkR;IoKSTv_XAT@T)V&IaJ8b
zGtVA=ugIneD)29$`-F>wiZO?K>;SqC6p{w@`EooS#EOw+c}UBbluHuSO9kD3{Dexd
zGgQ&NCewM)0=iXlsD$fh4c%;~LATKTP7f-@j<SUA*G_^?^A$Zu8JM2bU@(5r3LsYL
zF%r~684!QQ4Z5a3%8}0wBJx?P0%9~?(0ha@Co4se>@01>+c-g20r3E3BuF*`h>_@^
zHN+<z<3Txg5vx%_gR~JY%2<%>KB7e-Jm@Z>j$<V#%O2uRc+fgx4rOTzh&N$D4j$s1
zwV;cLZyXN}Dk64K)^>y%;(Bn<G~x-$;+`U=f`dwk39CUa;!$wWCZcFHXbiCt9JGxX
zLdgsrd)Y8zD>$f*7_b_YN7RCYJVeH7P%ol+c!LiAkL*xA)X9%M!t}A%e=*t&auG}M
zUL7k|gPtKKgM)4$K3fdZU#`Cd2c5t}oVOJe{qaNg4l!>nXc19Cg$22YJsc}RIU0!D
zQ6KVKh<jFoCJ`R_@E}DQu|w8)P#<3q&rwl9qkwp5JZKgHmx6<2>xdR-j0Rnxtv}Fl
zg03K-O24t7lYB&c=W=+E>@fn$hQ5wD$_oT6qv8ggqJe-vjQr`djDR|Y=pflR=t-%+
z(kr36+3A;_^XSU-C(b#^3v@H6PJ=SMLRaN%qMQqSME8<o@q=VJKA>wcL$0HkK4xj7
z`v)iS)q*bxcDYYB<~wVOFW}3`r@4H|@fyE97P!cfkP~%@MH=|M#7TQSm0^y9)p&}_
z7{lc0-Cv$z#&CH?jf4HhF*6r<<1|RC&P|h7oP+#Da^G2|VEz(#l(!^NVZ`1w`3S4D
zh|A+Sm+k)}L4iBGp-Gr;RJbh%++L9EIM<ot5gTk#qq)BtTWqkzBtP>5D%liv*A40h
bb%Xu~a~|hNXxfgr00000NkvXXu0mjfV)nVh

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_http_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_http_white_24dp.png
deleted file mode 100644
index 2d59f80c4602b414e07b8bee1866aaa66945a85f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgW_r3fhE&{od)1Jy$v~nlG0n0q
zZsH47!*j=~AAFNM{AdB&#2J4+*<>$#sGE7)1gHTBHUw1~r0NLk{Ci`%T;|d>UWwRE
zt7QxPGqTxLe!pTo{)+MNb;kKU`li=!m;cvFIJI7ELtDem**hE@;%yfI6`osm#PHXr
z&)dD<{flSgd3o73@~@Wo%{QH_90CdsU<()+40bVQ&uBV!|8R*UNW|0C&t;ucLK6VE
CfKns?

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a82cab3b4f2cfe77333cee6121d867353753d5e
GIT binary patch
literal 1279
zcmV<b1OWSqP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000EWNkl<ZcmeI(
z$!ip89Eb7OG)THTi(nQ5BF0G^my6;}aPTq{CF4q?k|BcsfJ^A8aRsl6-hvv9%%JFm
zc=Zssi-d`I6*6ON6XHr-(uomA?Rw_?d%N0Nx~g7f`t$t<>XA;<CGV?BN=iyfN`k{Y
zS~<ui?lQ~-AIXv9BNGgBhh7fSN<AvbDS}xADK3z~jS+g-O7dF?D5I5rKH$|1eXOU<
zY(N!h#wf-p9aNeLNOFXC1mO)`B%%&z=NUm7r!BgGMcgI~11yXpU>DPbB};p_0dfAo
z$vAy<v6&S#5GO{AI1Q|13y0|ADNZg>9#+6S9#ELYJ@(Lqa#%C_802gIqArYp#f(wN
zJ5D-2x}I^0EQMtFA?SeRyu{vHx_o|<S8;?%>^)~`kO7MeJbsRD=Aw#N4d<{5Bs2vT
z(7+gW9<dq~z}D~>I~nSN2#E6lJC{kK0$L^4urow?@d3Y+FGmL|;O)mE-^F4Bc9HL2
zQm7ENoloT3SxmqprfnYoS5!#bXp=BSqyK>0=yIe`A#Mj2x&gld?d0n~g}ejgYx5J3
z<QcllDA&^|*ZULQI0^3ohtWME8A(7D8Fc%-22}ADDaUG5Bms(_u#jF;;VmGIt{W9u
zfT9Q8UM~SL#*p4JH`0JwvPe%Tb05%(t_u}ufZ{m17WV=DNbjhOJfNB^(p9$s6?{NC
ziHbZxaT@7833mZ0B#S1Lfh|F|$z8w&q<bhs8$vqkE+B)n$5=ob>2Egy^UyUJ3s{D(
z);XXRX&hy6FOb$b2OLD|GaAs3)ae{>38~9yz)_?g=YYFNn~esfkZw5#3?r>T`I=7o
z+A5@n&H)oh4MqdzBfWAC_=prY8jwJmaSq5K#f%2TkiLBX0pHn2D2X)lKlmdaMq2s3
zeU08h+F~>yg>=(7pcm<o(STz}=ZpF=XCUA@Qri2^>8C~mULv(P2h^i$HWskl&kK!W
z1ZkhKfKETJl!_jtL1O{;k-FUlY(=tYHWIKD-3E67NoJ5v83{OpG)>%HfT9m6OI73n
zbC^cDf^r+M9^H}115Tj(#eF~-qezp~L>f@f6jFv+?gJDZ=*~qN(2H(2%1b~cZ;&k3
zL>90X-2_Q*0g5hkkEx6#pqf#1X_VK11mozgMH0}DZj8A107V=5_M<}HVe)PBd(>b6
zoyB%ki2Dr--3^rAfQ4kyePSajq;2Lix=9xJ4^Xs&O~Q_l{`EhTudUbvPZ!B&aUg`x
zzD2%ssA2=k8N$vrDp3KgnttpIGQ0QyMI9OJJZ23lfURW|J0sKtb?mZ<=h(66p%zud
z>bZoyXEX+R@O5c{1jurnYLt)7;RI9Id&-iaj~+Mi1PVr+=0}fjTW6S}kP#ZgIQ(7D
z5MMJynq@Bjr=gSke9a&=VI99OrxzzL=;tUYRxzIhF=8Z{&ni+J<2o;Ka+cZQUVzxi
z6k(a9Es85BjSLWm8!U+K5>OlC1Zk9QQD4JKaDdkYVS+SqGZ*11*vk`&kzqGU(^nB&
zxXOFHn&t{WGwWNq44PmQXZZ&=hUsR5_|TXQ5UXPyo%C>vhrD8jFMMH!S3Kk<=SkB-
pEh@+<Os^DRa;1P$Kq;UU@E-(*#@c1Rm*W5c002ovPDHLkV1iCcH*Wv{

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
new file mode 100644
index 00000000..7fcc1c73
--- /dev/null
+++ b/app/src/main/res/layout/activity_info.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.onegini.mobile.exampleapp.view.activity.InfoActivity">
+
+  <android.support.v7.widget.Toolbar
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="?attr/actionBarSize"
+      android:background="?attr/colorPrimary"
+      app:contentInsetLeft="0dp"
+      app:contentInsetStart="0dp"
+      android:elevation="4dp"
+      android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+      app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+        android:text="@string/toolbar_name_info"
+        android:textColor="@color/white"
+        android:layout_gravity="center"
+        android:id="@+id/toolbar_title"/>
+
+  </android.support.v7.widget.Toolbar>
+
+  <TextView
+      android:id="@+id/user_details_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/user_details_label_text"
+      android:layout_below="@id/toolbar"
+      android:textSize="20sp"
+      android:layout_margin="@dimen/activity_margin"/>
+
+  <RelativeLayout
+      android:id="@+id/user_details"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/user_details_label"
+      android:layout_marginLeft="@dimen/activity_margin_small"
+      android:layout_marginStart="@dimen/activity_margin_small">
+
+    <TextView
+        android:id="@+id/user_profile_id_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:text="@string/user_profile_id_label_text"/>
+
+    <TextView
+        android:id="@+id/user_profile_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/user_profile_id_label"
+        android:layout_toRightOf="@+id/user_profile_id_label"
+        android:layout_toEndOf="@+id/user_profile_id_label"/>
+
+    <TextView
+        android:id="@+id/user_profile_name_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/user_profile_id_label"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:text="@string/user_profile_name_label_text"/>
+
+    <TextView
+        android:id="@+id/user_profile_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/user_profile_name_label"
+        android:layout_toRightOf="@id/user_profile_name_label"
+        android:layout_toEndOf="@id/user_profile_name_label"
+        android:layout_margin="@dimen/activity_margin_small"/>
+
+    <TextView
+        android:id="@+id/implicit_details_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/user_profile_name"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:text="@string/implicit_details_label_text"/>
+
+    <TextView
+        android:id="@+id/implicit_details"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/implicit_details_label"
+        android:layout_toRightOf="@id/implicit_details_label"
+        android:layout_toEndOf="@id/implicit_details_label"
+        android:layout_margin="@dimen/activity_margin_small"/>
+
+  </RelativeLayout>
+
+  <TextView
+      android:id="@+id/device_details_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/user_details"
+      android:textSize="20sp"
+      android:layout_margin="@dimen/activity_margin"
+      android:text="@string/device_details_label_text"/>
+
+  <RelativeLayout
+      android:id="@+id/device_details"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_below="@id/device_details_label"
+      android:layout_marginLeft="@dimen/activity_margin_small"
+      android:layout_marginStart="@dimen/activity_margin_small">
+
+    <TextView
+        android:id="@+id/application_id_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:text="@string/application_id_label_text"/>
+
+    <TextView
+        android:id="@+id/application_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/application_id_label"
+        android:layout_toRightOf="@+id/application_id_label"
+        android:layout_toEndOf="@+id/application_id_label"/>
+
+    <TextView
+        android:id="@+id/application_version_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/application_id_label"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:text="@string/application_version_label_text"/>
+
+    <TextView
+        android:id="@+id/application_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/application_version_label"
+        android:layout_toRightOf="@id/application_version_label"
+        android:layout_toEndOf="@id/application_version_label"
+        android:layout_margin="@dimen/activity_margin_small"/>
+
+    <TextView
+        android:id="@+id/platform_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/application_version_label"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:text="@string/platform_label_text"/>
+
+    <TextView
+        android:id="@+id/platform"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/platform_label"
+        android:layout_margin="@dimen/activity_margin_small"
+        android:layout_toRightOf="@+id/platform_label"
+        android:layout_toEndOf="@+id/platform_label"/>
+
+  </RelativeLayout>
+
+  <TextView
+      android:id="@+id/device_details_fetch_failed"
+      android:layout_below="@id/device_details_label"
+      android:visibility="gone"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_margin="@dimen/activity_margin"
+      android:text="@string/fetch_application_details_exception"/>
+
+  <android.support.design.widget.BottomNavigationView
+      android:id="@+id/bottom_navigation"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:itemBackground="@color/colorPrimary"
+      app:itemIconTint="@color/white"
+      app:itemTextColor="@color/white"
+      app:menu="@menu/bottom_navigation_menu"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a5282288..3b36bdff 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -40,35 +40,23 @@
 
         <TextView
             android:id="@+id/label"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
             android:paddingTop="@dimen/activity_margin"
             android:textSize="18sp"
             android:text="@string/app_name"
-            android:layout_below="@+id/img_logo" />
-
-        <TextView
-            android:id="@+id/implicit_user_details"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:visibility="gone"
-            android:layout_below="@+id/label"
-            android:layout_marginTop="@dimen/activity_margin"
-            android:layout_marginBottom="@dimen/activity_margin_small"
-            android:layout_centerHorizontal="true"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:ellipsize="end" />
+            android:layout_alignBottom="@+id/img_logo"
+            android:layout_alignRight="@+id/img_logo"
+            android:layout_alignEnd="@+id/img_logo"/>
 
         <Spinner
             android:id="@+id/users_spinner"
+            android:layout_marginTop="80dp"
             android:layout_marginLeft="60dp"
             android:layout_marginRight="60dp"
             android:visibility="invisible"
             android:layout_width="fill_parent"
-            android:layout_below="@+id/implicit_user_details"
+            android:layout_below="@+id/label"
             android:layout_height="wrap_content" />
 
         <Button
@@ -90,18 +78,6 @@
             android:layout_marginBottom="@dimen/activity_margin_small"
             style="@style/SwitchCompatStyle"/>
 
-        <TextView
-            android:id="@+id/application_details"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:visibility="visible"
-            android:layout_below="@+id/login_with_preferred_authenticator"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/activity_margin_small"
-            android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
-            android:gravity="center_horizontal" />
     </RelativeLayout>
 
     <ProgressBar
diff --git a/app/src/main/res/menu/bottom_navigation_menu.xml b/app/src/main/res/menu/bottom_navigation_menu.xml
index 82986a9f..e5a9f137 100644
--- a/app/src/main/res/menu/bottom_navigation_menu.xml
+++ b/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -15,9 +15,9 @@
         android:icon="@drawable/ic_notifications_white_24dp"
         app:showAsAction="always" />
     <item
-        android:id="@+id/action_resources"
+        android:id="@+id/action_info"
         android:enabled="true"
-        android:title="@string/navigation_menu_resource_call"
-        android:icon="@drawable/ic_http_white_24dp"
+        android:title="@string/navigation_menu_info"
+        android:icon="@drawable/ic_info_outline_white_24dp"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af389cec..13ccb9a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="settings_retrofit_client">Client for resource calls:</string>
     <string name="toolbar_name_devices_activity">Devices</string>
     <string name="toolbar_name_pending_notifications">Pending notifications</string>
+    <string name="toolbar_name_info">Info</string>
     <string name="settings_authenticators_possible_authenticators">Possible authenticators:</string>
     <string name="simple_push_message">Simple push message</string>
     <string name="change_pin_finished_successfully">Change PIN action finished successfully</string>
@@ -66,7 +67,7 @@
     <string name="btn_auth_cancel_label">CANCEL</string>
     <string name="push_token_is_null_error_message">The push token is null, check if your Firebase configuration in google-services.json file is valid.</string>
     <string name="use_preferred_authenticator_label">USE PREFERRED AUTHENTICATOR</string>
-    <string name="implicit_user_details_fetch_failed_label">Implicit user details fetch failed</string>
+    <string name="implicit_user_details_fetch_failed_label">failed to fetch</string>
     <string name="custom_auth_positive_action">Return success</string>
     <string name="custom_auth_negative_action">Return failure</string>
     <string name="custom_auth_error_action">Return error</string>
@@ -80,8 +81,17 @@
     <string name="enable_mobile_authentication_finished_successfully">Mobile authentication enabled</string>
     <string name="enable_mobile_authentication_with_push_finished_successfully">Mobile authentication with push enabled</string>
     <string name="navigation_menu_home">Home</string>
-    <string name="navigation_menu_resource_call">Resource call</string>
+    <string name="navigation_menu_info">Info</string>
     <string name="no_notifications">No notifications</string>
     <string name="multiple_notifications">Notifications: %1$d</string>
     <string name="notification_expires_at">Will expire at %1$s</string>
+    <string name="user_details_label_text">User details:</string>
+    <string name="user_profile_id_label_text">User profile ID:</string>
+    <string name="user_profile_name_label_text">User profile name:</string>
+    <string name="implicit_details_label_text">Implicit details:</string>
+    <string name="device_details_label_text">Device details:</string>
+    <string name="application_id_label_text">Application ID:</string>
+    <string name="application_version_label_text">Application version:</string>
+    <string name="fetch_application_details_exception">Couldn\'t fetch application details</string>
+    <string name="platform_label_text">Platform:</string>
 </resources>

From 90acdd890da41f9091e728922c9f245a7fe22f51 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 30 Jan 2018 14:23:12 +0100
Subject: [PATCH 10/31] EXAMPLEAND-45 remove unused method

---
 .../onegini/mobile/exampleapp/model/ApplicationDetails.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java
index cf3ef214..1fd946a3 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/ApplicationDetails.java
@@ -39,8 +39,4 @@ public String getApplicationPlatform() {
   public String getApplicationVersion() {
     return applicationVersion;
   }
-
-  public String getApplicationDetailsCombined() {
-    return String.format("%s %s %s", getApplicationPlatform(), getApplicationIdentifier(), getApplicationVersion());
-  }
 }

From 0b36f6e7f507804cb99cc20fbd4d26dc2e35f76d Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 30 Jan 2018 16:45:07 +0100
Subject: [PATCH 11/31] EXAMPLEAND-45 reformat XMLs

---
 app/src/main/AndroidManifest.xml           | 258 ++++++++--------
 app/src/main/res/layout/activity_info.xml  | 324 ++++++++++-----------
 app/src/main/res/layout/activity_login.xml |  24 +-
 3 files changed, 303 insertions(+), 303 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5341e7fd..b4594a62 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,141 +14,141 @@
   limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.onegini.mobile.exampleapp">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.onegini.mobile.exampleapp">
 
-  <application
-      android:name=".ExampleApplication"
-      android:allowBackup="false"
-      android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name"
-      android:supportsRtl="true"
-      android:theme="@style/AppTheme"
-      tools:replace="android:allowBackup">
-    <activity
-        android:name=".view.activity.SplashScreenActivity"
-        android:screenOrientation="portrait">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
+    <application
+        android:name=".ExampleApplication"
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
+        <activity
+            android:name=".view.activity.SplashScreenActivity"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-    </activity>
-    <activity
-        android:name=".view.activity.LoginActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"></activity>
-    <activity
-        android:name=".view.activity.RegistrationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".view.activity.LoginActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".view.activity.RegistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
 
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
 
-        <data android:scheme="oneginiexample"/>
-      </intent-filter>
-    </activity>
-    <activity
-        android:name=".view.activity.PinActivity"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.FingerprintActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.CustomAuthActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.DashboardActivity"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.SettingsAuthenticatorsActivity"
-        android:parentActivityName=".view.activity.SettingsActivity"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.SettingsActivity"
-        android:parentActivityName=".view.activity.DashboardActivity"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.MobileAuthenticationActivity"
-        android:excludeFromRecents="true"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"
-        android:taskAffinity=""/>
-    <activity
-        android:name=".view.activity.MobileAuthenticationPinActivity"
-        android:excludeFromRecents="true"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"
-        android:taskAffinity=""/>
-    <activity
-        android:name=".view.activity.MobileAuthenticationFingerprintActivity"
-        android:excludeFromRecents="true"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"
-        android:taskAffinity=""/>
-    <activity
-        android:name=".view.activity.MobileAuthenticationCustomActivity"
-        android:excludeFromRecents="true"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"
-        android:taskAffinity=""/>
-    <activity
-        android:name=".view.activity.DevicesListActivity"
-        android:parentActivityName=".view.activity.DashboardActivity"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.PendingPushMessagesActivity"
-        android:parentActivityName=".view.activity.DashboardActivity"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.BasicAuthenticatorRegistrationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.BasicAuthenticatorDeregistrationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.BasicAuthenticatorAuthenticationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.PasswordAuthenticatorRegistrationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.PasswordAuthenticatorDeregistrationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
-    <activity
-        android:name=".view.activity.PasswordAuthenticatorAuthenticationActivity"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"/>
+                <data android:scheme="oneginiexample"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".view.activity.PinActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.FingerprintActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.CustomAuthActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.DashboardActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.SettingsAuthenticatorsActivity"
+            android:parentActivityName=".view.activity.SettingsActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.SettingsActivity"
+            android:parentActivityName=".view.activity.DashboardActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.MobileAuthenticationActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""/>
+        <activity
+            android:name=".view.activity.MobileAuthenticationPinActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""/>
+        <activity
+            android:name=".view.activity.MobileAuthenticationFingerprintActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""/>
+        <activity
+            android:name=".view.activity.MobileAuthenticationCustomActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:taskAffinity=""/>
+        <activity
+            android:name=".view.activity.DevicesListActivity"
+            android:parentActivityName=".view.activity.DashboardActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PendingPushMessagesActivity"
+            android:parentActivityName=".view.activity.DashboardActivity"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.BasicAuthenticatorRegistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.BasicAuthenticatorDeregistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.BasicAuthenticatorAuthenticationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PasswordAuthenticatorRegistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PasswordAuthenticatorDeregistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.PasswordAuthenticatorAuthenticationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
 
-    <service android:name=".network.fcm.FCMListenerService">
-      <intent-filter>
-        <action android:name="com.google.firebase.MESSAGING_EVENT"/>
-      </intent-filter>
-    </service>
-    <service android:name=".network.fcm.FCMInstanceIdService">
-      <intent-filter>
-        <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-      </intent-filter>
-    </service>
-    <service
-        android:name=".network.fcm.MobileAuthenticationService"
-        android:exported="false"/>
+        <service android:name=".network.fcm.FCMListenerService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service android:name=".network.fcm.FCMInstanceIdService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".network.fcm.MobileAuthenticationService"
+            android:exported="false"/>
 
-    <meta-data
-        android:name="com.google.android.gms.version"
-        android:value="@integer/google_play_services_version"/>
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version"/>
 
-    <activity android:name=".view.activity.InfoActivity"></activity>
-  </application>
+        <activity android:name=".view.activity.InfoActivity"></activity>
+    </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
index 7fcc1c73..73a8fc7c 100644
--- a/app/src/main/res/layout/activity_info.xml
+++ b/app/src/main/res/layout/activity_info.xml
@@ -1,186 +1,186 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.onegini.mobile.exampleapp.view.activity.InfoActivity">
-
-  <android.support.v7.widget.Toolbar
-      android:id="@+id/toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="?attr/actionBarSize"
-      android:background="?attr/colorPrimary"
-      app:contentInsetLeft="0dp"
-      app:contentInsetStart="0dp"
-      android:elevation="4dp"
-      android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-      app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:context="com.onegini.mobile.exampleapp.view.activity.InfoActivity">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:contentInsetLeft="0dp"
+        app:contentInsetStart="0dp"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+            android:text="@string/toolbar_name_info"
+            android:textColor="@color/white"
+            android:layout_gravity="center"
+            android:id="@+id/toolbar_title"/>
+
+    </android.support.v7.widget.Toolbar>
 
     <TextView
+        android:id="@+id/user_details_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
-        android:text="@string/toolbar_name_info"
-        android:textColor="@color/white"
-        android:layout_gravity="center"
-        android:id="@+id/toolbar_title"/>
-
-  </android.support.v7.widget.Toolbar>
-
-  <TextView
-      android:id="@+id/user_details_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/user_details_label_text"
-      android:layout_below="@id/toolbar"
-      android:textSize="20sp"
-      android:layout_margin="@dimen/activity_margin"/>
-
-  <RelativeLayout
-      android:id="@+id/user_details"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@id/user_details_label"
-      android:layout_marginLeft="@dimen/activity_margin_small"
-      android:layout_marginStart="@dimen/activity_margin_small">
+        android:text="@string/user_details_label_text"
+        android:layout_below="@id/toolbar"
+        android:textSize="20sp"
+        android:layout_margin="@dimen/activity_margin"/>
 
-    <TextView
-        android:id="@+id/user_profile_id_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:text="@string/user_profile_id_label_text"/>
-
-    <TextView
-        android:id="@+id/user_profile_id"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/user_profile_id_label"
-        android:layout_toRightOf="@+id/user_profile_id_label"
-        android:layout_toEndOf="@+id/user_profile_id_label"/>
-
-    <TextView
-        android:id="@+id/user_profile_name_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/user_profile_id_label"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:text="@string/user_profile_name_label_text"/>
-
-    <TextView
-        android:id="@+id/user_profile_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/user_profile_name_label"
-        android:layout_toRightOf="@id/user_profile_name_label"
-        android:layout_toEndOf="@id/user_profile_name_label"
-        android:layout_margin="@dimen/activity_margin_small"/>
-
-    <TextView
-        android:id="@+id/implicit_details_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/user_profile_name"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:text="@string/implicit_details_label_text"/>
-
-    <TextView
-        android:id="@+id/implicit_details"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/implicit_details_label"
-        android:layout_toRightOf="@id/implicit_details_label"
-        android:layout_toEndOf="@id/implicit_details_label"
-        android:layout_margin="@dimen/activity_margin_small"/>
-
-  </RelativeLayout>
-
-  <TextView
-      android:id="@+id/device_details_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@id/user_details"
-      android:textSize="20sp"
-      android:layout_margin="@dimen/activity_margin"
-      android:text="@string/device_details_label_text"/>
-
-  <RelativeLayout
-      android:id="@+id/device_details"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@id/device_details_label"
-      android:layout_marginLeft="@dimen/activity_margin_small"
-      android:layout_marginStart="@dimen/activity_margin_small">
-
-    <TextView
-        android:id="@+id/application_id_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:text="@string/application_id_label_text"/>
-
-    <TextView
-        android:id="@+id/application_id"
+    <RelativeLayout
+        android:id="@+id/user_details"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/application_id_label"
-        android:layout_toRightOf="@+id/application_id_label"
-        android:layout_toEndOf="@+id/application_id_label"/>
+        android:layout_below="@id/user_details_label"
+        android:layout_marginLeft="@dimen/activity_margin_small"
+        android:layout_marginStart="@dimen/activity_margin_small">
+
+        <TextView
+            android:id="@+id/user_profile_id_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:text="@string/user_profile_id_label_text"/>
+
+        <TextView
+            android:id="@+id/user_profile_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/user_profile_id_label"
+            android:layout_toRightOf="@+id/user_profile_id_label"
+            android:layout_toEndOf="@+id/user_profile_id_label"/>
+
+        <TextView
+            android:id="@+id/user_profile_name_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/user_profile_id_label"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:text="@string/user_profile_name_label_text"/>
+
+        <TextView
+            android:id="@+id/user_profile_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/user_profile_name_label"
+            android:layout_toRightOf="@id/user_profile_name_label"
+            android:layout_toEndOf="@id/user_profile_name_label"
+            android:layout_margin="@dimen/activity_margin_small"/>
+
+        <TextView
+            android:id="@+id/implicit_details_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/user_profile_name"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:text="@string/implicit_details_label_text"/>
+
+        <TextView
+            android:id="@+id/implicit_details"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/implicit_details_label"
+            android:layout_toRightOf="@id/implicit_details_label"
+            android:layout_toEndOf="@id/implicit_details_label"
+            android:layout_margin="@dimen/activity_margin_small"/>
+
+    </RelativeLayout>
 
     <TextView
-        android:id="@+id/application_version_label"
+        android:id="@+id/device_details_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/application_id_label"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:text="@string/application_version_label_text"/>
+        android:layout_below="@id/user_details"
+        android:textSize="20sp"
+        android:layout_margin="@dimen/activity_margin"
+        android:text="@string/device_details_label_text"/>
 
-    <TextView
-        android:id="@+id/application_version"
+    <RelativeLayout
+        android:id="@+id/device_details"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/application_version_label"
-        android:layout_toRightOf="@id/application_version_label"
-        android:layout_toEndOf="@id/application_version_label"
-        android:layout_margin="@dimen/activity_margin_small"/>
+        android:layout_below="@id/device_details_label"
+        android:layout_marginLeft="@dimen/activity_margin_small"
+        android:layout_marginStart="@dimen/activity_margin_small">
+
+        <TextView
+            android:id="@+id/application_id_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:text="@string/application_id_label_text"/>
+
+        <TextView
+            android:id="@+id/application_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/application_id_label"
+            android:layout_toRightOf="@+id/application_id_label"
+            android:layout_toEndOf="@+id/application_id_label"/>
+
+        <TextView
+            android:id="@+id/application_version_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/application_id_label"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:text="@string/application_version_label_text"/>
+
+        <TextView
+            android:id="@+id/application_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/application_version_label"
+            android:layout_toRightOf="@id/application_version_label"
+            android:layout_toEndOf="@id/application_version_label"
+            android:layout_margin="@dimen/activity_margin_small"/>
+
+        <TextView
+            android:id="@+id/platform_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/application_version_label"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:text="@string/platform_label_text"/>
+
+        <TextView
+            android:id="@+id/platform"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/platform_label"
+            android:layout_margin="@dimen/activity_margin_small"
+            android:layout_toRightOf="@+id/platform_label"
+            android:layout_toEndOf="@+id/platform_label"/>
+
+    </RelativeLayout>
 
     <TextView
-        android:id="@+id/platform_label"
+        android:id="@+id/device_details_fetch_failed"
+        android:layout_below="@id/device_details_label"
+        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/application_version_label"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:text="@string/platform_label_text"/>
+        android:layout_margin="@dimen/activity_margin"
+        android:text="@string/fetch_application_details_exception"/>
 
-    <TextView
-        android:id="@+id/platform"
-        android:layout_width="wrap_content"
+    <android.support.design.widget.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/platform_label"
-        android:layout_margin="@dimen/activity_margin_small"
-        android:layout_toRightOf="@+id/platform_label"
-        android:layout_toEndOf="@+id/platform_label"/>
-
-  </RelativeLayout>
-
-  <TextView
-      android:id="@+id/device_details_fetch_failed"
-      android:layout_below="@id/device_details_label"
-      android:visibility="gone"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="@dimen/activity_margin"
-      android:text="@string/fetch_application_details_exception"/>
-
-  <android.support.design.widget.BottomNavigationView
-      android:id="@+id/bottom_navigation"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignParentBottom="true"
-      app:itemBackground="@color/colorPrimary"
-      app:itemIconTint="@color/white"
-      app:itemTextColor="@color/white"
-      app:menu="@menu/bottom_navigation_menu"/>
+        android:layout_alignParentBottom="true"
+        app:itemBackground="@color/colorPrimary"
+        app:itemIconTint="@color/white"
+        app:itemTextColor="@color/white"
+        app:menu="@menu/bottom_navigation_menu"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3b36bdff..48906409 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -15,13 +15,13 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/root_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    tools:context=".view.activity.LoginActivity">
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/root_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                tools:context=".view.activity.LoginActivity">
 
     <RelativeLayout
         android:id="@+id/layout_login_content"
@@ -36,7 +36,7 @@
             android:src="@drawable/logo_onegini"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/activity_login_logo_margin_top"
-            tools:ignore="contentDescription" />
+            tools:ignore="contentDescription"/>
 
         <TextView
             android:id="@+id/label"
@@ -57,7 +57,7 @@
             android:visibility="invisible"
             android:layout_width="fill_parent"
             android:layout_below="@+id/label"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
 
         <Button
             android:id="@+id/login_button"
@@ -66,7 +66,7 @@
             style="@style/ButtonWideStyle"
             android:layout_below="@+id/users_spinner"
             android:layout_width="match_parent"
-            android:text="@string/btn_login_label" />
+            android:text="@string/btn_login_label"/>
 
         <android.support.v7.widget.SwitchCompat
             android:id="@+id/login_with_preferred_authenticator"
@@ -86,7 +86,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:visibility="gone" />
+        android:visibility="gone"/>
 
     <Button
         android:id="@+id/register_button"
@@ -107,6 +107,6 @@
         app:itemBackground="@color/colorPrimary"
         app:itemIconTint="@color/white"
         app:itemTextColor="@color/white"
-        app:menu="@menu/bottom_navigation_menu" />
+        app:menu="@menu/bottom_navigation_menu"/>
 
 </RelativeLayout>
\ No newline at end of file

From 5b18f57bb7074b4010e53f9ecea9294034ca6744 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Mon, 5 Feb 2018 12:38:48 +0100
Subject: [PATCH 12/31] EXAMPLEAND-45 apply review remarks

---
 app/src/main/AndroidManifest.xml                           | 7 +++++--
 .../mobile/exampleapp/view/activity/InfoActivity.java      | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b4594a62..d3fc86f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -129,7 +129,10 @@
             android:name=".view.activity.PasswordAuthenticatorAuthenticationActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
-
+        <activity
+            android:name=".view.activity.InfoActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
         <service android:name=".network.fcm.FCMListenerService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
@@ -148,7 +151,7 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>
 
-        <activity android:name=".view.activity.InfoActivity"></activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
index cf0027e9..94d5aa44 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
@@ -214,9 +214,9 @@ public void onSuccess(final UserProfile profile) {
           public void onError(final OneginiImplicitTokenRequestError error) {
             onImplicitDetailsFetchFailed(error);
             @OneginiImplicitTokenRequestError.ImplicitTokenRequestErrorType int errorType = error.getErrorType();
-            if (errorType == OneginiDeviceAuthenticationError.DEVICE_DEREGISTERED) {
+            if (errorType == OneginiImplicitTokenRequestError.DEVICE_DEREGISTERED) {
               new DeregistrationUtil(InfoActivity.this).onDeviceDeregistered();
-            } else if (errorType == OneginiDeviceAuthenticationError.USER_DEREGISTERED) {
+            } else if (errorType == OneginiImplicitTokenRequestError.USER_DEREGISTERED) {
               new DeregistrationUtil(InfoActivity.this).onUserDeregistered(userProfile);
             }
           }

From a2bf119968254781f9fb70a575649b65d0542ca7 Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Tue, 6 Feb 2018 11:00:08 +0100
Subject: [PATCH 13/31] EXAMPLEAND-45 Use the latest Android SDK snapshot

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 376d2895..42cb46f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,7 +76,7 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:8.1.1-SNAPSHOT@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:8.2.1-SNAPSHOT@aar') {
     transitive = true
   }
 

From 932bb2b799569e5bce5dfdcb9748731046b09338 Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Tue, 6 Feb 2018 11:04:14 +0100
Subject: [PATCH 14/31] EXAMPLEAND-45 Update bottom navigation bar on resume

---
 .../mobile/exampleapp/view/activity/InfoActivity.java  | 10 +++++++++-
 .../mobile/exampleapp/view/activity/LoginActivity.java |  3 +++
 .../view/activity/PendingPushMessagesActivity.java     |  4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
index 94d5aa44..f432d39d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
@@ -75,7 +75,6 @@ protected void onCreate(Bundle savedInstanceState) {
     ButterKnife.bind(this);
     setupUi();
     deviceSettingsStorage = new DeviceSettingsStorage(this);
-    authenticateDevice();
   }
 
   @Override
@@ -84,6 +83,15 @@ protected void onPause() {
     overridePendingTransition(0, 0);
   }
 
+  @Override
+  protected void onResume() {
+    super.onResume();
+    bottomNavigationView.getMenu()
+        .findItem(R.id.action_info)
+        .setChecked(true);
+    authenticateDevice();
+  }
+
   @Override
   public void onDestroy() {
     if (subscription != null) {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index d156e96a..f45b5146 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -106,6 +106,9 @@ protected void onResume() {
     super.onResume();
     getErrorMessage();
     setupUserInterface();
+    bottomNavigationView.getMenu()
+        .findItem(R.id.action_home)
+        .setChecked(true);
   }
 
   @Override
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
index 10ecb69d..ce5509e9 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/PendingPushMessagesActivity.java
@@ -69,6 +69,9 @@ protected void onCreate(Bundle savedInstanceState) {
   @Override
   protected void onResume() {
     super.onResume();
+    bottomNavigationView.getMenu()
+        .findItem(R.id.action_notifications)
+        .setChecked(true);
     fetchPendingTransactions();
   }
 
@@ -92,7 +95,6 @@ private void setupListView() {
   }
 
   private void setupNavigationBar() {
-    bottomNavigationView.getMenu().findItem(R.id.action_notifications).setChecked(true);
     bottomNavigationView.setOnNavigationItemSelectedListener(item -> {
       final int itemId = item.getItemId();
       if (itemId == R.id.action_info) {

From 03053b89511de39dbc9ef705ef39aacc4dd88ba6 Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Thu, 8 Feb 2018 14:18:07 +0100
Subject: [PATCH 15/31] ITESTS-53 Fix error popups on login screen

---
 .../view/activity/LoginActivity.java          | 105 +++++++++++++-----
 1 file changed, 77 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index f45b5146..815ac62a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -53,7 +53,6 @@
 import com.onegini.mobile.sdk.android.handlers.OneginiAuthenticationHandler;
 import com.onegini.mobile.sdk.android.handlers.OneginiPendingMobileAuthWithPushRequestsHandler;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticationError;
-import com.onegini.mobile.sdk.android.handlers.error.OneginiError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiPendingMobileAuthWithPushRequestError;
 import com.onegini.mobile.sdk.android.model.OneginiAuthenticator;
 import com.onegini.mobile.sdk.android.model.entity.CustomAuthenticatorInfo;
@@ -92,7 +91,8 @@ public class LoginActivity extends Activity {
 
   private List<User> listOfUsers = new ArrayList<>();
   private boolean userIsLoggingIn = false;
-  private String errorMessage;
+  private String lastErrorMessage;
+  private boolean isAppVisilbe = false;
 
   @Override
   protected void onCreate(final Bundle savedInstanceState) {
@@ -104,22 +104,25 @@ protected void onCreate(final Bundle savedInstanceState) {
   @Override
   protected void onResume() {
     super.onResume();
+    isAppVisilbe = true;
     getErrorMessage();
     setupUserInterface();
     bottomNavigationView.getMenu()
         .findItem(R.id.action_home)
         .setChecked(true);
+    showError();
   }
 
   @Override
   protected void onPause() {
     super.onPause();
+    isAppVisilbe = false;
     overridePendingTransition(0, 0);
   }
 
   private void getErrorMessage() {
-    if (getIntent().hasExtra(ERROR_MESSAGE_EXTRA)) {
-      errorMessage = getIntent().getStringExtra(ERROR_MESSAGE_EXTRA);
+    if (isNoErrorMessagePending() && getIntent().hasExtra(ERROR_MESSAGE_EXTRA)) {
+      lastErrorMessage = getIntent().getStringExtra(ERROR_MESSAGE_EXTRA);
     }
   }
 
@@ -181,10 +184,6 @@ private void setupUserInterface() {
       loginButton.setVisibility(View.INVISIBLE);
       usePreferredAuthenticatorSwitchCompat.setVisibility(View.INVISIBLE);
     }
-
-    if (errorMessage != null && !errorMessage.isEmpty()) {
-      showError();
-    }
     setupNavigationDrawer();
   }
 
@@ -220,7 +219,9 @@ public void onSuccess(final UserProfile userProfile, final CustomAuthenticatorIn
 
       @Override
       public void onError(final OneginiAuthenticationError oneginiAuthenticationError) {
-        LoginActivity.this.onError(oneginiAuthenticationError, userProfile);
+        if (isNoErrorMessagePending()) {
+          LoginActivity.this.onError(oneginiAuthenticationError, userProfile);
+        }
       }
     };
   }
@@ -233,42 +234,46 @@ private void onError(final OneginiAuthenticationError oneginiAuthenticationError
 
   private void handleAuthenticationErrors(final OneginiAuthenticationError error, final UserProfile userProfile) {
     @OneginiAuthenticationError.AuthenticationErrorType int errorType = error.getErrorType();
-    errorMessage = error.getErrorType() + ": ";
+    final StringBuilder stringBuilder = new StringBuilder()
+        .append(errorType)
+        .append(": ");
     switch (errorType) {
       case OneginiAuthenticationError.ACTION_CANCELED:
-        errorMessage += "Authentication was cancelled";
+        stringBuilder.append("Authentication was cancelled.");
         break;
       case OneginiAuthenticationError.NETWORK_CONNECTIVITY_PROBLEM:
-        errorMessage += "No internet connection.";
+        stringBuilder.append("No internet connection.");
         break;
       case OneginiAuthenticationError.SERVER_NOT_REACHABLE:
-        errorMessage += "The server is not reachable.";
+        stringBuilder.append("The server is not reachable.");
         break;
       case OneginiAuthenticationError.OUTDATED_APP:
-        errorMessage += "Please update this application in order to use it.";
+        stringBuilder.append("Please update this application in order to use it.");
         break;
       case OneginiAuthenticationError.OUTDATED_OS:
-        errorMessage += "Please update your Android version to use this application.";
+        stringBuilder.append("Please update your Android version to use this application.");
         break;
       case OneginiAuthenticationError.USER_DEREGISTERED:
+        stringBuilder.append("User deregistered.");
         new DeregistrationUtil(this).onUserDeregistered(userProfile);
-        errorMessage += "User deregistered";
         break;
       case OneginiAuthenticationError.DEVICE_DEREGISTERED:
+        stringBuilder.append("Device deregistered.");
         new DeregistrationUtil(this).onDeviceDeregistered();
-        errorMessage += "Device deregistered";
         break;
       case OneginiAuthenticationError.GENERAL_ERROR:
       default:
         // Just display the error for other, less relevant errors
-        onError(error);
+        error.printStackTrace();
+        stringBuilder.append(error.getMessage())
+            .append(" ")
+            .append("Check logcat for more details.");
         break;
     }
-  }
-
-  private void onError(final OneginiError error) {
-    error.printStackTrace();
-    errorMessage = error.getMessage() + " Check logcat for more details.";
+    lastErrorMessage = stringBuilder.toString();
+    if (isAppVisilbe) {
+      showError();
+    }
   }
 
   private boolean isRegisteredAtLeastOneUser() {
@@ -294,9 +299,11 @@ private void prepareListOfProfiles() {
   }
 
   private void showError() {
-    final DialogFragment dialog = AlertDialogFragment.newInstance(errorMessage);
-    errorMessage = null;
-    dialog.show(getFragmentManager(), "alert_dialog");
+    if (isErrorMessagePending()) {
+      final DialogFragment dialog = AlertDialogFragment.newInstance(lastErrorMessage);
+      lastErrorMessage = null;
+      dialog.show(getFragmentManager(), "alert_dialog");
+    }
   }
 
   private void startDashboardActivity() {
@@ -329,9 +336,51 @@ public void onSuccess(final Set<OneginiMobileAuthWithPushRequest> set) {
       }
 
       @Override
-      public void onError(final OneginiPendingMobileAuthWithPushRequestError oneginiPendingMobileAuthWithPushRequestError) {
-        LoginActivity.this.onError(oneginiPendingMobileAuthWithPushRequestError);
+      public void onError(final OneginiPendingMobileAuthWithPushRequestError error) {
+        if (isNoErrorMessagePending()) {
+          LoginActivity.this.handlePendingMobileRequestsErrors(error);
+        }
       }
     });
   }
+
+  private void handlePendingMobileRequestsErrors(final OneginiPendingMobileAuthWithPushRequestError error) {
+    @OneginiPendingMobileAuthWithPushRequestError.OneginiFetchPendingMobileAuthMessagesErrorType int errorType = error.getErrorType();
+    final StringBuilder stringBuilder = new StringBuilder()
+        .append(errorType)
+        .append(": ");
+    switch (errorType) {
+      case OneginiPendingMobileAuthWithPushRequestError.NETWORK_CONNECTIVITY_PROBLEM:
+        stringBuilder.append("No internet connection.");
+        break;
+      case OneginiPendingMobileAuthWithPushRequestError.SERVER_NOT_REACHABLE:
+        stringBuilder.append("The server is not reachable.");
+        break;
+      case OneginiPendingMobileAuthWithPushRequestError.DEVICE_DEREGISTERED:
+        stringBuilder.append("Device deregistered");
+        new DeregistrationUtil(this).onDeviceDeregistered();
+        break;
+      case OneginiPendingMobileAuthWithPushRequestError.GENERAL_ERROR:
+      case OneginiPendingMobileAuthWithPushRequestError.CONFIGURATION_ERROR:
+      default:
+        // Just display the error for other, less relevant errors
+        error.printStackTrace();
+        stringBuilder.append(error.getMessage())
+            .append(" ")
+            .append("Check logcat for more details.");
+        break;
+    }
+    lastErrorMessage = stringBuilder.toString();
+    if (isAppVisilbe) {
+      showError();
+    }
+  }
+
+  private boolean isNoErrorMessagePending() {
+    return lastErrorMessage == null || lastErrorMessage.isEmpty();
+  }
+
+  private boolean isErrorMessagePending() {
+    return !isNoErrorMessagePending();
+  }
 }

From 68317f1f2e32c4647214dbeca60758f5d073bc4a Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Wed, 14 Feb 2018 09:53:41 +0100
Subject: [PATCH 16/31] EXAMPLEAND-44 add an option to choose the identity
 provider during user registration

---
 .../view/activity/LoginActivity.java          | 46 ++++++++++--
 .../view/activity/RegistrationActivity.java   | 27 ++++++-
 .../AvailableIdentityProvidersMenu.java       | 64 +++++++++++++++++
 .../ParcelableOneginiIdentityProvider.java    | 70 +++++++++++++++++++
 app/src/main/res/layout/activity_login.xml    | 11 ++-
 app/src/main/res/values/strings.xml           |  2 +
 6 files changed, 212 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index 815ac62a..46168b1e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -48,6 +48,8 @@
 import com.onegini.mobile.exampleapp.storage.UserStorage;
 import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
 import com.onegini.mobile.exampleapp.view.helper.AlertDialogFragment;
+import com.onegini.mobile.exampleapp.view.helper.AvailableIdentityProvidersMenu;
+import com.onegini.mobile.exampleapp.view.helper.ParcelableOneginiIdentityProvider;
 import com.onegini.mobile.exampleapp.view.helper.RegisteredAuthenticatorsMenu;
 import com.onegini.mobile.sdk.android.client.UserClient;
 import com.onegini.mobile.sdk.android.handlers.OneginiAuthenticationHandler;
@@ -55,6 +57,7 @@
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticationError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiPendingMobileAuthWithPushRequestError;
 import com.onegini.mobile.sdk.android.model.OneginiAuthenticator;
+import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
 import com.onegini.mobile.sdk.android.model.entity.CustomAuthenticatorInfo;
 import com.onegini.mobile.sdk.android.model.entity.OneginiMobileAuthWithPushRequest;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
@@ -82,17 +85,21 @@ public class LoginActivity extends Activity {
   @SuppressWarnings({ "unused", "WeakerAccess" })
   @BindView(R.id.login_with_preferred_authenticator)
   SwitchCompat usePreferredAuthenticatorSwitchCompat;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.register_with_preferred_identity_provider)
+  SwitchCompat usePreferredIdentityProviderSwitchCompat;
   @BindView(R.id.bottom_navigation)
   BottomNavigationView bottomNavigationView;
 
   public static final String ERROR_MESSAGE_EXTRA = "error_message";
+  public static final String IDENTITY_PROVIDER_EXTRA = "identity_provider_id";
 
   public static User selectedUser;
 
   private List<User> listOfUsers = new ArrayList<>();
   private boolean userIsLoggingIn = false;
   private String lastErrorMessage;
-  private boolean isAppVisilbe = false;
+  private boolean isAppVisible = false;
 
   @Override
   protected void onCreate(final Bundle savedInstanceState) {
@@ -104,7 +111,7 @@ protected void onCreate(final Bundle savedInstanceState) {
   @Override
   protected void onResume() {
     super.onResume();
-    isAppVisilbe = true;
+    isAppVisible = true;
     getErrorMessage();
     setupUserInterface();
     bottomNavigationView.getMenu()
@@ -116,7 +123,7 @@ protected void onResume() {
   @Override
   protected void onPause() {
     super.onPause();
-    isAppVisilbe = false;
+    isAppVisible = false;
     overridePendingTransition(0, 0);
   }
 
@@ -146,16 +153,45 @@ public void loginButtonClicked() {
     }
   }
 
+  @SuppressWarnings("unused")
+  @OnCheckedChanged(R.id.register_with_preferred_identity_provider)
+  public void setUsePreferredIdentityProviderSwitchStateChanged() {
+    if (usePreferredIdentityProviderSwitchCompat.isChecked()) {
+      registerButton.setText(getString(R.string.btn_register_label));
+    } else {
+      registerButton.setText(getString(R.string.btn_register_with_label));
+    }
+  }
+
   private void showRegisteredAuthenticatorsPopup(@NonNull final UserProfile userProfile) {
     final Set<OneginiAuthenticator> registeredAuthenticators = OneginiSDK.getOneginiClient(this).getUserClient().getRegisteredAuthenticators(userProfile);
     final RegisteredAuthenticatorsMenu menu = new RegisteredAuthenticatorsMenu(new PopupMenu(this, loginButton), registeredAuthenticators);
     menu.setOnClickListener(authenticator -> authenticate(userProfile, authenticator)).show();
   }
 
+  private void showAvailableIdentityProvidersPopup() {
+    final Set<OneginiIdentityProvider> identityProviders = OneginiSDK.getOneginiClient(this).getUserClient().getIdentityProviders();
+    final AvailableIdentityProvidersMenu menu = new AvailableIdentityProvidersMenu(new PopupMenu(this, registerButton), identityProviders);
+    menu.setOnClickListener(identityProvider -> registerUser(identityProvider)).show();
+  }
+
   @SuppressWarnings("unused")
   @OnClick(R.id.register_button)
   public void registerButtonClicked() {
+    if(usePreferredIdentityProviderSwitchCompat.isChecked()) {
+      registerUser(null);
+    } else {
+      showAvailableIdentityProvidersPopup();
+    }
+  }
+
+  private void registerUser(final OneginiIdentityProvider identityProvider) {
     final Intent intent = new Intent(this, RegistrationActivity.class);
+    if (identityProvider != null) {
+      final ParcelableOneginiIdentityProvider parcelableOneginiIdentityProvider =
+          new ParcelableOneginiIdentityProvider(identityProvider.getId(), identityProvider.getName());
+      intent.putExtra(IDENTITY_PROVIDER_EXTRA, parcelableOneginiIdentityProvider);
+    }
     startActivity(intent);
     finish();
   }
@@ -271,7 +307,7 @@ private void handleAuthenticationErrors(final OneginiAuthenticationError error,
         break;
     }
     lastErrorMessage = stringBuilder.toString();
-    if (isAppVisilbe) {
+    if (isAppVisible) {
       showError();
     }
   }
@@ -371,7 +407,7 @@ private void handlePendingMobileRequestsErrors(final OneginiPendingMobileAuthWit
         break;
     }
     lastErrorMessage = stringBuilder.toString();
-    if (isAppVisilbe) {
+    if (isAppVisible) {
       showError();
     }
   }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
index fbd76cdb..f00c308d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
@@ -39,10 +39,12 @@
 import com.onegini.mobile.exampleapp.storage.UserStorage;
 import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
 import com.onegini.mobile.exampleapp.view.handler.RegistrationRequestHandler;
+import com.onegini.mobile.exampleapp.view.helper.ParcelableOneginiIdentityProvider;
 import com.onegini.mobile.sdk.android.client.OneginiClient;
 import com.onegini.mobile.sdk.android.handlers.OneginiRegistrationHandler;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticationError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiRegistrationError;
+import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
 public class RegistrationActivity extends Activity {
@@ -75,7 +77,12 @@ protected void onCreate(final Bundle savedInstanceState) {
     ButterKnife.bind(this);
 
     setupUserInterface();
-    registerUser();
+    final ParcelableOneginiIdentityProvider parcelableOneginiIdentityProvider = getIntent().getParcelableExtra(LoginActivity.IDENTITY_PROVIDER_EXTRA);
+    if(parcelableOneginiIdentityProvider == null) {
+      registerUser();
+    } else {
+      registerUser(parcelableOneginiIdentityProvider);
+    }
   }
 
   private void setupUserInterface() {
@@ -123,6 +130,24 @@ public void onError(final OneginiRegistrationError oneginiRegistrationError) {
     });
   }
 
+  private void registerUser(final OneginiIdentityProvider identityProvider) {
+    final OneginiClient oneginiClient = OneginiSDK.getOneginiClient(this);
+    oneginiClient.getUserClient().registerUser(identityProvider, Constants.DEFAULT_SCOPES, new OneginiRegistrationHandler() {
+
+      @Override
+      public void onSuccess(final UserProfile userProfile) {
+        registeredProfile = userProfile;
+        userProfileDebugText.setText(userProfile.getProfileId());
+        askForProfileName();
+      }
+
+      @Override
+      public void onError(final OneginiRegistrationError oneginiRegistrationError) {
+        handleRegistrationErrors(oneginiRegistrationError);
+      }
+    });
+  }
+
   private void handleRegistrationErrors(final OneginiRegistrationError oneginiRegistrationError) {
     @OneginiRegistrationError.RegistrationErrorType final int errorType = oneginiRegistrationError.getErrorType();
     switch (errorType) {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java
new file mode 100644
index 00000000..ac0e78b0
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2016-2018 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegini.mobile.exampleapp.view.helper;
+
+import static android.view.Menu.NONE;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.PopupMenu;
+import android.view.Menu;
+import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
+
+public class AvailableIdentityProvidersMenu {
+
+  private final List<OneginiIdentityProvider> identityProviders;
+  private final PopupMenu popupMenu;
+
+  public AvailableIdentityProvidersMenu(final PopupMenu popupMenu, final Set<OneginiIdentityProvider> identityProviders) {
+    this.identityProviders = new ArrayList<>(identityProviders);
+    this.popupMenu = popupMenu;
+    inflateMenu();
+  }
+
+  private void inflateMenu() {
+    final Menu menu = popupMenu.getMenu();
+    for (int i = 0; i < identityProviders.size(); i++) {
+      final OneginiIdentityProvider authenticator = identityProviders.get(i);
+      menu.add(NONE, i, NONE, String.format("%s (id: %s)", authenticator.getName(), authenticator.getId()));
+    }
+  }
+
+  public AvailableIdentityProvidersMenu setOnClickListener(@NonNull final OnMenuItemClickListener listener) {
+    this.popupMenu.setOnMenuItemClickListener(item -> {
+      listener.onMenuItemClick(identityProviders.get(item.getItemId()));
+      return true;
+    });
+    return this;
+  }
+
+  public void show() {
+    popupMenu.show();
+  }
+
+  public interface OnMenuItemClickListener {
+    void onMenuItemClick(OneginiIdentityProvider item);
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java
new file mode 100644
index 00000000..c936e0b8
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016-2018 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegini.mobile.exampleapp.view.helper;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
+
+public class ParcelableOneginiIdentityProvider implements Parcelable, OneginiIdentityProvider {
+
+  public static final Creator<ParcelableOneginiIdentityProvider> CREATOR = new Creator<ParcelableOneginiIdentityProvider>() {
+    @Override
+    public ParcelableOneginiIdentityProvider createFromParcel(Parcel in) {
+      return new ParcelableOneginiIdentityProvider(in);
+    }
+
+    @Override
+    public ParcelableOneginiIdentityProvider[] newArray(int size) {
+      return new ParcelableOneginiIdentityProvider[size];
+    }
+  };
+
+  private final String id;
+  private final String name;
+
+  public ParcelableOneginiIdentityProvider(String id, String name) {
+    this.id = id;
+    this.name = name;
+  }
+
+  private ParcelableOneginiIdentityProvider(Parcel in) {
+    id = in.readString();
+    name = in.readString();
+  }
+
+  @Override
+  public String getId() {
+    return id;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(final Parcel parcel, final int i) {
+    parcel.writeString(id);
+    parcel.writeString(name);
+  }
+}
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 48906409..01dd3037 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -92,13 +92,20 @@
         android:id="@+id/register_button"
         style="@style/ButtonWideStyle"
         android:layout_width="match_parent"
-        android:layout_marginBottom="20dp"
         android:visibility="invisible"
         tools:visibility="visible"
         android:text="@string/btn_register_label"
-        android:layout_above="@+id/bottom_navigation"
+        android:layout_above="@+id/register_with_preferred_identity_provider"
         android:layout_centerHorizontal="true"/>
 
+    <android.support.v7.widget.SwitchCompat
+        android:id="@+id/register_with_preferred_identity_provider"
+        android:checked="true"
+        android:text="@string/use_default_identity_provider_label"
+        android:layout_above="@+id/bottom_navigation"
+        android:layout_marginBottom="40dp"
+        style="@style/SwitchCompatStyle"/>
+
     <android.support.design.widget.BottomNavigationView
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13ccb9a7..789f0fdd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="btn_login_label">LOG IN</string>
     <string name="btn_login_with_label">LOG IN WITH...</string>
     <string name="btn_register_label">REGISTER</string>
+    <string name="btn_register_with_label">REGISTER WITH...</string>
     <string name="pin_error_invalid_pin">Wrong PIN, %1$d attempt(s) left</string>
     <string name="pin_title_choose_pin">Create PIN</string>
     <string name="pin_title_verify_pin">Confirm PIN</string>
@@ -67,6 +68,7 @@
     <string name="btn_auth_cancel_label">CANCEL</string>
     <string name="push_token_is_null_error_message">The push token is null, check if your Firebase configuration in google-services.json file is valid.</string>
     <string name="use_preferred_authenticator_label">USE PREFERRED AUTHENTICATOR</string>
+    <string name="use_default_identity_provider_label">USE DEFAULT IDENTITY PROVIDER</string>
     <string name="implicit_user_details_fetch_failed_label">failed to fetch</string>
     <string name="custom_auth_positive_action">Return success</string>
     <string name="custom_auth_negative_action">Return failure</string>

From fbfb0c78fc5a01b044904f2b039e32c80a8c1129 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Fri, 16 Feb 2018 13:08:11 +0100
Subject: [PATCH 17/31] EXAMPLEAND-44 apply review remarks

---
 .../view/activity/LoginActivity.java          |  3 +-
 .../view/activity/RegistrationActivity.java   | 49 ++++++++-----------
 .../AvailableIdentityProvidersMenu.java       |  4 +-
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index 46168b1e..36effad0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -16,6 +16,8 @@
 
 package com.onegini.mobile.exampleapp.view.activity;
 
+import static com.onegini.mobile.exampleapp.view.activity.RegistrationActivity.IDENTITY_PROVIDER_EXTRA;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -92,7 +94,6 @@ public class LoginActivity extends Activity {
   BottomNavigationView bottomNavigationView;
 
   public static final String ERROR_MESSAGE_EXTRA = "error_message";
-  public static final String IDENTITY_PROVIDER_EXTRA = "identity_provider_id";
 
   public static User selectedUser;
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
index f00c308d..b76a3660 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
@@ -68,6 +68,8 @@ public class RegistrationActivity extends Activity {
   @BindView(R.id.user_profile_debug)
   TextView userProfileDebugText;
 
+  public static final String IDENTITY_PROVIDER_EXTRA = "identity_provider_id";
+
   private UserProfile registeredProfile;
 
   @Override
@@ -77,8 +79,8 @@ protected void onCreate(final Bundle savedInstanceState) {
     ButterKnife.bind(this);
 
     setupUserInterface();
-    final ParcelableOneginiIdentityProvider parcelableOneginiIdentityProvider = getIntent().getParcelableExtra(LoginActivity.IDENTITY_PROVIDER_EXTRA);
-    if(parcelableOneginiIdentityProvider == null) {
+    final ParcelableOneginiIdentityProvider parcelableOneginiIdentityProvider = getIntent().getParcelableExtra(IDENTITY_PROVIDER_EXTRA);
+    if (parcelableOneginiIdentityProvider == null) {
       registerUser();
     } else {
       registerUser(parcelableOneginiIdentityProvider);
@@ -114,39 +116,28 @@ private void handleRedirection(final Uri uri) {
 
   private void registerUser() {
     final OneginiClient oneginiClient = OneginiSDK.getOneginiClient(this);
-    oneginiClient.getUserClient().registerUser(Constants.DEFAULT_SCOPES, new OneginiRegistrationHandler() {
-
-      @Override
-      public void onSuccess(final UserProfile userProfile) {
-        registeredProfile = userProfile;
-        userProfileDebugText.setText(userProfile.getProfileId());
-        askForProfileName();
-      }
-
-      @Override
-      public void onError(final OneginiRegistrationError oneginiRegistrationError) {
-        handleRegistrationErrors(oneginiRegistrationError);
-      }
-    });
+    oneginiClient.getUserClient().registerUser(Constants.DEFAULT_SCOPES, registrationHandler);
   }
 
   private void registerUser(final OneginiIdentityProvider identityProvider) {
     final OneginiClient oneginiClient = OneginiSDK.getOneginiClient(this);
-    oneginiClient.getUserClient().registerUser(identityProvider, Constants.DEFAULT_SCOPES, new OneginiRegistrationHandler() {
+    oneginiClient.getUserClient().registerUser(identityProvider, Constants.DEFAULT_SCOPES, registrationHandler);
+  }
 
-      @Override
-      public void onSuccess(final UserProfile userProfile) {
-        registeredProfile = userProfile;
-        userProfileDebugText.setText(userProfile.getProfileId());
-        askForProfileName();
-      }
+  final OneginiRegistrationHandler registrationHandler = new OneginiRegistrationHandler() {
 
-      @Override
-      public void onError(final OneginiRegistrationError oneginiRegistrationError) {
-        handleRegistrationErrors(oneginiRegistrationError);
-      }
-    });
-  }
+    @Override
+    public void onSuccess(final UserProfile userProfile) {
+      registeredProfile = userProfile;
+      userProfileDebugText.setText(userProfile.getProfileId());
+      askForProfileName();
+    }
+
+    @Override
+    public void onError(final OneginiRegistrationError oneginiRegistrationError) {
+      handleRegistrationErrors(oneginiRegistrationError);
+    }
+  };
 
   private void handleRegistrationErrors(final OneginiRegistrationError oneginiRegistrationError) {
     @OneginiRegistrationError.RegistrationErrorType final int errorType = oneginiRegistrationError.getErrorType();
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java
index ac0e78b0..93b6e67f 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/AvailableIdentityProvidersMenu.java
@@ -41,8 +41,8 @@ public AvailableIdentityProvidersMenu(final PopupMenu popupMenu, final Set<Onegi
   private void inflateMenu() {
     final Menu menu = popupMenu.getMenu();
     for (int i = 0; i < identityProviders.size(); i++) {
-      final OneginiIdentityProvider authenticator = identityProviders.get(i);
-      menu.add(NONE, i, NONE, String.format("%s (id: %s)", authenticator.getName(), authenticator.getId()));
+      final OneginiIdentityProvider identityProvider = identityProviders.get(i);
+      menu.add(NONE, i, NONE, String.format("%s (id: %s)", identityProvider.getName(), identityProvider.getId()));
     }
   }
 

From 192c66093d3b5b4898b7238b96765b627192608c Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Mon, 19 Feb 2018 16:44:47 +0100
Subject: [PATCH 18/31] SDKAND-572 Fix a typo in a public method
 (setFingerprintAuthenticatioRequestHandler)

---
 app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index 8d66524c..f4c6e3be 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -56,7 +56,7 @@ private static OneginiClient buildSDK(final Context context) {
     // will throw OneginiConfigNotFoundException if OneginiConfigModel class can't be found
     return new OneginiClientBuilder(applicationContext, registrationRequestHandler, createPinRequestHandler, pinAuthenticationRequestHandler)
         // handlers for optional functionalities
-        .setFingerprintAuthenticatioRequestHandler(new FingerprintAuthenticationRequestHandler(applicationContext))
+        .setFingerprintAuthenticationRequestHandler(new FingerprintAuthenticationRequestHandler(applicationContext))
         .setCustomAuthenticationRequestHandler(new BasicCustomAuthenticationRequestHandler(applicationContext))
         .setMobileAuthWithPushRequestHandler(new MobileAuthenticationRequestHandler(applicationContext))
         .setMobileAuthWithPushPinRequestHandler(new MobileAuthenticationPinRequestHandler(applicationContext))

From b0faae02e521b425c725db574acf65bb60d630af Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 20 Feb 2018 08:39:09 +0100
Subject: [PATCH 19/31] SDKAND-568 USER_DEREGISTERED error removal during the
 client registration

---
 .../view/activity/InfoActivity.java           | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
index f432d39d..f2b21bb0 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/InfoActivity.java
@@ -108,7 +108,7 @@ private void setupUi() {
 
   private void setupUserDetails() {
     final User user = LoginActivity.selectedUser;
-    if(user == null) {
+    if (user == null) {
       return;
     }
 
@@ -161,28 +161,24 @@ private void onHomeClicked() {
   }
 
   private void authenticateDevice() {
-    final UserProfile authenticatedUserProfile = OneginiSDK.getOneginiClient(this).getUserClient().getAuthenticatedUserProfile();
-    OneginiSDK.getOneginiClient(this).getDeviceClient()
-        .authenticateDevice(new String[]{ "application-details" }, new OneginiDeviceAuthenticationHandler() {
-              @Override
-              public void onSuccess() {
-                callAnonymousResourceCallToFetchApplicationDetails();
-              }
-
-              @Override
-              public void onError(final OneginiDeviceAuthenticationError error) {
-                onApplicationDetailsFetchFailed();
-                final @OneginiDeviceAuthenticationError.DeviceAuthenticationErrorType int errorType = error.getErrorType();
-
-                if (errorType == OneginiDeviceAuthenticationError.DEVICE_DEREGISTERED) {
-                  new DeregistrationUtil(InfoActivity.this).onDeviceDeregistered();
-                } else if (errorType == OneginiDeviceAuthenticationError.USER_DEREGISTERED) {
-                  new DeregistrationUtil(InfoActivity.this).onUserDeregistered(authenticatedUserProfile);
-                }
-                InfoActivity.this.onError(error);
-              }
+    OneginiSDK.getOneginiClient(this).getDeviceClient().authenticateDevice(new String[]{ "application-details" }, new OneginiDeviceAuthenticationHandler() {
+          @Override
+          public void onSuccess() {
+            callAnonymousResourceCallToFetchApplicationDetails();
+          }
+
+          @Override
+          public void onError(final OneginiDeviceAuthenticationError error) {
+            onApplicationDetailsFetchFailed();
+            final @OneginiDeviceAuthenticationError.DeviceAuthenticationErrorType int errorType = error.getErrorType();
+
+            if (errorType == OneginiDeviceAuthenticationError.DEVICE_DEREGISTERED) {
+              new DeregistrationUtil(InfoActivity.this).onDeviceDeregistered();
             }
-        );
+            InfoActivity.this.onError(error);
+          }
+        }
+    );
   }
 
   private void callAnonymousResourceCallToFetchApplicationDetails() {

From 5c010ac7314afcc5db6d1388951323e3b94af0ca Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Fri, 23 Feb 2018 14:17:32 +0100
Subject: [PATCH 20/31] EXAMPLEAND-46

---
 app/src/main/AndroidManifest.xml              |  4 +
 .../onegini/mobile/exampleapp/OneginiSDK.java |  3 +
 .../model/BasicCustomAuthenticator.java       |  6 +-
 .../model/PasswordCustomAuthenticator.java    |  6 +-
 .../model/TwoWayOtpIdentityProvider.java      | 40 +++++++++
 .../BasicCustomAuthAuthenticationAction.java  |  2 +-
 .../BasicCustomAuthDeregistrationAction.java  |  2 +-
 .../BasicCustomAuthRegistrationAction.java    |  2 +-
 ...asswordCustomAuthAuthenticationAction.java |  2 +-
 ...asswordCustomAuthDeregistrationAction.java |  2 +-
 .../PasswordCustomAuthRegistrationAction.java |  2 +-
 .../TwoWayOtpRegistrationAction.java          | 50 +++++++++++
 .../TwoWayOtpRegistrationActivity.java        | 70 +++++++++++++++
 .../activity_two_way_otp_registration.xml     | 90 +++++++++++++++++++
 app/src/main/res/layout/cancel_button.xml     |  2 +-
 app/src/main/res/values/strings.xml           |  6 +-
 16 files changed, 275 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java
 create mode 100644 app/src/main/res/layout/activity_two_way_otp_registration.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3fc86f4..f7b89534 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -133,6 +133,10 @@
             android:name=".view.activity.InfoActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.TwoWayOtpRegistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
         <service android:name=".network.fcm.FCMListenerService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index f4c6e3be..79e7173c 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import com.onegini.mobile.exampleapp.model.BasicCustomAuthenticator;
 import com.onegini.mobile.exampleapp.model.PasswordCustomAuthenticator;
+import com.onegini.mobile.exampleapp.model.TwoWayOtpIdentityProvider;
 import com.onegini.mobile.exampleapp.view.handler.BasicCustomAuthenticationRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.CreatePinRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.FingerprintAuthenticationRequestHandler;
@@ -65,6 +66,8 @@ private static OneginiClient buildSDK(final Context context) {
         .setMobileAuthWithOtpRequestHandler(new MobileAuthOtpRequestHandler())
         // add custom authenticators
         .setCustomAuthenticators(prepareCustomAuthenticators(applicationContext))
+        // add a custom identity provider
+        .addCustomIdentityProvider(new TwoWayOtpIdentityProvider(applicationContext))
         // Set http connect / read timeout
         .setHttpConnectTimeout((int) TimeUnit.SECONDS.toMillis(5))
         .setHttpReadTimeout((int) TimeUnit.SECONDS.toMillis(20))
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
index 3ec4dedd..70daa31e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/BasicCustomAuthenticator.java
@@ -20,9 +20,9 @@
 import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthAuthenticationAction;
 import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthDeregistrationAction;
 import com.onegini.mobile.exampleapp.view.action.basicauth.BasicCustomAuthRegistrationAction;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthAuthenticationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthDeregistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.model.OneginiCustomAuthenticator;
 
 public class BasicCustomAuthenticator implements OneginiCustomAuthenticator {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
index 3dd414cc..21ef9079 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/PasswordCustomAuthenticator.java
@@ -19,9 +19,9 @@
 import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthAuthenticationAction;
 import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthDeregistrationAction;
 import com.onegini.mobile.exampleapp.view.action.passwordauth.PasswordCustomAuthRegistrationAction;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthAuthenticationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthDeregistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.model.OneginiCustomAuthenticator;
 
 public class PasswordCustomAuthenticator implements OneginiCustomAuthenticator {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java
new file mode 100644
index 00000000..97c45e0c
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016-2018 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.model;
+
+import android.content.Context;
+import com.onegini.mobile.exampleapp.view.action.twowayotpidentityprovider.TwoWayOtpRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomRegistrationAction;
+import com.onegini.mobile.sdk.android.model.OneginiCustomIdentityProvider;
+
+public class TwoWayOtpIdentityProvider implements OneginiCustomIdentityProvider {
+
+  private final OneginiCustomRegistrationAction registrationAction;
+
+  public TwoWayOtpIdentityProvider(final Context context) {
+    this.registrationAction = new TwoWayOtpRegistrationAction(context);
+  }
+
+  @Override
+  public OneginiCustomRegistrationAction getRegistrationAction() {
+    return registrationAction;
+  }
+
+  @Override
+  public String getId() {
+    return "TWO_WAY_OTP";
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
index caed7223..44092724 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthAuthenticationAction.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.content.Intent;
 import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorAuthenticationActivity;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthAuthenticationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthAuthenticationCallback;
 
 public class BasicCustomAuthAuthenticationAction implements OneginiCustomAuthAuthenticationAction {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
index e2307f44..2b8b7f0d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthDeregistrationAction.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.content.Intent;
 import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorDeregistrationActivity;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthDeregistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthDeregistrationCallback;
 
 public class BasicCustomAuthDeregistrationAction implements OneginiCustomAuthDeregistrationAction {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
index cfc102d4..0794f01a 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/basicauth/BasicCustomAuthRegistrationAction.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.content.Intent;
 import com.onegini.mobile.exampleapp.view.activity.BasicAuthenticatorRegistrationActivity;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthRegistrationCallback;
 
 public class BasicCustomAuthRegistrationAction implements OneginiCustomAuthRegistrationAction {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
index d7d9e44f..5cebde4f 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthAuthenticationAction.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import com.onegini.mobile.exampleapp.view.activity.PasswordAuthenticatorAuthenticationActivity;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthAuthenticationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthAuthenticationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthAuthenticationCallback;
 
 public class PasswordCustomAuthAuthenticationAction implements OneginiCustomAuthAuthenticationAction {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
index a9b03b7a..d267d359 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthDeregistrationAction.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import com.onegini.mobile.exampleapp.view.activity.PasswordAuthenticatorDeregistrationActivity;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthDeregistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthDeregistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthDeregistrationCallback;
 
 public class PasswordCustomAuthDeregistrationAction implements OneginiCustomAuthDeregistrationAction {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
index e10ac2d6..74ae7e85 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/passwordauth/PasswordCustomAuthRegistrationAction.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.content.Intent;
 import com.onegini.mobile.exampleapp.view.activity.PasswordAuthenticatorRegistrationActivity;
-import com.onegini.mobile.sdk.android.handlers.customauth.OneginiCustomAuthRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomAuthRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomAuthRegistrationCallback;
 
 public class PasswordCustomAuthRegistrationAction implements OneginiCustomAuthRegistrationAction {
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
new file mode 100644
index 00000000..5f14c592
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016-2018 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.view.action.twowayotpidentityprovider;
+
+import static com.onegini.mobile.exampleapp.view.activity.TwoWayOtpRegistrationActivity.OTP_CHALLENGE_EXTRA;
+
+import android.content.Context;
+import android.content.Intent;
+import com.onegini.mobile.exampleapp.view.activity.TwoWayOtpRegistrationActivity;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomTwoStepRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomRegistrationCallback;
+
+public class TwoWayOtpRegistrationAction implements OneginiCustomTwoStepRegistrationAction {
+
+  public static OneginiCustomRegistrationCallback CALLBACK;
+
+  private final Context context;
+
+  public TwoWayOtpRegistrationAction(final Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public void initRegistration(final OneginiCustomRegistrationCallback callback) {
+    callback.returnSuccess(null);
+  }
+
+  @Override
+  public void finishRegistration(final OneginiCustomRegistrationCallback callback, final String code) {
+    CALLBACK = callback;
+
+    final Intent intent = new Intent(context, TwoWayOtpRegistrationActivity.class);
+    intent.putExtra(OTP_CHALLENGE_EXTRA, code);
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java
new file mode 100644
index 00000000..29c3e0c9
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016-2018 Onegini B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.onegini.mobile.exampleapp.view.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.EditText;
+import android.widget.TextView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import com.onegini.mobile.exampleapp.R;
+import com.onegini.mobile.exampleapp.view.action.twowayotpidentityprovider.TwoWayOtpRegistrationAction;
+
+public class TwoWayOtpRegistrationActivity extends AppCompatActivity {
+
+  public static final String OTP_CHALLENGE_EXTRA = "otp_challenge_extra";
+
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.two_way_otp_response_code)
+  EditText responseCodeEditText;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.two_way_otp_challenge_code)
+  TextView challengeCodeTextView;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_two_way_otp_registration);
+    ButterKnife.bind(this);
+    initChallengeCode();
+  }
+
+  @SuppressWarnings("unused")
+  @OnClick(R.id.two_way_otp_ok_button)
+  public void onOkButtonClicked() {
+    if (TwoWayOtpRegistrationAction.CALLBACK != null) {
+      final String responseCode = responseCodeEditText.getText().toString();
+      TwoWayOtpRegistrationAction.CALLBACK.returnSuccess(responseCode);
+    }
+    finish();
+  }
+
+  @SuppressWarnings("unused")
+  @OnClick(R.id.two_way_otp_cancel_button)
+  public void onCancelButtonClicked() {
+    if (TwoWayOtpRegistrationAction.CALLBACK != null) {
+      TwoWayOtpRegistrationAction.CALLBACK.returnError(new Exception("Registration canceled"));
+    }
+    finish();
+  }
+
+  private void initChallengeCode() {
+    final String challengeCode = getIntent().getStringExtra(OTP_CHALLENGE_EXTRA);
+    challengeCodeTextView.setText(challengeCode);
+  }
+}
diff --git a/app/src/main/res/layout/activity_two_way_otp_registration.xml b/app/src/main/res/layout/activity_two_way_otp_registration.xml
new file mode 100644
index 00000000..c46bdc08
--- /dev/null
+++ b/app/src/main/res/layout/activity_two_way_otp_registration.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright (c) 2016-2018 Onegini B.V.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/two_way_otp_message"
+        android:text="@string/two_way_otp_message"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="@dimen/activity_login_logo_margin_top"
+        android:layout_centerHorizontal="true"
+        android:layout_height="wrap_content"
+        style="@style/Base.TextAppearance.AppCompat.Headline"/>
+
+    <TextView
+        android:id="@+id/two_way_otp_challenge_code_label"
+        android:text="@string/two_way_otp_challenge_code_label"
+        android:layout_below="@id/two_way_otp_message"
+        style="@style/AuthenticatorMessageStyle"/>
+
+    <TextView
+        android:id="@+id/two_way_otp_challenge_code"
+        android:layout_below="@id/two_way_otp_challenge_code_label"
+        android:layout_centerHorizontal="true"
+        android:textSize="60sp"
+        android:layout_margin="@dimen/activity_margin"
+        android:text="XXXXXX"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/two_way_otp_response_code_label"
+        android:text="@string/two_way_otp_response_code_label"
+        android:layout_below="@id/two_way_otp_challenge_code"
+        style="@style/AuthenticatorMessageStyle"/>
+
+    <EditText
+        android:id="@+id/two_way_otp_response_code"
+        android:layout_below="@id/two_way_otp_response_code_label"
+        android:layout_centerHorizontal="true"
+        android:textSize="60sp"
+        android:layout_margin="@dimen/activity_margin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="textShortMessage"
+        android:textAlignment="center"
+        android:minWidth="200dp"
+        android:maxLines="1"/>
+
+    <LinearLayout
+        android:layout_below="@id/two_way_otp_response_code"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:orientation="horizontal"
+        android:paddingTop="0dip" >
+
+        <Button
+            android:id="@+id/two_way_otp_ok_button"
+            style="@style/ButtonStyle"
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:textAlignment="center"
+            android:text="@string/btn_ok_label"/>
+
+        <Button
+            android:id="@+id/two_way_otp_cancel_button"
+            style="@style/ButtonStyle"
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:textAlignment="center"
+            android:text="@string/btn_cancel_label" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cancel_button.xml b/app/src/main/res/layout/cancel_button.xml
index 3975febe..b2da0f8c 100644
--- a/app/src/main/res/layout/cancel_button.xml
+++ b/app/src/main/res/layout/cancel_button.xml
@@ -23,6 +23,6 @@
         android:layout_marginBottom="12dp"
         tools:visibility="visible"
         android:visibility="gone"
-        android:text="@string/btn_auth_cancel_label"
+        android:text="@string/btn_cancel_label"
         />
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 789f0fdd..76e538d5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,7 +65,8 @@
     <string name="simple_push_message">Simple push message</string>
     <string name="change_pin_finished_successfully">Change PIN action finished successfully</string>
     <string name="btn_mobile_auth_with_otp_label">Mobile auth with OTP</string>
-    <string name="btn_auth_cancel_label">CANCEL</string>
+    <string name="btn_cancel_label">CANCEL</string>
+    <string name="btn_ok_label">OK</string>
     <string name="push_token_is_null_error_message">The push token is null, check if your Firebase configuration in google-services.json file is valid.</string>
     <string name="use_preferred_authenticator_label">USE PREFERRED AUTHENTICATOR</string>
     <string name="use_default_identity_provider_label">USE DEFAULT IDENTITY PROVIDER</string>
@@ -96,4 +97,7 @@
     <string name="application_version_label_text">Application version:</string>
     <string name="fetch_application_details_exception">Couldn\'t fetch application details</string>
     <string name="platform_label_text">Platform:</string>
+    <string name="two_way_otp_message">One-Time Password</string>
+    <string name="two_way_otp_challenge_code_label">Challenge code</string>
+    <string name="two_way_otp_response_code_label">Response code</string>
 </resources>

From 24bd1344ab5d6a170304f29f7c721ac4b4e1565f Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Fri, 23 Feb 2018 14:29:05 +0100
Subject: [PATCH 21/31] EXAMPLEAND-46 remove hardcoded text

---
 app/src/main/res/layout/activity_two_way_otp_registration.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_two_way_otp_registration.xml b/app/src/main/res/layout/activity_two_way_otp_registration.xml
index c46bdc08..06a3e35c 100644
--- a/app/src/main/res/layout/activity_two_way_otp_registration.xml
+++ b/app/src/main/res/layout/activity_two_way_otp_registration.xml
@@ -39,7 +39,6 @@
         android:layout_centerHorizontal="true"
         android:textSize="60sp"
         android:layout_margin="@dimen/activity_margin"
-        android:text="XXXXXX"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 

From b367e860d57008ce173bc6be4ed4532071e43fca Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 6 Mar 2018 10:49:27 +0100
Subject: [PATCH 22/31] EXAMPLEAND-46 apply the sdk changes

---
 .../network/fcm/MobileAuthenticationService.java     |  4 ++--
 .../TwoWayOtpRegistrationAction.java                 |  5 +++--
 .../exampleapp/view/activity/LoginActivity.java      |  4 ++--
 .../view/activity/RegistrationActivity.java          | 12 +++++++++++-
 .../activity/SettingsAuthenticatorsActivity.java     |  4 ++--
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java
index 06dafe38..a4249845 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/MobileAuthenticationService.java
@@ -31,7 +31,7 @@
 import com.onegini.mobile.sdk.android.handlers.OneginiMobileAuthenticationHandler;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiInitializationError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiMobileAuthenticationError;
-import com.onegini.mobile.sdk.android.model.entity.CustomAuthenticatorInfo;
+import com.onegini.mobile.sdk.android.model.entity.CustomInfo;
 import com.onegini.mobile.sdk.android.model.entity.OneginiMobileAuthWithPushRequest;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
@@ -101,7 +101,7 @@ public void onError(final OneginiInitializationError error) {
   private void handleMobileAuthenticationRequest(final OneginiMobileAuthWithPushRequest request) {
     OneginiSDK.getOneginiClient(this).getUserClient().handleMobileAuthWithPushRequest(request, new OneginiMobileAuthenticationHandler() {
       @Override
-      public void onSuccess(final CustomAuthenticatorInfo customAuthenticatorInfo) {
+      public void onSuccess(final CustomInfo customInfo) {
         Log.i(TAG, "The mobile authentication request " + request.getTransactionId() + " has finished with success");
       }
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
index 5f14c592..8cd2bf41 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
@@ -22,6 +22,7 @@
 import com.onegini.mobile.exampleapp.view.activity.TwoWayOtpRegistrationActivity;
 import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomTwoStepRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomRegistrationCallback;
+import com.onegini.mobile.sdk.android.model.entity.CustomInfo;
 
 public class TwoWayOtpRegistrationAction implements OneginiCustomTwoStepRegistrationAction {
 
@@ -39,11 +40,11 @@ public void initRegistration(final OneginiCustomRegistrationCallback callback) {
   }
 
   @Override
-  public void finishRegistration(final OneginiCustomRegistrationCallback callback, final String code) {
+  public void finishRegistration(final OneginiCustomRegistrationCallback callback, final CustomInfo customInfo) {
     CALLBACK = callback;
 
     final Intent intent = new Intent(context, TwoWayOtpRegistrationActivity.class);
-    intent.putExtra(OTP_CHALLENGE_EXTRA, code);
+    intent.putExtra(OTP_CHALLENGE_EXTRA, customInfo.getData());
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     context.startActivity(intent);
   }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index 36effad0..677235fb 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -60,7 +60,7 @@
 import com.onegini.mobile.sdk.android.handlers.error.OneginiPendingMobileAuthWithPushRequestError;
 import com.onegini.mobile.sdk.android.model.OneginiAuthenticator;
 import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
-import com.onegini.mobile.sdk.android.model.entity.CustomAuthenticatorInfo;
+import com.onegini.mobile.sdk.android.model.entity.CustomInfo;
 import com.onegini.mobile.sdk.android.model.entity.OneginiMobileAuthWithPushRequest;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
@@ -250,7 +250,7 @@ private OneginiAuthenticationHandler getAuthenticationHandler(final UserProfile
     return new OneginiAuthenticationHandler() {
 
       @Override
-      public void onSuccess(final UserProfile userProfile, final CustomAuthenticatorInfo customAuthenticatorInfo) {
+      public void onSuccess(final UserProfile userProfile, final CustomInfo customInfo) {
         startDashboardActivity();
       }
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
index b76a3660..af1d3972 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
@@ -45,6 +45,7 @@
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticationError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiRegistrationError;
 import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
+import com.onegini.mobile.sdk.android.model.entity.CustomInfo;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
 public class RegistrationActivity extends Activity {
@@ -127,7 +128,7 @@ private void registerUser(final OneginiIdentityProvider identityProvider) {
   final OneginiRegistrationHandler registrationHandler = new OneginiRegistrationHandler() {
 
     @Override
-    public void onSuccess(final UserProfile userProfile) {
+    public void onSuccess(final UserProfile userProfile, final CustomInfo customInfo) {
       registeredProfile = userProfile;
       userProfileDebugText.setText(userProfile.getProfileId());
       askForProfileName();
@@ -162,6 +163,15 @@ private void handleRegistrationErrors(final OneginiRegistrationError oneginiRegi
       case OneginiRegistrationError.OUTDATED_OS:
         showToast("Please update your Android version to use this application.");
         break;
+      case OneginiRegistrationError.INVALID_IDENTITY_PROVIDER:
+        showToast("The Identity provider you were trying to use is invalid.");
+        break;
+      case OneginiRegistrationError.CUSTOM_REGISTRATION_EXPIRED:
+        showToast("Custom registration has expired. Please retry.");
+        break;
+      case OneginiRegistrationError.CUSTOM_REGISTRATION_FAILURE:
+        showToast("Custom registration failed, see logcat for more details.");
+        break;
       case OneginiRegistrationError.GENERAL_ERROR:
       default:
         // General error handling for other, less relevant errors
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java
index ab4c1fd0..82af8556 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/SettingsAuthenticatorsActivity.java
@@ -52,7 +52,7 @@
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticatorDeregistrationError;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticatorRegistrationError;
 import com.onegini.mobile.sdk.android.model.OneginiAuthenticator;
-import com.onegini.mobile.sdk.android.model.entity.CustomAuthenticatorInfo;
+import com.onegini.mobile.sdk.android.model.entity.CustomInfo;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
 public class SettingsAuthenticatorsActivity extends AppCompatActivity {
@@ -185,7 +185,7 @@ private void setPreferredAuthenticatorLabel(final OneginiAuthenticator authentic
   private void registerAuthenticator(final OneginiAuthenticator authenticator, final int position) {
     userClient.registerAuthenticator(authenticator, new OneginiAuthenticatorRegistrationHandler() {
       @Override
-      public void onSuccess(final CustomAuthenticatorInfo customAuthenticatorInfo) {
+      public void onSuccess(final CustomInfo customInfo) {
         authenticators[position].setIsProcessed(false);
         prepareAuthenticatorsList();
         clearErrorMessage();

From 5d0a131084e55a1491e297ed57092f214193362f Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Fri, 9 Mar 2018 10:27:39 +0100
Subject: [PATCH 23/31] EXAMPLEAND-46 apply review remarks

---
 app/build.gradle                              |  2 +-
 .../model/TwoWayOtpIdentityProvider.java      |  5 +-
 .../view/activity/LoginActivity.java          |  5 +-
 .../view/activity/RegistrationActivity.java   | 45 ++++++------
 .../TwoWayOtpRegistrationActivity.java        |  2 +-
 .../ParcelableOneginiIdentityProvider.java    | 70 -------------------
 .../activity_two_way_otp_registration.xml     |  2 +-
 7 files changed, 29 insertions(+), 102 deletions(-)
 delete mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java

diff --git a/app/build.gradle b/app/build.gradle
index d3b93572..16e2a8ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,7 +76,7 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:8.2.1-SNAPSHOT@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:9.0.0-SNAPSHOT@aar') {
     transitive = true
   }
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java
index 97c45e0c..1454084d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/TwoWayOtpIdentityProvider.java
@@ -18,11 +18,12 @@
 import android.content.Context;
 import com.onegini.mobile.exampleapp.view.action.twowayotpidentityprovider.TwoWayOtpRegistrationAction;
 import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomTwoStepRegistrationAction;
 import com.onegini.mobile.sdk.android.model.OneginiCustomIdentityProvider;
 
 public class TwoWayOtpIdentityProvider implements OneginiCustomIdentityProvider {
 
-  private final OneginiCustomRegistrationAction registrationAction;
+  private final OneginiCustomTwoStepRegistrationAction registrationAction;
 
   public TwoWayOtpIdentityProvider(final Context context) {
     this.registrationAction = new TwoWayOtpRegistrationAction(context);
@@ -35,6 +36,6 @@ public OneginiCustomRegistrationAction getRegistrationAction() {
 
   @Override
   public String getId() {
-    return "TWO_WAY_OTP";
+    return "2-way-otp-api";
   }
 }
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
index 677235fb..c4dc63df 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/LoginActivity.java
@@ -51,7 +51,6 @@
 import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
 import com.onegini.mobile.exampleapp.view.helper.AlertDialogFragment;
 import com.onegini.mobile.exampleapp.view.helper.AvailableIdentityProvidersMenu;
-import com.onegini.mobile.exampleapp.view.helper.ParcelableOneginiIdentityProvider;
 import com.onegini.mobile.exampleapp.view.helper.RegisteredAuthenticatorsMenu;
 import com.onegini.mobile.sdk.android.client.UserClient;
 import com.onegini.mobile.sdk.android.handlers.OneginiAuthenticationHandler;
@@ -189,9 +188,7 @@ public void registerButtonClicked() {
   private void registerUser(final OneginiIdentityProvider identityProvider) {
     final Intent intent = new Intent(this, RegistrationActivity.class);
     if (identityProvider != null) {
-      final ParcelableOneginiIdentityProvider parcelableOneginiIdentityProvider =
-          new ParcelableOneginiIdentityProvider(identityProvider.getId(), identityProvider.getName());
-      intent.putExtra(IDENTITY_PROVIDER_EXTRA, parcelableOneginiIdentityProvider);
+      intent.putExtra(IDENTITY_PROVIDER_EXTRA, identityProvider);
     }
     startActivity(intent);
     finish();
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
index af1d3972..fa9427ad 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
@@ -39,7 +39,6 @@
 import com.onegini.mobile.exampleapp.storage.UserStorage;
 import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
 import com.onegini.mobile.exampleapp.view.handler.RegistrationRequestHandler;
-import com.onegini.mobile.exampleapp.view.helper.ParcelableOneginiIdentityProvider;
 import com.onegini.mobile.sdk.android.client.OneginiClient;
 import com.onegini.mobile.sdk.android.handlers.OneginiRegistrationHandler;
 import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticationError;
@@ -73,6 +72,21 @@ public class RegistrationActivity extends Activity {
 
   private UserProfile registeredProfile;
 
+  final OneginiRegistrationHandler registrationHandler = new OneginiRegistrationHandler() {
+
+    @Override
+    public void onSuccess(final UserProfile userProfile, final CustomInfo customInfo) {
+      registeredProfile = userProfile;
+      userProfileDebugText.setText(userProfile.getProfileId());
+      askForProfileName();
+    }
+
+    @Override
+    public void onError(final OneginiRegistrationError oneginiRegistrationError) {
+      handleRegistrationErrors(oneginiRegistrationError);
+    }
+  };
+
   @Override
   protected void onCreate(final Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -80,11 +94,11 @@ protected void onCreate(final Bundle savedInstanceState) {
     ButterKnife.bind(this);
 
     setupUserInterface();
-    final ParcelableOneginiIdentityProvider parcelableOneginiIdentityProvider = getIntent().getParcelableExtra(IDENTITY_PROVIDER_EXTRA);
-    if (parcelableOneginiIdentityProvider == null) {
+    final OneginiIdentityProvider oneginiIdentityProvider = getIntent().getParcelableExtra(IDENTITY_PROVIDER_EXTRA);
+    if (oneginiIdentityProvider == null) {
       registerUser();
     } else {
-      registerUser(parcelableOneginiIdentityProvider);
+      registerUser(oneginiIdentityProvider);
     }
   }
 
@@ -125,21 +139,6 @@ private void registerUser(final OneginiIdentityProvider identityProvider) {
     oneginiClient.getUserClient().registerUser(identityProvider, Constants.DEFAULT_SCOPES, registrationHandler);
   }
 
-  final OneginiRegistrationHandler registrationHandler = new OneginiRegistrationHandler() {
-
-    @Override
-    public void onSuccess(final UserProfile userProfile, final CustomInfo customInfo) {
-      registeredProfile = userProfile;
-      userProfileDebugText.setText(userProfile.getProfileId());
-      askForProfileName();
-    }
-
-    @Override
-    public void onError(final OneginiRegistrationError oneginiRegistrationError) {
-      handleRegistrationErrors(oneginiRegistrationError);
-    }
-  };
-
   private void handleRegistrationErrors(final OneginiRegistrationError oneginiRegistrationError) {
     @OneginiRegistrationError.RegistrationErrorType final int errorType = oneginiRegistrationError.getErrorType();
     switch (errorType) {
@@ -167,10 +166,10 @@ private void handleRegistrationErrors(final OneginiRegistrationError oneginiRegi
         showToast("The Identity provider you were trying to use is invalid.");
         break;
       case OneginiRegistrationError.CUSTOM_REGISTRATION_EXPIRED:
-        showToast("Custom registration has expired. Please retry.");
+        showToast("Custom registration request has expired. Please retry.");
         break;
       case OneginiRegistrationError.CUSTOM_REGISTRATION_FAILURE:
-        showToast("Custom registration failed, see logcat for more details.");
+        showToast("Custom registration request has failed, see logcat for more details.");
         break;
       case OneginiRegistrationError.GENERAL_ERROR:
       default:
@@ -233,12 +232,12 @@ private class ProfileNameChangeListener implements TextWatcher {
 
     @Override
     public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {
-
+      //nothing to do here
     }
 
     @Override
     public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
-
+      //nothing to do here
     }
 
     @Override
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java
index 29c3e0c9..d8fccf9e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/TwoWayOtpRegistrationActivity.java
@@ -37,7 +37,7 @@ public class TwoWayOtpRegistrationActivity extends AppCompatActivity {
   TextView challengeCodeTextView;
 
   @Override
-  protected void onCreate(Bundle savedInstanceState) {
+  protected void onCreate(final Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_two_way_otp_registration);
     ButterKnife.bind(this);
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java
deleted file mode 100644
index c936e0b8..00000000
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/helper/ParcelableOneginiIdentityProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2016-2018 Onegini B.V.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.onegini.mobile.exampleapp.view.helper;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import com.onegini.mobile.sdk.android.model.OneginiIdentityProvider;
-
-public class ParcelableOneginiIdentityProvider implements Parcelable, OneginiIdentityProvider {
-
-  public static final Creator<ParcelableOneginiIdentityProvider> CREATOR = new Creator<ParcelableOneginiIdentityProvider>() {
-    @Override
-    public ParcelableOneginiIdentityProvider createFromParcel(Parcel in) {
-      return new ParcelableOneginiIdentityProvider(in);
-    }
-
-    @Override
-    public ParcelableOneginiIdentityProvider[] newArray(int size) {
-      return new ParcelableOneginiIdentityProvider[size];
-    }
-  };
-
-  private final String id;
-  private final String name;
-
-  public ParcelableOneginiIdentityProvider(String id, String name) {
-    this.id = id;
-    this.name = name;
-  }
-
-  private ParcelableOneginiIdentityProvider(Parcel in) {
-    id = in.readString();
-    name = in.readString();
-  }
-
-  @Override
-  public String getId() {
-    return id;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(final Parcel parcel, final int i) {
-    parcel.writeString(id);
-    parcel.writeString(name);
-  }
-}
diff --git a/app/src/main/res/layout/activity_two_way_otp_registration.xml b/app/src/main/res/layout/activity_two_way_otp_registration.xml
index 06a3e35c..93547eea 100644
--- a/app/src/main/res/layout/activity_two_way_otp_registration.xml
+++ b/app/src/main/res/layout/activity_two_way_otp_registration.xml
@@ -56,7 +56,7 @@
         android:layout_margin="@dimen/activity_margin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:inputType="textShortMessage"
+        android:inputType="number"
         android:textAlignment="center"
         android:minWidth="200dp"
         android:maxLines="1"/>

From 7ce85fd3085a47f4c878a61c89fadf0f75a4ab45 Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Mon, 12 Mar 2018 16:32:16 +0100
Subject: [PATCH 24/31] SDKAND-576 Apply required changes for registration in a
 browser

---
 .../com/onegini/mobile/exampleapp/OneginiSDK.java    |  3 ++-
 .../view/activity/RegistrationActivity.java          | 11 +----------
 .../view/handler/RegistrationRequestHandler.java     | 12 ++++++------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index 79e7173c..5742835e 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -55,8 +55,9 @@ private static OneginiClient buildSDK(final Context context) {
     final PinAuthenticationRequestHandler pinAuthenticationRequestHandler = new PinAuthenticationRequestHandler(applicationContext);
 
     // will throw OneginiConfigNotFoundException if OneginiConfigModel class can't be found
-    return new OneginiClientBuilder(applicationContext, registrationRequestHandler, createPinRequestHandler, pinAuthenticationRequestHandler)
+    return new OneginiClientBuilder(applicationContext, createPinRequestHandler, pinAuthenticationRequestHandler)
         // handlers for optional functionalities
+        .setBrowserRegistrationRequestHandler(registrationRequestHandler)
         .setFingerprintAuthenticationRequestHandler(new FingerprintAuthenticationRequestHandler(applicationContext))
         .setCustomAuthenticationRequestHandler(new BasicCustomAuthenticationRequestHandler(applicationContext))
         .setMobileAuthWithPushRequestHandler(new MobileAuthenticationRequestHandler(applicationContext))
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
index fa9427ad..37c96186 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/RegistrationActivity.java
@@ -95,11 +95,7 @@ protected void onCreate(final Bundle savedInstanceState) {
 
     setupUserInterface();
     final OneginiIdentityProvider oneginiIdentityProvider = getIntent().getParcelableExtra(IDENTITY_PROVIDER_EXTRA);
-    if (oneginiIdentityProvider == null) {
-      registerUser();
-    } else {
-      registerUser(oneginiIdentityProvider);
-    }
+    registerUser(oneginiIdentityProvider);
   }
 
   private void setupUserInterface() {
@@ -129,11 +125,6 @@ private void handleRedirection(final Uri uri) {
     }
   }
 
-  private void registerUser() {
-    final OneginiClient oneginiClient = OneginiSDK.getOneginiClient(this);
-    oneginiClient.getUserClient().registerUser(Constants.DEFAULT_SCOPES, registrationHandler);
-  }
-
   private void registerUser(final OneginiIdentityProvider identityProvider) {
     final OneginiClient oneginiClient = OneginiSDK.getOneginiClient(this);
     oneginiClient.getUserClient().registerUser(identityProvider, Constants.DEFAULT_SCOPES, registrationHandler);
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java
index 9430bfd0..f8ca9c9d 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/handler/RegistrationRequestHandler.java
@@ -19,12 +19,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import com.onegini.mobile.sdk.android.handlers.request.OneginiRegistrationRequestHandler;
-import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiRegistrationCallback;
+import com.onegini.mobile.sdk.android.handlers.request.OneginiBrowserRegistrationRequestHandler;
+import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiBrowserRegistrationCallback;
 
-public class RegistrationRequestHandler implements OneginiRegistrationRequestHandler {
+public class RegistrationRequestHandler implements OneginiBrowserRegistrationRequestHandler {
 
-  private static OneginiRegistrationCallback CALLBACK;
+  private static OneginiBrowserRegistrationCallback CALLBACK;
 
   /**
    * Finish registration action with result from web browser
@@ -53,8 +53,8 @@ public RegistrationRequestHandler(final Context context) {
   }
 
   @Override
-  public void startRegistration(final Uri uri, final OneginiRegistrationCallback oneginiRegistrationCallback) {
-    CALLBACK = oneginiRegistrationCallback;
+  public void startRegistration(final Uri uri, final OneginiBrowserRegistrationCallback oneginiBrowserRegistrationCallback) {
+    CALLBACK = oneginiBrowserRegistrationCallback;
 
     // We're going to launch external browser to allow user to log in. You could also use embedded WebView instead.
     final Intent intent = new Intent(Intent.ACTION_VIEW, uri);

From ca55c5e3042ac189c483d15bb4886425f705da14 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Tue, 27 Mar 2018 10:10:07 +0200
Subject: [PATCH 25/31] SDKAND-581 make necessary changes to the example app

---
 .../twowayotpidentityprovider/TwoWayOtpRegistrationAction.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
index 8cd2bf41..c9282415 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/twowayotpidentityprovider/TwoWayOtpRegistrationAction.java
@@ -35,7 +35,7 @@ public TwoWayOtpRegistrationAction(final Context context) {
   }
 
   @Override
-  public void initRegistration(final OneginiCustomRegistrationCallback callback) {
+  public void initRegistration(final OneginiCustomRegistrationCallback callback, final CustomInfo customInfo) {
     callback.returnSuccess(null);
   }
 

From 3e95bb762c1e45ad04ca441ad138f127fc7340b0 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Fri, 6 Apr 2018 12:53:52 +0200
Subject: [PATCH 26/31] EXAMPLEAND-47 Implement simple qr code scanner

---
 app/src/main/AndroidManifest.xml              |  11 +-
 .../onegini/mobile/exampleapp/OneginiSDK.java |   2 +
 .../model/QrCodeIdentityProvider.java         |  25 +++
 .../QrCodeRegistrationAction.java             |  27 ++++
 .../activity/QrCodeRegistrationActivity.java  | 142 ++++++++++++++++++
 .../layout/activity_qr_code_registration.xml  |  43 ++++++
 app/src/main/res/values/strings.xml           |   1 +
 7 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/model/QrCodeIdentityProvider.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/action/qrcodeidentityprovider/QrCodeRegistrationAction.java
 create mode 100644 app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
 create mode 100644 app/src/main/res/layout/activity_qr_code_registration.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f7b89534..3537c7ff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,10 @@
   limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.onegini.mobile.exampleapp">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.onegini.mobile.exampleapp">
+
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <application
         android:name=".ExampleApplication"
@@ -137,6 +139,11 @@
             android:name=".view.activity.TwoWayOtpRegistrationActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name=".view.activity.QrCodeRegistrationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"/>
+
         <service android:name=".network.fcm.FCMListenerService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
index 5742835e..c28bc4fb 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiSDK.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import com.onegini.mobile.exampleapp.model.BasicCustomAuthenticator;
 import com.onegini.mobile.exampleapp.model.PasswordCustomAuthenticator;
+import com.onegini.mobile.exampleapp.model.QrCodeIdentityProvider;
 import com.onegini.mobile.exampleapp.model.TwoWayOtpIdentityProvider;
 import com.onegini.mobile.exampleapp.view.handler.BasicCustomAuthenticationRequestHandler;
 import com.onegini.mobile.exampleapp.view.handler.CreatePinRequestHandler;
@@ -69,6 +70,7 @@ private static OneginiClient buildSDK(final Context context) {
         .setCustomAuthenticators(prepareCustomAuthenticators(applicationContext))
         // add a custom identity provider
         .addCustomIdentityProvider(new TwoWayOtpIdentityProvider(applicationContext))
+        .addCustomIdentityProvider(new QrCodeIdentityProvider(applicationContext))
         // Set http connect / read timeout
         .setHttpConnectTimeout((int) TimeUnit.SECONDS.toMillis(5))
         .setHttpReadTimeout((int) TimeUnit.SECONDS.toMillis(20))
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/model/QrCodeIdentityProvider.java b/app/src/main/java/com/onegini/mobile/exampleapp/model/QrCodeIdentityProvider.java
new file mode 100644
index 00000000..e33ff738
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/model/QrCodeIdentityProvider.java
@@ -0,0 +1,25 @@
+package com.onegini.mobile.exampleapp.model;
+
+import android.content.Context;
+import com.onegini.mobile.exampleapp.view.action.qrcodeidentityprovider.QrCodeRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomRegistrationAction;
+import com.onegini.mobile.sdk.android.model.OneginiCustomIdentityProvider;
+
+public class QrCodeIdentityProvider implements OneginiCustomIdentityProvider {
+
+  private final QrCodeRegistrationAction qrCodeRegistrationAction;
+
+  public QrCodeIdentityProvider(final Context context) {
+    qrCodeRegistrationAction = new QrCodeRegistrationAction(context);
+  }
+
+  @Override
+  public OneginiCustomRegistrationAction getRegistrationAction() {
+    return qrCodeRegistrationAction;
+  }
+
+  @Override
+  public String getId() {
+    return "qr-code-api";
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/action/qrcodeidentityprovider/QrCodeRegistrationAction.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/qrcodeidentityprovider/QrCodeRegistrationAction.java
new file mode 100644
index 00000000..db7946cd
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/action/qrcodeidentityprovider/QrCodeRegistrationAction.java
@@ -0,0 +1,27 @@
+package com.onegini.mobile.exampleapp.view.action.qrcodeidentityprovider;
+
+import android.content.Context;
+import android.content.Intent;
+import com.onegini.mobile.exampleapp.view.activity.QrCodeRegistrationActivity;
+import com.onegini.mobile.sdk.android.handlers.action.OneginiCustomRegistrationAction;
+import com.onegini.mobile.sdk.android.handlers.request.callback.OneginiCustomRegistrationCallback;
+import com.onegini.mobile.sdk.android.model.entity.CustomInfo;
+
+public class QrCodeRegistrationAction implements OneginiCustomRegistrationAction {
+
+  public static OneginiCustomRegistrationCallback CALLBACK;
+  private final Context context;
+
+  public QrCodeRegistrationAction(final Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public void finishRegistration(final OneginiCustomRegistrationCallback callback, final CustomInfo customInfo) {
+    CALLBACK = callback;
+
+    final Intent intent = new Intent(context, QrCodeRegistrationActivity.class);
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(intent);
+  }
+}
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
new file mode 100644
index 00000000..05c03a63
--- /dev/null
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
@@ -0,0 +1,142 @@
+package com.onegini.mobile.exampleapp.view.activity;
+
+import java.io.IOException;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.app.DialogFragment;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.widget.Button;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import com.google.android.gms.vision.CameraSource;
+import com.google.android.gms.vision.Detector;
+import com.google.android.gms.vision.barcode.Barcode;
+import com.google.android.gms.vision.barcode.BarcodeDetector;
+import com.onegini.mobile.exampleapp.R;
+import com.onegini.mobile.exampleapp.view.action.qrcodeidentityprovider.QrCodeRegistrationAction;
+import com.onegini.mobile.exampleapp.view.helper.AlertDialogFragment;
+
+public class QrCodeRegistrationActivity extends AppCompatActivity {
+
+  private static final String TAG = QrCodeRegistrationActivity.class.getSimpleName();
+
+  private static final int CAMERA_PERMISSION_REQUEST_CODE = 12345;
+
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.qr_code_scanner)
+  SurfaceView qrCodeScanner;
+  @SuppressWarnings({ "unused", "WeakerAccess" })
+  @BindView(R.id.qr_code_cancel_button)
+  Button cancelButton;
+
+  private CameraSource cameraSource;
+
+  @Override
+  protected void onCreate(final Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_qr_code_registration);
+    ButterKnife.bind(this);
+    initQrCodeScanner();
+  }
+
+  private void initQrCodeScanner() {
+    final BarcodeDetector barcodeDetector = new BarcodeDetector.Builder(this)
+        .setBarcodeFormats(Barcode.QR_CODE)
+        .build();
+    cameraSource = new CameraSource.Builder(this, barcodeDetector)
+        .setAutoFocusEnabled(true)
+        .setRequestedPreviewSize(640, 480)
+        .setFacing(CameraSource.CAMERA_FACING_BACK)
+        .build();
+
+    barcodeDetector.setProcessor(new Detector.Processor<Barcode>() {
+      @Override
+      public void release() {
+      }
+
+      @Override
+      public void receiveDetections(final Detector.Detections<Barcode> detections) {
+        final SparseArray<Barcode> qrCodes = detections.getDetectedItems();
+        if (qrCodes.size() != 0) {
+          if (QrCodeRegistrationAction.CALLBACK != null) {
+            final String qrCode = qrCodes.valueAt(0).displayValue;
+            QrCodeRegistrationAction.CALLBACK.returnSuccess(qrCode);
+          }
+          finish();
+        }
+      }
+    });
+
+    qrCodeScanner.getHolder().addCallback(new SurfaceHolder.Callback() {
+      @Override
+      public void surfaceCreated(final SurfaceHolder surfaceHolder) {
+        if (ActivityCompat.checkSelfPermission(QrCodeRegistrationActivity.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+          ActivityCompat.requestPermissions(QrCodeRegistrationActivity.this, new String[]{ Manifest.permission.CAMERA }, CAMERA_PERMISSION_REQUEST_CODE);
+        } else {
+          startCamera();
+        }
+      }
+
+      @Override
+      public void surfaceChanged(final SurfaceHolder surfaceHolder, final int i, final int i1, final int i2) {
+
+      }
+
+      @Override
+      public void surfaceDestroyed(final SurfaceHolder surfaceHolder) {
+        cameraSource.stop();
+      }
+    });
+  }
+
+  @Override
+  public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    if (requestCode == CAMERA_PERMISSION_REQUEST_CODE) {
+      if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+        startCamera();
+      }
+    }
+  }
+
+  @SuppressLint("MissingPermission")
+  private void startCamera() {
+    try {
+      cameraSource.start(qrCodeScanner.getHolder());
+    } catch (IOException e) {
+      showError("Couldn't start the camera. See logcat for more details.");
+      Log.e(TAG, e.getMessage(), e);
+    }
+  }
+
+  @SuppressWarnings("unused")
+  @OnClick(R.id.qr_code_cancel_button)
+  public void onCancelButtonClicked() {
+    if (QrCodeRegistrationAction.CALLBACK != null) {
+      QrCodeRegistrationAction.CALLBACK.returnError(new Exception("Registration canceled"));
+    }
+    finish();
+  }
+
+  private void showError(final String message) {
+    final DialogFragment dialog = AlertDialogFragment.newInstance(message);
+    dialog.show(getFragmentManager(), "alert_dialog");
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    cameraSource.stop();
+    cameraSource.release();
+  }
+}
diff --git a/app/src/main/res/layout/activity_qr_code_registration.xml b/app/src/main/res/layout/activity_qr_code_registration.xml
new file mode 100644
index 00000000..6ecfe727
--- /dev/null
+++ b/app/src/main/res/layout/activity_qr_code_registration.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright (c) 2016-2018 Onegini B.V.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+        <TextView
+            android:text="@string/qr_code_message"
+            android:layout_width="match_parent"
+            android:textAlignment="center"
+            android:layout_margin="@dimen/activity_login_logo_margin_top"
+            android:layout_height="wrap_content"
+            style="@style/Base.TextAppearance.AppCompat.Headline"/>
+
+        <SurfaceView
+            android:id="@+id/qr_code_scanner"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/qr_code_cancel_button"
+            style="@style/ButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="90dp"
+            android:textAlignment="center"
+            android:text="@string/btn_cancel_label"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76e538d5..7ac00d8c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,4 +100,5 @@
     <string name="two_way_otp_message">One-Time Password</string>
     <string name="two_way_otp_challenge_code_label">Challenge code</string>
     <string name="two_way_otp_response_code_label">Response code</string>
+    <string name="qr_code_message">Scan QR code</string>
 </resources>

From d68ed4ae7488dcdd8a32ad65aad1a6a661361a28 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Fri, 6 Apr 2018 14:06:24 +0200
Subject: [PATCH 27/31] EXAMPLEAND-47 add missing gradle dependency

---
 app/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 16e2a8ef..80fe329a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,10 +93,12 @@ dependencies {
   implementation 'com.android.support:recyclerview-v7:27.0.2'
   implementation 'com.android.support:support-core-ui:27.0.2'
 
+  // QR code reader
+  implementation 'com.google.android.gms:play-services-vision:12.0.1'
   // Google Play Services availability check
-  implementation 'com.google.android.gms:play-services-base:11.6.0'
+  implementation 'com.google.android.gms:play-services-base:12.0.1'
   //Firebase Cloud Messaging (FCM)
-  implementation "com.google.firebase:firebase-messaging:11.6.0"
+  implementation "com.google.firebase:firebase-messaging:12.0.1"
   // Support for multidex
   implementation 'com.android.support:multidex:1.0.2'
   // DI for views

From 85fef348a613a6007122c517edc820d57d3c96d4 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Mon, 9 Apr 2018 11:13:20 +0200
Subject: [PATCH 28/31] EXAMPLEAND-47 revert the GPS version update

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 80fe329a..c6c7c760 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,11 +94,11 @@ dependencies {
   implementation 'com.android.support:support-core-ui:27.0.2'
 
   // QR code reader
-  implementation 'com.google.android.gms:play-services-vision:12.0.1'
+  implementation 'com.google.android.gms:play-services-vision:11.6.0'
   // Google Play Services availability check
-  implementation 'com.google.android.gms:play-services-base:12.0.1'
+  implementation 'com.google.android.gms:play-services-base:11.6.0'
   //Firebase Cloud Messaging (FCM)
-  implementation "com.google.firebase:firebase-messaging:12.0.1"
+  implementation 'com.google.firebase:firebase-messaging:11.6.0'
   // Support for multidex
   implementation 'com.android.support:multidex:1.0.2'
   // DI for views

From fab2bd39741842a52e4aa999058e81172cda4f44 Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Mon, 9 Apr 2018 11:36:58 +0200
Subject: [PATCH 29/31] EXAMPLEAND-47 apply review remarks

---
 .../activity/QrCodeRegistrationActivity.java  | 96 +++++++++++--------
 1 file changed, 55 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
index 05c03a63..e25d9dac 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
@@ -50,53 +50,25 @@ protected void onCreate(final Bundle savedInstanceState) {
   }
 
   private void initQrCodeScanner() {
-    final BarcodeDetector barcodeDetector = new BarcodeDetector.Builder(this)
+    final BarcodeDetector barcodeDetector = buildBarcodeDetector();
+    cameraSource = buildCameraSource(barcodeDetector);
+
+    barcodeDetector.setProcessor(new QrCodeDetectorProcessor());
+    qrCodeScanner.getHolder().addCallback(new QrCodeSurfaceHolderCallback());
+  }
+
+  private BarcodeDetector buildBarcodeDetector() {
+    return new BarcodeDetector.Builder(this)
         .setBarcodeFormats(Barcode.QR_CODE)
         .build();
-    cameraSource = new CameraSource.Builder(this, barcodeDetector)
+  }
+
+  private CameraSource buildCameraSource(final BarcodeDetector barcodeDetector) {
+    return new CameraSource.Builder(this, barcodeDetector)
         .setAutoFocusEnabled(true)
         .setRequestedPreviewSize(640, 480)
         .setFacing(CameraSource.CAMERA_FACING_BACK)
         .build();
-
-    barcodeDetector.setProcessor(new Detector.Processor<Barcode>() {
-      @Override
-      public void release() {
-      }
-
-      @Override
-      public void receiveDetections(final Detector.Detections<Barcode> detections) {
-        final SparseArray<Barcode> qrCodes = detections.getDetectedItems();
-        if (qrCodes.size() != 0) {
-          if (QrCodeRegistrationAction.CALLBACK != null) {
-            final String qrCode = qrCodes.valueAt(0).displayValue;
-            QrCodeRegistrationAction.CALLBACK.returnSuccess(qrCode);
-          }
-          finish();
-        }
-      }
-    });
-
-    qrCodeScanner.getHolder().addCallback(new SurfaceHolder.Callback() {
-      @Override
-      public void surfaceCreated(final SurfaceHolder surfaceHolder) {
-        if (ActivityCompat.checkSelfPermission(QrCodeRegistrationActivity.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-          ActivityCompat.requestPermissions(QrCodeRegistrationActivity.this, new String[]{ Manifest.permission.CAMERA }, CAMERA_PERMISSION_REQUEST_CODE);
-        } else {
-          startCamera();
-        }
-      }
-
-      @Override
-      public void surfaceChanged(final SurfaceHolder surfaceHolder, final int i, final int i1, final int i2) {
-
-      }
-
-      @Override
-      public void surfaceDestroyed(final SurfaceHolder surfaceHolder) {
-        cameraSource.stop();
-      }
-    });
   }
 
   @Override
@@ -139,4 +111,46 @@ protected void onDestroy() {
     cameraSource.stop();
     cameraSource.release();
   }
+
+  private class QrCodeDetectorProcessor implements Detector.Processor<Barcode> {
+
+    @Override
+    public void release() {
+
+    }
+
+    @Override
+    public void receiveDetections(final Detector.Detections<Barcode> detections) {
+      final SparseArray<Barcode> qrCodes = detections.getDetectedItems();
+      if (qrCodes.size() != 0) {
+        if (QrCodeRegistrationAction.CALLBACK != null) {
+          final String qrCode = qrCodes.valueAt(0).displayValue;
+          QrCodeRegistrationAction.CALLBACK.returnSuccess(qrCode);
+        }
+        finish();
+      }
+    }
+  }
+
+  private class QrCodeSurfaceHolderCallback implements SurfaceHolder.Callback {
+
+    @Override
+    public void surfaceCreated(final SurfaceHolder surfaceHolder) {
+      if (ActivityCompat.checkSelfPermission(QrCodeRegistrationActivity.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+        ActivityCompat.requestPermissions(QrCodeRegistrationActivity.this, new String[]{ Manifest.permission.CAMERA }, CAMERA_PERMISSION_REQUEST_CODE);
+      } else {
+        startCamera();
+      }
+    }
+
+    @Override
+    public void surfaceChanged(final SurfaceHolder surfaceHolder, final int i, final int i1, final int i2) {
+
+    }
+
+    @Override
+    public void surfaceDestroyed(final SurfaceHolder surfaceHolder) {
+      cameraSource.stop();
+    }
+  }
 }

From 331aaafcf01c5285219d9dbd1b16cacca4e939cc Mon Sep 17 00:00:00 2001
From: Marcin Paszylk <marcin@onegini.com>
Date: Mon, 9 Apr 2018 11:50:36 +0200
Subject: [PATCH 30/31] EXAMPLEAND-47 return error if user denies the camera
 permission

---
 .../view/activity/QrCodeRegistrationActivity.java         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
index e25d9dac..e30f9743 100644
--- a/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
+++ b/app/src/main/java/com/onegini/mobile/exampleapp/view/activity/QrCodeRegistrationActivity.java
@@ -77,6 +77,8 @@ public void onRequestPermissionsResult(final int requestCode, @NonNull final Str
     if (requestCode == CAMERA_PERMISSION_REQUEST_CODE) {
       if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
         startCamera();
+      } else {
+        cancelQrCodeScanning(new Exception("Camera permission denied by the user"));
       }
     }
   }
@@ -94,8 +96,12 @@ private void startCamera() {
   @SuppressWarnings("unused")
   @OnClick(R.id.qr_code_cancel_button)
   public void onCancelButtonClicked() {
+    cancelQrCodeScanning(new Exception("Registration canceled"));
+  }
+
+  private void cancelQrCodeScanning(final Exception exception) {
     if (QrCodeRegistrationAction.CALLBACK != null) {
-      QrCodeRegistrationAction.CALLBACK.returnError(new Exception("Registration canceled"));
+      QrCodeRegistrationAction.CALLBACK.returnError(exception);
     }
     finish();
   }

From 9d87e8b326a735a28c1b225248659d0a5fe1eb1d Mon Sep 17 00:00:00 2001
From: Robert Szuba <robert@onegini.com>
Date: Wed, 18 Apr 2018 15:26:09 +0200
Subject: [PATCH 31/31] Prepare release 5.0.0

---
 app/build.gradle                                            | 6 +++---
 .../com/onegini/mobile/exampleapp/OneginiConfigModel.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c6c7c760..96c18297 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,8 +53,8 @@ android {
     applicationId "com.onegini.mobile.exampleapp"
     minSdkVersion 16
     targetSdkVersion 27
-    versionCode 12
-    versionName "4.1.0"
+    versionCode 13
+    versionName "5.0.0"
     multiDexEnabled true
   }
   buildTypes {
@@ -76,7 +76,7 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:9.0.0-SNAPSHOT@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:9.0.0@aar') {
     transitive = true
   }
 
diff --git a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java b/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java
index 69613edf..e2fe70c8 100755
--- a/app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java
+++ b/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 = "4.1.0";
+  private final String appVersion = "5.0.0";
   private final String baseURL = "https://demo-msp.onegini.com";
   private final String resourceBaseURL = "https://demo-msp.onegini.com/resources";
   private final String keystoreHash = "910638c3e6c17ec9ab2a74969abab06b34470d29c21d8ad8a65af243a1ccb69f";