Skip to content

EXAMPLEAND-76 update dependencies #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2021
Merged

EXAMPLEAND-76 update dependencies #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,19 @@ dependencies {
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
Expand All @@ -111,14 +110,5 @@ dependencies {
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
}

configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
def requested = details.requested
if (requested.group == "com.android.support" && !requested.name.startsWith("multidex")) {
details.useVersion "27.+"
}
}
}

//according to google documentation, this plugin has to be applied at the end of the file
apply plugin: 'com.google.gms.google-services'
5 changes: 3 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -166,4 +167,4 @@

</application>

</manifest>
</manifest>
14 changes: 4 additions & 10 deletions app/src/main/java/com/onegini/mobile/exampleapp/network/fcm/FCMRegistrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down