diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..7b46144 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..55129f3
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Android/Sdk/extras/m2repository" />
+      <option name="name" value="$USER_HOME$/Android/Sdk/extras/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Android/Sdk/extras/android/m2repository" />
+      <option name="name" value="$USER_HOME$/Android/Sdk/extras/android/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/android/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="$USER_HOME$/Android/Sdk/extras/google/m2repository" />
+      <option name="name" value="$USER_HOME$/Android/Sdk/extras/google/m2repository" />
+      <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/google/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8774759..4bb3034 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,43 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="9" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="5" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6bc6026..b41abda 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/MFVA.iml" filepath="$PROJECT_DIR$/MFVA.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/mfva.iml" filepath="$PROJECT_DIR$/.idea/modules/mfva.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/mfva.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/mfva.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/mfva.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/mfva.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/mfva.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/mfva.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/mfva.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/mfva.app.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 18b8a62..64dcec0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.appknox.mfva"
-        minSdkVersion 19
-        targetSdkVersion 25
+        minSdkVersion 25
+        targetSdkVersion 30
         versionCode 6
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -20,14 +19,14 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:design:25.2.0'
-    compile 'com.squareup.okhttp3:okhttp:3.8.0'
-    compile 'redis.clients:jedis:2.9.0'
-    testCompile 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.8.0'
+    implementation 'redis.clients:jedis:2.9.0'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7ef2072..277f1a7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.appknox.mfva">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -71,10 +72,7 @@
             </intent-filter>
         </receiver>
 
-        <permission
-            android:description="@string/permission_custom"
-            android:label="@string/permission_custom"
-            android:name="com.appknox.mfva.CustomPermission" />
+
 
         <provider
             android:name="com.appknox.mfva.StubProvider"
diff --git a/app/src/main/java/com/appknox/mfva/ApiRequestsActivity.java b/app/src/main/java/com/appknox/mfva/ApiRequestsActivity.java
index 671f777..3c18b54 100644
--- a/app/src/main/java/com/appknox/mfva/ApiRequestsActivity.java
+++ b/app/src/main/java/com/appknox/mfva/ApiRequestsActivity.java
@@ -1,19 +1,20 @@
 package com.appknox.mfva;
 
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.util.UUID;
-import java.util.Random;
 
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -27,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_api_requests);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_api_requests);
+        androidx.appcompat.widget.Toolbar toolbar = (androidx.appcompat.widget.Toolbar) findViewById(R.id.toolbar_api_requests);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -88,11 +89,11 @@ public void run() {
                                     textViewLogs.append("  expiry:" + expiry0 + "\n");
                                 }
                             });
-                        } catch (IOException|JSONException e) {
+                        } catch (IOException | JSONException e) {
                             Snackbar.make(v, e.toString(), Snackbar.LENGTH_SHORT).show();
                         }
 
-                        if(token == null) {
+                        if (token == null) {
                             textViewLogs.post(new Runnable() {
                                 @Override
                                 public void run() {
@@ -122,7 +123,7 @@ public void run() {
                                     textViewLogs.append("  userid:" + id2 + "\n");
                                 }
                             });
-                        } catch (IOException|JSONException e) {
+                        } catch (IOException | JSONException e) {
                             Snackbar.make(v, e.toString(), Snackbar.LENGTH_SHORT).show();
                         }
 
@@ -130,7 +131,7 @@ public void run() {
                         final String user5 = UUID.randomUUID().toString().substring(24, 32),
                                 password5 = "pass0";
                         RequestBody body5 = RequestBody.create(JSON, "{\"user\":{\"username\":\"" +
-                                 user5 + "\",\"password\":\"" + password5 + "\"}}\n");
+                                user5 + "\",\"password\":\"" + password5 + "\"}}\n");
                         Request request5 = new Request.Builder()
                                 .url("http://vapi.appknox.io/user")
                                 .post(body5)
@@ -180,7 +181,7 @@ public void run() {
                                     textViewLogs.append("  system up since:" + uptime.trim() + "\n");
                                 }
                             });
-                        } catch (IOException|JSONException e) {
+                        } catch (IOException | JSONException e) {
                             Snackbar.make(v, e.toString(), Snackbar.LENGTH_SHORT).show();
                         }
 
diff --git a/app/src/main/java/com/appknox/mfva/ExportedActivity.java b/app/src/main/java/com/appknox/mfva/ExportedActivity.java
index d344a0e..56df8b5 100644
--- a/app/src/main/java/com/appknox/mfva/ExportedActivity.java
+++ b/app/src/main/java/com/appknox/mfva/ExportedActivity.java
@@ -1,9 +1,10 @@
 package com.appknox.mfva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
@@ -24,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         try {
             Cipher.getInstance("DES/ECB/ZeroBytePadding", "BC");
-        } catch (NoSuchAlgorithmException|NoSuchProviderException|NoSuchPaddingException e) {
+        } catch (NoSuchAlgorithmException | NoSuchProviderException | NoSuchPaddingException e) {
             // pass
         }
     }
diff --git a/app/src/main/java/com/appknox/mfva/ExportedReceiver.java b/app/src/main/java/com/appknox/mfva/ExportedReceiver.java
index 0bfc4f2..b454410 100644
--- a/app/src/main/java/com/appknox/mfva/ExportedReceiver.java
+++ b/app/src/main/java/com/appknox/mfva/ExportedReceiver.java
@@ -12,6 +12,7 @@
 
 public class ExportedReceiver extends BroadcastReceiver {
     private static final String TAG = "ExportedReceiver";
+
     @Override
     public void onReceive(Context context, Intent intent) {
         StringBuilder sb = new StringBuilder();
diff --git a/app/src/main/java/com/appknox/mfva/MainActivity.java b/app/src/main/java/com/appknox/mfva/MainActivity.java
index 472084d..d9d1376 100644
--- a/app/src/main/java/com/appknox/mfva/MainActivity.java
+++ b/app/src/main/java/com/appknox/mfva/MainActivity.java
@@ -3,18 +3,19 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 
-import java.security.InvalidAlgorithmParameterException;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.snackbar.Snackbar;
+
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -25,7 +26,6 @@
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 
@@ -54,7 +54,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(context, WebViewActivity.class);
-		        startActivity(intent);
+                startActivity(intent);
             }
         });
 
@@ -65,21 +65,7 @@ public void onClick(View v) {
                 SharedPreferences pref = getApplicationContext().getSharedPreferences("pref", 0);
                 SharedPreferences.Editor editor = pref.edit();
 
-                String[] keys = new String[] {
-                        "java.class.version",
-                        "java.home",
-                        "java.library.path",
-                        "java.vendor",
-                        "java.vendor.url",
-                        "java.specification.name",
-                        "java.vm.name",
-                        "java.vm.version",
-                        "java.vm.specification.name",
-                        "java.vm.specification.version",
-                        "os.arch",
-                        "os.name",
-                        "os.version",
-                };
+                String[] keys = new String[]{"java.class.version", "java.home", "java.library.path", "java.vendor", "java.vendor.url", "java.specification.name", "java.vm.name", "java.vm.version", "java.vm.specification.name", "java.vm.specification.version", "os.arch", "os.name", "os.version",};
                 String key = keys[(int) (Math.random() * keys.length)];
                 editor.putString(key, System.getProperty(key));
                 editor.commit();
@@ -92,23 +78,7 @@ public void onClick(View v) {
         buttonDebugLog.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String[] quotes = new String[] {
-                        "Any given program, when running correctly, is obsolete.",
-                        "Disco is to music what Etch-A-Sketch is to art.",
-                        "Computer Science is merely the post-Turing decline in formal systems theory.",
-                        "Sometimes the only solution is to find a new problem.",
-                        "There are 10 kinds of people. Those who know binary and those who don't.",
-                        "Whom computers would destroy, they must first drive mad.",
-                        "I program, therefore I am.",
-                        "If Java had true garbage collection, most programs would delete themselves upon execution.",
-                        "Hardware, n.: The parts of a computer system that can be kicked.",
-                        "There are two ways to write error-free programs. Only the third one works.",
-                        "Why isn't \"palindrome\" spelled the same way backwards?",
-                        "A language that doesn't affect the way you think about programming is not worth knowing.",
-                        "All programmers are playwrights and all computers are lousy actors.",
-                        "Every program has two purposes ― one for which it was written and another for which it wasn't.",
-                        "Every program is a part of some other program, and rarely fits.",
-                };
+                String[] quotes = new String[]{"Any given program, when running correctly, is obsolete.", "Disco is to music what Etch-A-Sketch is to art.", "Computer Science is merely the post-Turing decline in formal systems theory.", "Sometimes the only solution is to find a new problem.", "There are 10 kinds of people. Those who know binary and those who don't.", "Whom computers would destroy, they must first drive mad.", "I program, therefore I am.", "If Java had true garbage collection, most programs would delete themselves upon execution.", "Hardware, n.: The parts of a computer system that can be kicked.", "There are two ways to write error-free programs. Only the third one works.", "Why isn't \"palindrome\" spelled the same way backwards?", "A language that doesn't affect the way you think about programming is not worth knowing.", "All programmers are playwrights and all computers are lousy actors.", "Every program has two purposes ― one for which it was written and another for which it wasn't.", "Every program is a part of some other program, and rarely fits.",};
                 String quote = quotes[(int) (Math.random() * quotes.length)];
                 Log.d("YOLO", quote);
                 Snackbar.make(v, quote, Snackbar.LENGTH_SHORT).show();
@@ -143,8 +113,7 @@ public void onClick(View v) {
                     c.doFinal(quote.getBytes());
 
                     Snackbar.make(v, quote, Snackbar.LENGTH_SHORT).show();
-                } catch (NoSuchAlgorithmException | NoSuchProviderException | NoSuchPaddingException | BadPaddingException |
-                        IllegalBlockSizeException | InvalidKeyException e) {
+                } catch (NoSuchAlgorithmException | NoSuchProviderException | NoSuchPaddingException | BadPaddingException | IllegalBlockSizeException | InvalidKeyException e) {
                     Snackbar.make(v, e.toString(), Snackbar.LENGTH_SHORT).show();
                 }
             }
diff --git a/app/src/main/java/com/appknox/mfva/StubProvider.java b/app/src/main/java/com/appknox/mfva/StubProvider.java
index d5ef28f..cdeaf37 100644
--- a/app/src/main/java/com/appknox/mfva/StubProvider.java
+++ b/app/src/main/java/com/appknox/mfva/StubProvider.java
@@ -18,6 +18,7 @@ public class StubProvider extends ContentProvider {
     public boolean onCreate() {
         return true;
     }
+
     /*
      * Return no type for MIME type
      */
@@ -25,6 +26,7 @@ public boolean onCreate() {
     public String getType(Uri uri) {
         return null;
     }
+
     /*
      * query() always returns no results
      *
@@ -38,6 +40,7 @@ public Cursor query(
             String sortOrder) {
         return null;
     }
+
     /*
      * insert() always returns null (no URI)
      */
@@ -45,6 +48,7 @@ public Cursor query(
     public Uri insert(Uri uri, ContentValues values) {
         return null;
     }
+
     /*
      * delete() always returns "no rows affected" (0)
      */
@@ -52,6 +56,7 @@ public Uri insert(Uri uri, ContentValues values) {
     public int delete(Uri uri, String selection, String[] selectionArgs) {
         return 0;
     }
+
     /*
      * update() always returns "no rows affected" (0)
      */
diff --git a/app/src/main/java/com/appknox/mfva/UnprotectedReceiver.java b/app/src/main/java/com/appknox/mfva/UnprotectedReceiver.java
index 9167179..84e986c 100644
--- a/app/src/main/java/com/appknox/mfva/UnprotectedReceiver.java
+++ b/app/src/main/java/com/appknox/mfva/UnprotectedReceiver.java
@@ -12,6 +12,7 @@
 
 public class UnprotectedReceiver extends BroadcastReceiver {
     private static final String TAG = "UnprotectedReceiver";
+
     @Override
     public void onReceive(Context context, Intent intent) {
         StringBuilder sb = new StringBuilder();
diff --git a/app/src/main/java/com/appknox/mfva/WebViewActivity.java b/app/src/main/java/com/appknox/mfva/WebViewActivity.java
index 3756a9f..f5f6e06 100644
--- a/app/src/main/java/com/appknox/mfva/WebViewActivity.java
+++ b/app/src/main/java/com/appknox/mfva/WebViewActivity.java
@@ -1,11 +1,11 @@
 package com.appknox.mfva;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.webkit.WebView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * Created by viren on 23/5/17.
  */
diff --git a/app/src/main/res/layout/activity_api_requests.xml b/app/src/main/res/layout/activity_api_requests.xml
index ca54325..0ee597b 100644
--- a/app/src/main/res/layout/activity_api_requests.xml
+++ b/app/src/main/res/layout/activity_api_requests.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context="com.appknox.mfva.ApiRequestsActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar_api_requests"
         android:background="@color/colorPrimary"
         android:layout_width="match_parent"
@@ -34,7 +34,8 @@
             android:background="@android:color/black" />
     </ScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/button_start_api_requests"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_exported.xml b/app/src/main/res/layout/activity_exported.xml
index fce4da1..de81004 100644
--- a/app/src/main/res/layout/activity_exported.xml
+++ b/app/src/main/res/layout/activity_exported.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.appknox.mfva.ExportedActivity">
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb5cb83..9af23af 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context="com.appknox.mfva.MainActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar_main"
         android:background="@color/colorPrimary"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 44a289e..1e2946b 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context="com.appknox.mfva.WebViewActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar_api_requests"
         android:background="@color/colorPrimary"
         android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index d0aa704..04f624a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:7.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1629b78..3360907 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 23 12:45:03 IST 2017
+#Tue Feb 14 12:04:42 IST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+zipStoreBase=GRADLE_USER_HOME