From 5acc02e2aad23c93109a9e6b5a096a581519aedf Mon Sep 17 00:00:00 2001 From: Wassim Salib Date: Mon, 21 Sep 2020 19:35:15 -0600 Subject: [PATCH] Migrate to AndroidX --- .../openid/appauth/AuthorizationManagementResponse.java | 2 +- .../net/openid/appauth/AuthorizationManagementUtil.java | 7 ++++--- library/java/net/openid/appauth/EndSessionRequest.java | 6 +++--- library/java/net/openid/appauth/EndSessionResponse.java | 8 +++++--- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/library/java/net/openid/appauth/AuthorizationManagementResponse.java b/library/java/net/openid/appauth/AuthorizationManagementResponse.java index 750a7d88..428bff92 100644 --- a/library/java/net/openid/appauth/AuthorizationManagementResponse.java +++ b/library/java/net/openid/appauth/AuthorizationManagementResponse.java @@ -15,7 +15,7 @@ package net.openid.appauth; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.json.JSONObject; diff --git a/library/java/net/openid/appauth/AuthorizationManagementUtil.java b/library/java/net/openid/appauth/AuthorizationManagementUtil.java index bf7c78ad..f830360c 100644 --- a/library/java/net/openid/appauth/AuthorizationManagementUtil.java +++ b/library/java/net/openid/appauth/AuthorizationManagementUtil.java @@ -18,8 +18,9 @@ import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.json.JSONException; import org.json.JSONObject; @@ -67,7 +68,7 @@ static AuthorizationManagementResponse responseWith( } /** - * Extracts response from an intent produced by {@link #toIntent()}. This is + * Extracts response from an intent produced by . This is * used to extract the response from the intent data passed to an activity registered as the * handler for {@link AuthorizationService#performEndSessionRequest} * or {@link AuthorizationService#performAuthorizationRequest}. diff --git a/library/java/net/openid/appauth/EndSessionRequest.java b/library/java/net/openid/appauth/EndSessionRequest.java index 69d73f15..f84d8348 100644 --- a/library/java/net/openid/appauth/EndSessionRequest.java +++ b/library/java/net/openid/appauth/EndSessionRequest.java @@ -18,9 +18,9 @@ import static net.openid.appauth.Preconditions.checkNotNull; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import org.json.JSONException; import org.json.JSONObject; diff --git a/library/java/net/openid/appauth/EndSessionResponse.java b/library/java/net/openid/appauth/EndSessionResponse.java index 7aff586f..b329506b 100644 --- a/library/java/net/openid/appauth/EndSessionResponse.java +++ b/library/java/net/openid/appauth/EndSessionResponse.java @@ -19,9 +19,11 @@ import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; + +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + +import androidx.annotation.NonNull; import org.json.JSONException; import org.json.JSONObject;