Merge pull request #175 from Onegini/develop

Develop

Author: Robert Szuba

app/build.gradle

@@ -57,7 +57,7 @@ android {
     minSdkVersion 19
     targetSdkVersion 29
     versionCode 19
-    versionName "6.0.0"
+    versionName "6.1.0"
     multiDexEnabled true
   }
   buildTypes {
@@ -79,12 +79,12 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:10.0.0@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:10.1.0@aar') {
     transitive = true
   }
 
   // Rest Client
-  implementation 'com.squareup.retrofit2:adapter-rxjava:2.5.0'
+  implementation 'com.squareup.retrofit2:adapter-rxjava:2.6.4'
 
   // Google Support
   implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -108,7 +108,7 @@ dependencies {
   annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
   // RxJava
   implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-  implementation 'io.reactivex.rxjava2:rxjava:2.2.15'
+  implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
 }
 
 configurations.all {

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

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

app/src/main/java/com/onegini/mobile/exampleapp/adapter/PendingPushMessagesAdapter.java

@@ -16,25 +16,38 @@
 
 package com.onegini.mobile.exampleapp.adapter;
 
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
 import android.content.Context;
 import android.content.Intent;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.recyclerview.widget.RecyclerView;
+import com.onegini.mobile.exampleapp.OneginiSDK;
 import com.onegini.mobile.exampleapp.R;
 import com.onegini.mobile.exampleapp.model.User;
 import com.onegini.mobile.exampleapp.network.fcm.MobileAuthenticationService;
 import com.onegini.mobile.exampleapp.storage.UserStorage;
+import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
+import com.onegini.mobile.exampleapp.view.activity.LoginActivity;
+import com.onegini.mobile.sdk.android.handlers.OneginiDenyMobileAuthWithPushRequestHandler;
+import com.onegini.mobile.sdk.android.handlers.error.OneginiAuthenticatorDeregistrationError;
+import com.onegini.mobile.sdk.android.handlers.error.OneginiDenyMobileAuthWithPushRequestError;
 import com.onegini.mobile.sdk.android.model.entity.OneginiMobileAuthWithPushRequest;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
@@ -82,6 +95,51 @@ public void onBindViewHolder(final PendingPushMessagesAdapter.ViewHolder viewHol
     viewHolder.expiresTextView.setText(context.getString(R.string.notification_expires_at, sdf.format(calendar.getTime())));
 
     viewHolder.onClickListener = v -> context.startService(getServiceIntent(oneginiMobileAuthWithPushRequest));
+    setDenyButtonListener(viewHolder, oneginiMobileAuthWithPushRequest);
+  }
+
+  private void setDenyButtonListener(final ViewHolder viewHolder, final OneginiMobileAuthWithPushRequest oneginiMobileAuthWithPushRequest) {
+    viewHolder.denyButton
+        .setOnClickListener(v -> OneginiSDK.getOneginiClient(context).getUserClient().denyMobileAuthWithPushRequest(oneginiMobileAuthWithPushRequest,
+            new OneginiDenyMobileAuthWithPushRequestHandler() {
+              @Override
+              public void onSuccess() {
+                removeRequestFromList(oneginiMobileAuthWithPushRequest.getTransactionId());
+                notifyDataSetChanged();
+              }
+
+              @Override
+              public void onError(final OneginiDenyMobileAuthWithPushRequestError error) {
+                @OneginiDenyMobileAuthWithPushRequestError.DenyMobileAuthWithPushRequestErrorType int errorType = error.getErrorType();
+                if (errorType == OneginiAuthenticatorDeregistrationError.USER_DEREGISTERED) {
+                  final UserProfile authenticatedUserProfile = OneginiSDK.getOneginiClient(context).getUserClient().getAuthenticatedUserProfile();
+                  new DeregistrationUtil(context).onUserDeregistered(authenticatedUserProfile);
+                  startLoginActivity(error.getMessage());
+                } else if (errorType == OneginiAuthenticatorDeregistrationError.DEVICE_DEREGISTERED) {
+                  new DeregistrationUtil(context).onDeviceDeregistered();
+                  startLoginActivity(error.getMessage());
+                } else {
+                  Toast.makeText(context, error.getMessage(), Toast.LENGTH_SHORT).show();
+                }
+              }
+            }));
+  }
+
+  private void removeRequestFromList(final String transactionId) {
+    final Iterator<OneginiMobileAuthWithPushRequest> iterator = list.iterator();
+    while (iterator.hasNext()) {
+      final OneginiMobileAuthWithPushRequest request = iterator.next();
+      if (request.getTransactionId().equals(transactionId)) {
+        iterator.remove();
+      }
+    }
+  }
+
+  private void startLoginActivity(final String errorMessage) {
+    final Intent intent = new Intent(context, LoginActivity.class);
+    intent.putExtra(LoginActivity.ERROR_MESSAGE_EXTRA, errorMessage);
+    intent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+    context.startActivity(intent);
   }
 
   @Override
@@ -103,6 +161,7 @@ static class ViewHolder extends RecyclerView.ViewHolder {
     final TextView dateTextView;
     final TextView profileTextView;
     final TextView expiresTextView;
+    final ImageView denyButton;
 
     OnClickListener onClickListener;
 
@@ -113,6 +172,7 @@ static class ViewHolder extends RecyclerView.ViewHolder {
       dateTextView = itemView.findViewById(R.id.pending_message_timestamp);
       profileTextView = itemView.findViewById(R.id.pending_message_profile);
       expiresTextView = itemView.findViewById(R.id.pending_message_expires);
+      denyButton = itemView.findViewById(R.id.pending_message_deny);
       itemView.setOnClickListener(v -> {
         if (onClickListener != null) {
           onClickListener.onClick(v);

app/src/main/res/drawable/ic_delete_grey_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#808080"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>

app/src/main/res/layout/row_item_pending_message.xml

@@ -70,5 +70,15 @@
             android:layout_below="@+id/pending_message"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"/>
+
+        <ImageView
+            android:id="@+id/pending_message_deny"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_delete_grey_24dp"
+            android:layout_alignParentEnd="true"
+            android:baselineAlignBottom="true"
+            android:layout_alignBaseline="@id/pending_message_expires"
+            android:padding="8dp"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>