Merge pull request #184 from Onegini/develop

Develop
onewelcome · Jan 28, 2021 · b4240fc · b4240fc
2 parents 62e3dee + e8b5aa7
commit b4240fc
Show file tree

Hide file tree

Showing 19 changed files with 106 additions and 78 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,8 +44,8 @@ allprojects {
 }
 
 android {
-  compileSdkVersion 29
-  buildToolsVersion '29.0.2'
+  compileSdkVersion 30
+  buildToolsVersion '30.0.2'
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
@@ -54,10 +54,10 @@ android {
 
   defaultConfig {
     applicationId "com.onegini.mobile.exampleapp"
-    minSdkVersion 19
-    targetSdkVersion 29
-    versionCode 19
-    versionName "6.1.0"
+    minSdkVersion 23
+    targetSdkVersion 30
+    versionCode 20
+    versionName "7.0.0"
     multiDexEnabled true
   }
   buildTypes {
@@ -79,45 +79,35 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:10.2.2@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:11.0.0@aar') {
     transitive = true
   }
 
   // Rest Client
-  implementation 'com.squareup.retrofit2:adapter-rxjava:2.6.4'
+  implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
 
   // Google Support
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'androidx.cardview:cardview:1.0.0'
-  implementation 'com.google.android.material:material:1.0.0'
-  implementation 'androidx.recyclerview:recyclerview:1.0.0'
-  implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-  implementation 'androidx.media:media:1.1.0'
-  implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+  //Bottom navigation bar
+  implementation 'com.google.android.material:material:1.2.1'
+  implementation 'androidx.recyclerview:recyclerview:1.1.0'
+  implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
   // QR code reader
-  implementation 'com.google.android.gms:play-services-vision:19.0.0'
+  implementation 'com.google.android.gms:play-services-vision:20.1.3'
   // Google Play Services availability check
-  implementation 'com.google.android.gms:play-services-base:17.1.0'
+  implementation 'com.google.android.gms:play-services-base:17.5.0'
   //Firebase Cloud Messaging (FCM)
-  implementation 'com.google.firebase:firebase-messaging:20.0.0'
+  implementation 'com.google.firebase:firebase-messaging:21.0.1'
   // Support for multidex
   implementation 'androidx.multidex:multidex:2.0.1'
   // DI for views
   implementation 'com.jakewharton:butterknife:10.2.0'
   annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
   // RxJava
-  implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-  implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
-}
-
-configurations.all {
-  resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-    def requested = details.requested
-    if (requested.group == "com.android.support" && !requested.name.startsWith("multidex")) {
-      details.useVersion "27.+"
-    }
-  }
+  implementation 'io.reactivex.rxjava3:rxjava:3.0.9'
+  implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
 }
 
 //according to google documentation, this plugin has to be applied at the end of the file

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -150,7 +150,8 @@
             android:screenOrientation="portrait"/>
 
         <service android:name=".network.fcm.FCMListenerService"
-            android:stopWithTask="false">
+            android:stopWithTask="false"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
@@ -166,4 +167,4 @@
 
     </application>
 
-</manifest>
+</manifest>
diff --git 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-2018 Onegini B.V.
+ * Copyright (c) 2016-2021 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.
@@ -25,10 +25,11 @@ 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.1.0";
+  private final String appVersion = "7.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 = "b243b00e336e0b8f0c212779e0a276a382768a99706e452098ab0f3f77e8f616";
+  private final String keystoreHash = "b76a556a9b19645ef4b1f9dbb620ca5aa98a25d50bea4af06381604f70e48b9b";
+  private final String serverPublicKey = "7BE84689A28B993F917C47EBE74A089C8C9A7B8F8898D43C9AD9A8D7E8B16298";
 
   @Override
   public String getAppIdentifier() {
@@ -75,6 +76,11 @@ public String getDeviceName() {
     return Build.BRAND + " " + Build.MODEL;
   }
 
+  @Override
+  public String getServerPublicKey() {
+    return serverPublicKey;
+  }
+
   @Override
   public String toString() {
     return "ConfigModel{" +

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -20,9 +20,9 @@
 import com.onegini.mobile.exampleapp.model.ApplicationDetails;
 import com.onegini.mobile.exampleapp.network.client.AnonymousClient;
 import com.onegini.mobile.exampleapp.network.client.SecureResourceClient;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class AnonymousService {
 
@@ -46,4 +46,4 @@ public Single<ApplicationDetails> getApplicationDetails() {
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread());
   }
-}
+}
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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -20,9 +20,9 @@
 import com.onegini.mobile.exampleapp.model.ImplicitUserDetails;
 import com.onegini.mobile.exampleapp.network.client.ImplicitUserClient;
 import com.onegini.mobile.exampleapp.network.client.SecureResourceClient;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ImplicitUserService {
 

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -20,9 +20,9 @@
 import com.onegini.mobile.exampleapp.network.client.SecureResourceClient;
 import com.onegini.mobile.exampleapp.network.client.UserClient;
 import com.onegini.mobile.exampleapp.network.response.DevicesResponse;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class UserService {
 

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -17,7 +17,7 @@
 package com.onegini.mobile.exampleapp.network.client;
 
 import com.onegini.mobile.exampleapp.model.ApplicationDetails;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Single;
 import retrofit2.http.GET;
 
 public interface AnonymousClient {

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -17,7 +17,7 @@
 package com.onegini.mobile.exampleapp.network.client;
 
 import com.onegini.mobile.exampleapp.model.ImplicitUserDetails;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Single;
 import retrofit2.http.GET;
 
 public interface ImplicitUserClient {

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
@@ -21,7 +21,7 @@
 import com.onegini.mobile.sdk.android.client.OneginiClient;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 public class SecureResourceClient {
@@ -50,9 +50,9 @@ private static <T> T prepareSecuredRetrofitClient(final Class<T> clazz, final Co
         .client(okHttpClient)
         .baseUrl(oneginiClient.getConfigModel().getResourceBaseUrl())
         .addConverterFactory(GsonConverterFactory.create())
-        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+        .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
         .build();
 
     return retrofit.create(clazz);
   }
-}
+}
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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -17,7 +17,7 @@
 package com.onegini.mobile.exampleapp.network.client;
 
 import com.onegini.mobile.exampleapp.network.response.DevicesResponse;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Single;
 import retrofit2.http.GET;
 
 public interface UserClient {

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
@@ -19,9 +19,8 @@
 import android.content.Context;
 import android.util.Log;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.onegini.mobile.exampleapp.OneginiSDK;
-import com.onegini.mobile.exampleapp.R;
 import com.onegini.mobile.exampleapp.storage.FCMStorage;
 import com.onegini.mobile.sdk.android.client.UserClient;
 import com.onegini.mobile.sdk.android.handlers.OneginiMobileAuthWithPushEnrollmentHandler;
@@ -43,14 +42,9 @@ public FCMRegistrationService(final Context context) {
 
   public void enrollForPush(final PushEnrollmentHandler enrollmentHandler) {
     FirebaseApp.initializeApp(context);
-    FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(instanceIdResult -> {
-      final String fcmRefreshToken = instanceIdResult.getToken();
-      if (fcmRefreshToken.isEmpty()) {
-        enrollmentHandler.onError(new Exception(context.getString(R.string.push_token_is_null_error_message)));
-      } else {
-        enrollUserForMobileAuthWithPush(enrollmentHandler, fcmRefreshToken);
-      }
-    }).addOnFailureListener(enrollmentHandler::onError);
+    FirebaseMessaging.getInstance().getToken()
+        .addOnSuccessListener(token -> enrollUserForMobileAuthWithPush(enrollmentHandler, token))
+        .addOnFailureListener(enrollmentHandler::onError);
   }
 
   private void enrollUserForMobileAuthWithPush(final PushEnrollmentHandler enrollmentHandler, final String fcmRefreshToken) {

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Onegini B.V.
+ * Copyright (c) 2016-2020 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.
@@ -34,7 +34,7 @@
 import com.onegini.mobile.exampleapp.model.Device;
 import com.onegini.mobile.exampleapp.network.UserService;
 import com.onegini.mobile.exampleapp.network.response.DevicesResponse;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public class DevicesListActivity extends AppCompatActivity {
 

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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016-2020 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 static com.onegini.mobile.exampleapp.view.helper.ErrorMessageParser.parseErrorMessage;
@@ -29,7 +45,7 @@
 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 io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 public class InfoActivity extends AppCompatActivity {