DEP-86: update classes to use androidx

Author: cquemin

sample-app-2/src/main/java/com/yoti/mobile/android/sampleapp2/MainActivity.java

@@ -1,7 +1,7 @@
 package com.yoti.mobile.android.sampleapp2;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ProgressBar;

sample-app-2/src/main/java/com/yoti/mobile/android/sampleapp2/ProfileActivity.java

@@ -2,7 +2,7 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Base64;
 import android.widget.ImageView;

sample-app/src/main/java/com/yoti/mobile/android/sdk/sampleapp/MainActivity.java

@@ -1,7 +1,7 @@
 package com.yoti.mobile.android.sdk.sampleapp;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ProgressBar;
@@ -25,9 +25,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_main);
 
-        mYotiSDKButton = (YotiSDKButton) findViewById(R.id.button);
-        mProgress = (ProgressBar) findViewById(R.id.progress);
-        mMessage = (TextView)findViewById(R.id.text);
+        mYotiSDKButton = findViewById(R.id.button);
+        mProgress = findViewById(R.id.progress);
+        mMessage = findViewById(R.id.text);
 
         mYotiSDKButton.setOnYotiButtonClickListener(new YotiSDKButton.OnYotiButtonClickListener() {
             @Override

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/ReceiverActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class ReceiverActivity extends AppCompatActivity {
 

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/ShareAttributeManager.java

@@ -1,7 +1,7 @@
 package com.yoti.mobile.android.sdk;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.yoti.mobile.android.sdk.model.Scenario;

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/ShareAttributesContract.java

@@ -1,7 +1,7 @@
 package com.yoti.mobile.android.sdk;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public interface ShareAttributesContract {
 

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/YotiSDK.java

@@ -4,7 +4,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.ResultReceiver;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.yoti.mobile.android.sdk.exceptions.YotiSDKException;
 import com.yoti.mobile.android.sdk.exceptions.YotiSDKMinVersionException;

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/YotiSDKButton.java

@@ -5,18 +5,19 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatButton;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatButton;
+
 import com.yoti.mobile.android.commons.ui.widget.YotiButton;
 import com.yoti.mobile.android.sdk.exceptions.YotiSDKException;
 import com.yoti.mobile.android.sdk.exceptions.YotiSDKNoYotiAppException;
 
 /**
- * Custom {@link AppCompatButton} which will start its associated {@link com.yoti.mobile.android.sdk.model.Scenario} when clicked.
+ * Custom {@link AppCompatButton} which will start its associated {@link
+ * com.yoti.mobile.android.sdk.model.Scenario} when clicked.
  */
 public class YotiSDKButton extends YotiButton implements View.OnClickListener {
 
@@ -69,7 +70,7 @@ public void init(AttributeSet attrs) {
     }
 
     @Override
-    public void setOnClickListener(@Nullable OnClickListener l) {
+    public void setOnClickListener(@Nullable View.OnClickListener l) {
         super.setOnClickListener(this);
     }
 

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/kernelSDK/CertificateManager.java

@@ -1,8 +1,9 @@
 package com.yoti.mobile.android.sdk.kernelSDK;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.RawRes;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RawRes;
 
 import com.yoti.mobile.android.sdk.YotiSDKLogger;
 
@@ -30,10 +31,12 @@ public CertificateManager(Context context) {
     /**
      * Store a certificate in the private file of the application
      *
-     * @param certificateResourceId - the certificate resource identifier ot store in the key store
-     * @param storeName             - the key name used to identify this very store
-     * @param password              - the password to secure the keystore in which the certificate will be stored
-     * @param alias                 - the alias for this certificate in the in the keystore
+     * @param certificateResourceId - the certificate resource identifier ot store in the
+     *         key store
+     * @param storeName - the key name used to identify this very store
+     * @param password - the password to secure the keystore in which the certificate will
+     *         be stored
+     * @param alias - the alias for this certificate in the in the keystore
      * @return true if the certificate has been successfully stored
      */
     public boolean storeCrt(@RawRes int certificateResourceId,
@@ -57,11 +60,13 @@ public boolean storeCrt(@RawRes int certificateResourceId,
     /**
      * Force write the certificate in the designated key store
      *
-     * @param certificateResourceId - the certificate resource identifier ot store in the key store
-     * @param storeName             - the key name used to identify this very store
-     * @param password              - the password to secure the keystore in which the certificate will be stored
-     * @param alias                 - the alias for this certificate in the in the keystore
-     * @param keyStore              - the key store instance
+     * @param certificateResourceId - the certificate resource identifier ot store in the
+     *         key store
+     * @param storeName - the key name used to identify this very store
+     * @param password - the password to secure the keystore in which the certificate will
+     *         be stored
+     * @param alias - the alias for this certificate in the in the keystore
+     * @param keyStore - the key store instance
      */
     private void storeCertificateInKeyStore(@RawRes int certificateResourceId, @NonNull String storeName,
                                             @NonNull String password, @NonNull String alias,
@@ -91,10 +96,11 @@ private void storeCertificateInKeyStore(@RawRes int certificateResourceId, @NonN
      * Save the certificate in the key store and persist this key store on the file system
      *
      * @param storeName - the key name used to identify this very store
-     * @param password  - the password to secure the keystore in which the certificate will be stored
-     * @param alias     - the alias for this certificate in the in the keystore
-     * @param keyStore  - the key store instance
-     * @param ca        - the certificate to save
+     * @param password - the password to secure the keystore in which the certificate will
+     *         be stored
+     * @param alias - the alias for this certificate in the in the keystore
+     * @param keyStore - the key store instance
+     * @param ca - the certificate to save
      */
     private void writeCertificateInKeyStore(@NonNull String storeName,
                                             @NonNull String password, @NonNull String alias,
@@ -124,8 +130,8 @@ private void writeCertificateInKeyStore(@NonNull String storeName,
      * Attempt to load the keystore from the file system if present or create new one if needed
      *
      * @param storeName the store name
-     * @param password  the password to load the existing store
-     * @param store     the store instance to load
+     * @param password the password to load the existing store
+     * @param store the store instance to load
      */
     private void loadKeyStore(@NonNull String storeName, @NonNull String password, KeyStore store) throws CertificateException, NoSuchAlgorithmException, IOException {
         try {

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/kernelSDK/KernelSDK.java

@@ -1,6 +1,6 @@
 package com.yoti.mobile.android.sdk.kernelSDK;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.yoti.mobile.android.sdk.YotiSDKLogger;
 import com.yoti.mobile.android.sdk.model.Scenario;