fix android lint issues

Author: FeiChen-okta

library/src/main/java/com/okta/oidc/storage/security/EncryptionManagerAPI18.java

@@ -15,9 +15,7 @@
 
 package com.okta.oidc.storage.security;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.security.KeyPairGeneratorSpec;
 import android.util.Log;
 
@@ -33,7 +31,6 @@
 
 import javax.security.auth.x500.X500Principal;
 
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 class EncryptionManagerAPI18 extends BaseEncryptionManager {
     private static final String TAG = EncryptionManagerAPI18.class.getSimpleName();
     private static final int RSA_CALENDAR_MAX_YEARS = 100;

library/src/main/java/com/okta/oidc/storage/security/EncryptionManagerAPI23.java

@@ -15,7 +15,6 @@
 
 package com.okta.oidc.storage.security;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.os.Build.VERSION;
@@ -43,7 +42,7 @@
 
 import static android.security.keystore.KeyProperties.BLOCK_MODE_ECB;
 
-@TargetApi(Build.VERSION_CODES.M)
+@androidx.annotation.RequiresApi(Build.VERSION_CODES.M)
 class EncryptionManagerAPI23 extends BaseEncryptionManager {
     private static final String TAG = EncryptionManagerAPI23.class.getSimpleName();
 

library/src/main/java/com/okta/oidc/storage/security/GuardedEncryptionManager.java

@@ -15,7 +15,6 @@
 
 package com.okta.oidc.storage.security;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 
@@ -29,7 +28,7 @@
  * A implementation of {@link EncryptionManager} which requires user authentication when
  * using keys by OS. The private keys are locked in the key store.
  */
-@TargetApi(Build.VERSION_CODES.M)
+@androidx.annotation.RequiresApi(Build.VERSION_CODES.M)
 public class GuardedEncryptionManager implements EncryptionManager {
     private static final String KEY_STORE = "AndroidKeyStore";
     private static final String KEY_AUTHORIZE_ALIAS = "smart_authorize_key_for_pin";
@@ -58,19 +57,13 @@ public GuardedEncryptionManager(Context context) {
      */
     public GuardedEncryptionManager(Context context,
                                     int userAuthenticationValidityDurationSeconds) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            mEncryptionManager = EncryptionManagerFactory
-                    .createEncryptionManager(context,
-                            KEY_STORE,
-                            KEY_AUTHORIZE_ALIAS,
-                            true,
-                            (userAuthenticationValidityDurationSeconds > MIN_VALIDITY_DURATION)
-                                    ? userAuthenticationValidityDurationSeconds
-                                    : MIN_VALIDITY_DURATION,
-                            false);
-        } else {
-            throw new IllegalStateException("This class supports API23+");
-        }
+        mEncryptionManager = EncryptionManagerFactory
+                .createEncryptionManager(context,
+                        KEY_STORE,
+                        KEY_AUTHORIZE_ALIAS,
+                        true,
+                        Math.max(userAuthenticationValidityDurationSeconds, MIN_VALIDITY_DURATION),
+                        false);
     }
 
     @Override

library/src/test/java/com/okta/oidc/util/UriUtilTest.java

@@ -65,7 +65,6 @@ public void testFormUrlEncode_withSpaceSeparatedValueForParameter() {
         parameters.put("test2", "value2 value3");
         String query = UriUtil.formUrlEncode(parameters);
 
-        assertThat(query.contains("value2+value3"));
         mSanitizer.parseQuery(query);
         for (Map.Entry<String, String> param : parameters.entrySet()) {
             assertThat(mSanitizer.getValue(param.getKey())).isEqualTo(param.getValue());