Merge pull request #143 from Onegini/develop

Develop

Author: Robert Szuba

app/build.gradle

@@ -27,6 +27,10 @@ allprojects {
     google()
     if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password')) {
       maven {
+        /*
+        Before the release please change the url below to: https://repo.onegini.com/artifactory/onegini-sdk
+        Please change it back to https://repo.onegini.com/artifactory/public after the release
+        */
         url "https://repo.onegini.com/artifactory/onegini-sdk"
         credentials {
           username artifactory_user
@@ -53,8 +57,8 @@ android {
     applicationId "com.onegini.mobile.exampleapp"
     minSdkVersion 16
     targetSdkVersion 27
-    versionCode 14
-    versionName "5.1.0"
+    versionCode 15
+    versionName "5.3.0"
     multiDexEnabled true
   }
   buildTypes {
@@ -76,15 +80,12 @@ android {
 
 dependencies {
   // Onegini SDK
-  api('com.onegini.mobile.sdk.android:onegini-sdk:9.1.0@aar') {
+  api('com.onegini.mobile.sdk.android:onegini-sdk:9.3.0@aar') {
     transitive = true
   }
 
   // Rest Client
-  implementation 'com.squareup.retrofit:retrofit:1.9.0'
   implementation 'com.squareup.retrofit2:adapter-rxjava:2.4.0'
-  // we have to use this wrapper for Retrofit 1 + OkHttp 3 usage
-  implementation 'com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0'
 
   // Google Support
   implementation 'com.android.support:appcompat-v7:27.1.1'
@@ -94,19 +95,19 @@ dependencies {
   implementation 'com.android.support:support-core-ui:27.1.1'
 
   // QR code reader
-  implementation 'com.google.android.gms:play-services-vision:15.0.0'
+  implementation 'com.google.android.gms:play-services-vision:17.0.2'
   // Google Play Services availability check
-  implementation 'com.google.android.gms:play-services-base:15.0.1'
+  implementation 'com.google.android.gms:play-services-base:16.0.1'
   //Firebase Cloud Messaging (FCM)
-  implementation 'com.google.firebase:firebase-messaging:15.0.2'
+  implementation 'com.google.firebase:firebase-messaging:17.3.4'
   // Support for multidex
   implementation 'com.android.support:multidex:1.0.2'
   // DI for views
   implementation 'com.jakewharton:butterknife:8.8.1'
   annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
   // RxJava
-  implementation 'io.reactivex:rxandroid:1.2.1'
-  implementation 'io.reactivex:rxjava:1.2.3'
+  implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+  implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
 }
 
 //according to google documentation, this plugin has to be applied at the end of the file

app/src/main/AndroidManifest.xml

@@ -144,16 +144,12 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
 
-        <service android:name=".network.fcm.FCMListenerService">
+        <service android:name=".network.fcm.FCMListenerService"
+            android:stopWithTask="false">
             <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"/>

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

@@ -25,9 +25,9 @@ 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 = "5.1.0";
+  private final String appVersion = "5.3.0";
   private final String baseURL = "https://demo-msp.onegini.com";
-  private final String resourceBaseURL = "https://demo-msp.onegini.com/resources";
+  private final String resourceBaseURL = "https://demo-msp.onegini.com/resources/";
   private final String keystoreHash = "910638c3e6c17ec9ab2a74969abab06b34470d29c21d8ad8a65af243a1ccb69f";
 
   @Override

app/src/main/java/com/onegini/mobile/exampleapp/network/AnonymousService.java

@@ -19,11 +19,10 @@
 import android.content.Context;
 import com.onegini.mobile.exampleapp.model.ApplicationDetails;
 import com.onegini.mobile.exampleapp.network.client.AnonymousClient;
-import com.onegini.mobile.exampleapp.network.client.AnonymousClient2;
 import com.onegini.mobile.exampleapp.network.client.SecureResourceClient;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 public class AnonymousService {
 
@@ -36,28 +35,15 @@ public static AnonymousService getInstance(final Context context) {
     return INSTANCE;
   }
 
-  // the client using Retrofit 1.9
   private final AnonymousClient applicationDetailsRetrofitClient;
-  // the client using Retrofit 2.X
-  private final AnonymousClient2 applicationDetailsRetrofit2Client;
 
   private AnonymousService(final Context context) {
     applicationDetailsRetrofitClient = SecureResourceClient.prepareSecuredAnonymousRetrofitClient(AnonymousClient.class, context);
-    applicationDetailsRetrofit2Client = SecureResourceClient.prepareSecuredAnonymousRetrofit2Client(AnonymousClient2.class, context);
   }
 
-  public Observable<ApplicationDetails> getApplicationDetails(final boolean useRetrofit2) {
-    return getObservable(useRetrofit2)
+  public Single<ApplicationDetails> getApplicationDetails() {
+    return applicationDetailsRetrofitClient.getApplicationDetails()
         .subscribeOn(Schedulers.io())
-        .observeOn(AndroidSchedulers.mainThread())
-        .unsubscribeOn(Schedulers.io());
-  }
-
-  private Observable<ApplicationDetails> getObservable(final boolean useRetrofit2) {
-    if (useRetrofit2) {
-      return applicationDetailsRetrofit2Client.getApplicationDetails();
-    } else {
-      return applicationDetailsRetrofitClient.getApplicationDetails();
-    }
+        .observeOn(AndroidSchedulers.mainThread());
   }
 }

app/src/main/java/com/onegini/mobile/exampleapp/network/ImplicitUserService.java

@@ -19,11 +19,10 @@
 import android.content.Context;
 import com.onegini.mobile.exampleapp.model.ImplicitUserDetails;
 import com.onegini.mobile.exampleapp.network.client.ImplicitUserClient;
-import com.onegini.mobile.exampleapp.network.client.ImplicitUserClient2;
 import com.onegini.mobile.exampleapp.network.client.SecureResourceClient;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 public class ImplicitUserService {
 
@@ -36,27 +35,15 @@ public static ImplicitUserService getInstance(final Context context) {
     return INSTANCE;
   }
 
-  // the client using Retrofit 1.9
   private final ImplicitUserClient applicationDetailsRetrofitClient;
-  // the client using Retrofit 2.X
-  private final ImplicitUserClient2 applicationDetailsRetrofit2Client;
 
   private ImplicitUserService(final Context context) {
     applicationDetailsRetrofitClient = SecureResourceClient.prepareSecuredImplicitUserRetrofitClient(ImplicitUserClient.class, context);
-    applicationDetailsRetrofit2Client = SecureResourceClient.prepareSecuredImplicitUserRetrofit2Client(ImplicitUserClient2.class, context);
   }
 
-  public Observable<ImplicitUserDetails> getImplicitUserDetails(final boolean useRetrofit2) {
-    return getObservable(useRetrofit2)
+  public Single<ImplicitUserDetails> getImplicitUserDetails() {
+    return applicationDetailsRetrofitClient.getImplicitUserDetails()
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread());
   }
-
-  private Observable<ImplicitUserDetails> getObservable(final boolean useRetrofit2) {
-    if (useRetrofit2) {
-      return applicationDetailsRetrofit2Client.getImplicitUserDetails();
-    } else {
-      return applicationDetailsRetrofitClient.getImplicitUserDetails();
-    }
-  }
 }

app/src/main/java/com/onegini/mobile/exampleapp/network/UserService.java

@@ -19,11 +19,10 @@
 import android.content.Context;
 import com.onegini.mobile.exampleapp.network.client.SecureResourceClient;
 import com.onegini.mobile.exampleapp.network.client.UserClient;
-import com.onegini.mobile.exampleapp.network.client.UserClient2;
 import com.onegini.mobile.exampleapp.network.response.DevicesResponse;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 public class UserService {
 
@@ -36,28 +35,15 @@ public static UserService getInstance(final Context context) {
     return INSTANCE;
   }
 
-  // the client using Retrofit 1.9
   private final UserClient userRetrofitClient;
-  // the client using Retrofit 2.X
-  private final UserClient2 userRetrofit2Client;
 
   private UserService(final Context context) {
     userRetrofitClient = SecureResourceClient.prepareSecuredUserRetrofitClient(UserClient.class, context);
-    userRetrofit2Client = SecureResourceClient.prepareSecuredUserRetrofit2Client(UserClient2.class, context);
   }
 
-  public Observable<DevicesResponse> getDevices(final boolean useRetrofit2) {
-    return getObservable(useRetrofit2)
+  public Single<DevicesResponse> getDevices() {
+    return userRetrofitClient.getDevices()
         .subscribeOn(Schedulers.io())
-        .observeOn(AndroidSchedulers.mainThread())
-        .unsubscribeOn(Schedulers.io());
-  }
-
-  private Observable<DevicesResponse> getObservable(final boolean useRetrofit2) {
-    if (useRetrofit2) {
-      return userRetrofit2Client.getDevices();
-    } else {
-      return userRetrofitClient.getDevices();
-    }
+        .observeOn(AndroidSchedulers.mainThread());
   }
 }

app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient.java

@@ -17,11 +17,11 @@
 package com.onegini.mobile.exampleapp.network.client;
 
 import com.onegini.mobile.exampleapp.model.ApplicationDetails;
-import retrofit.http.GET;
-import rx.Observable;
+import io.reactivex.Single;
+import retrofit2.http.GET;
 
 public interface AnonymousClient {
 
-  @GET("/application-details")
-  Observable<ApplicationDetails> getApplicationDetails();
+  @GET("application-details")
+  Single<ApplicationDetails> getApplicationDetails();
 }

app/src/main/java/com/onegini/mobile/exampleapp/network/client/AnonymousClient2.java

@@ -17,11 +17,11 @@
 package com.onegini.mobile.exampleapp.network.client;
 
 import com.onegini.mobile.exampleapp.model.ImplicitUserDetails;
-import retrofit.http.GET;
-import rx.Observable;
+import io.reactivex.Single;
+import retrofit2.http.GET;
 
 public interface ImplicitUserClient {
 
-  @GET("/user-id-decorated")
-  Observable<ImplicitUserDetails> getImplicitUserDetails();
+  @GET("user-id-decorated")
+  Single<ImplicitUserDetails> getImplicitUserDetails();
 }