Merge pull request #179 from Onegini/EXAMPLEAND-72

Exampleand 72

Author: marcin-onegini

app/build.gradle

@@ -84,7 +84,7 @@ dependencies {
   }
 
   // Rest Client
-  implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0'
+  implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
 
   // Google Support
   implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -107,8 +107,8 @@ dependencies {
   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'
+  implementation 'io.reactivex.rxjava3:rxjava:3.0.4'
+  implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
 }
 
 configurations.all {

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());
   }
-}
+}

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 {
 

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 {
 

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 {

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 {

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);
   }
-}
+}

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 {

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 {
 

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 {