From c5e7bfc355da35290ea2e5086cc2007bc5d05802 Mon Sep 17 00:00:00 2001
From: timurxyz <x@secdev.eu>
Date: Fri, 19 Feb 2021 02:20:53 +0100
Subject: [PATCH 1/6] -- .gitignore reverted to a standard one -- ignored but
 present in original files deleted

---
 .gitignore                            |  11 +++++++++--
 .idea/caches/build_file_checksums.ser | Bin 537 -> 0 bytes
 .idea/gradle.xml                      |   1 +
 .idea/modules.xml                     |   3 +--
 4 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 .idea/caches/build_file_checksums.ser

diff --git a/.gitignore b/.gitignore
index 22a4ae4..aa724b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,15 @@
+*.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
+/.idea/caches
 /.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
-/app/build
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index a4e102e4a09f03406af90b8f5037e4f81e6d7908..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 537
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsOrRIqN=dZ4=mL2`N^IX#cW;tZfX
zEBmd3hs6>uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7<qXXNLkR20}dFn|D0IR}sw0Ae<v
zMa8KlC7F5Y#ZX_B7BMhIJFWRF{)3Gp<N*@{1IT6uf#v_C4o}S7`cxw-E;vnJRl0;h
zLqD`QwWwG>syIJ4DZfY`s$U-wI0dOiC7G$krG*T23~V4nuE_S>>}S}-^0I+*#+x5b
zbtMcuNuWT3Sq)eCqSyJJQt0+*R^{*u!F4q)B@6;N`N@enpdiOE)y#d>`va<1j-1MP
z6QUViWe!xFSWuvk-Q+*TS06o;-`6eS(Xwk#`{&~&41#zZ{By=lACC*mDg?i{F}yjK
H_pky0c@n<I

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 089a5ff..362ca0c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,6 +16,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ffa05be..41fab34 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="diva-android/app" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/diva-android.iml" filepath="$PROJECT_DIR$/.idea/modules/diva-android.iml" group="diva-android" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/_stash_diva-android.iml" filepath="$PROJECT_DIR$/.idea/_stash_diva-android.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

From 27860afede57e3d9fa167fc74c9a2d23c82acd32 Mon Sep 17 00:00:00 2001
From: timurxyz <x@secdev.eu>
Date: Fri, 19 Feb 2021 05:57:10 +0100
Subject: [PATCH 2/6] -- updated gradle config

---
 .idea/compiler.xml                            | 18 +----------------
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                | 12 ++++++++---
 .idea/modules.xml                             |  1 +
 app/build.gradle                              | 20 +++++++++----------
 .../debug/jakhar/aseem/diva/BuildConfig.java  | 12 +++++++++++
 build.gradle                                  |  2 +-
 gradle.properties                             |  1 -
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 9 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..61a9130 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="1.8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 362ca0c..c5e6d9d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,6 @@
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index be1ee49..ef3bc0c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="12">
+        <list size="15">
           <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" />
@@ -21,12 +21,15 @@
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
           <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="11">
+        <list size="14">
           <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" />
@@ -38,11 +41,14 @@
           <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
           <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" 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 41fab34..bed3924 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/_stash_diva-android.iml" filepath="$PROJECT_DIR$/.idea/_stash_diva-android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/_stash_diva-android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/_stash_diva-android.app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0a95252..fba5e88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion 29
+        targetSdkVersion 29
         versionCode 1
-        versionName "1.0"
+        versionName "1.029"
     }
     buildTypes {
         release {
@@ -25,8 +25,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.0'
-    compile 'com.android.support:design:23.1.0'
-}
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
+    testImplementation 'junit:junit:4.12'
+}
\ No newline at end of file
diff --git a/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java b/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java
new file mode 100644
index 0000000..3446aad
--- /dev/null
+++ b/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java
@@ -0,0 +1,12 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package jakhar.aseem.diva;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "jakhar.aseem.diva";
+  public static final String BUILD_TYPE = "debug";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.029";
+}
diff --git a/build.gradle b/build.gradle
index a6ad490..84f8259 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index 220fd31..7e01bd6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,3 @@
 # org.gradle.parallel=true
 
 # Aseem - Added on 13 Jan 2016 for compiling divajni
-android.useDeprecatedNdk=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 465614b..8ef540a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 08 15:55:24 CEST 2020
+#Fri Feb 19 04:27:47 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

From 4ffe44f1dc0ab4b22f76a3cda19b87a2c070c655 Mon Sep 17 00:00:00 2001
From: timurxyz <x@secdev.eu>
Date: Sat, 20 Feb 2021 03:46:51 +0100
Subject: [PATCH 3/6] -- build.gradle fixes, 30

---
 app/build.gradle                                | 17 +++++++++--------
 .../debug/jakhar/aseem/diva/BuildConfig.java    |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fba5e88..d183a67 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
-
+    compileSdkVersion 30
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdkVersion 29
-        targetSdkVersion 29
+        minSdkVersion 27
+        targetSdkVersion 30
         versionCode 1
-        versionName "1.029"
+        versionName "1.030"
     }
     buildTypes {
         release {
@@ -26,7 +24,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
     testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support:support-annotations:24.0.0'
+    androidTestImplementation 'com.android.support.test:runner:0.5'
 }
\ No newline at end of file
diff --git a/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java b/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java
index 3446aad..e388ac0 100644
--- a/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java
+++ b/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java
@@ -8,5 +8,5 @@ public final class BuildConfig {
   public static final String APPLICATION_ID = "jakhar.aseem.diva";
   public static final String BUILD_TYPE = "debug";
   public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.029";
+  public static final String VERSION_NAME = "1.030";
 }

From 55d9e80cbcf193145e0dbfd21131df1df8b43895 Mon Sep 17 00:00:00 2001
From: timurxyz <x@secdev.eu>
Date: Sat, 20 Feb 2021 03:48:39 +0100
Subject: [PATCH 4/6] -- build.gradle fixes, 30, min 28

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d183a67..469a5bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 30
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdkVersion 27
+        minSdkVersion 28
         targetSdkVersion 30
         versionCode 1
         versionName "1.030"

From c439d4068f7ae213d204a7733c3643b9757f9fb8 Mon Sep 17 00:00:00 2001
From: timurxyz <x@secdev.eu>
Date: Sun, 21 Feb 2021 04:10:49 +0100
Subject: [PATCH 5/6] -- build.gradle version fixes

---
 .idea/modules.xml                        | 4 ++--
 build.gradle                             | 3 ---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index bed3924..c99d852 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/_stash_diva-android.iml" filepath="$PROJECT_DIR$/.idea/_stash_diva-android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/_stash_diva-android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/_stash_diva-android.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/__PR-huobb0-diva-android.iml" filepath="$PROJECT_DIR$/.idea/modules/__PR-huobb0-diva-android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/__PR-huobb0-diva-android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/__PR-huobb0-diva-android.app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 84f8259..8bdb7c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8ef540a..abec834 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

From 6bcf561a8df615a29bef711ce7f5e2d0366561fc Mon Sep 17 00:00:00 2001
From: timurxyz <x@secdev.eu>
Date: Sun, 21 Feb 2021 04:16:20 +0100
Subject: [PATCH 6/6] -- JB auto-refactored to AndroidX

---
 app/build.gradle                                     | 12 ++++++------
 .../java/jakhar/aseem/diva/APICreds2Activity.java    |  4 ++--
 .../java/jakhar/aseem/diva/APICredsActivity.java     |  2 +-
 .../jakhar/aseem/diva/AccessControl1Activity.java    |  2 +-
 .../jakhar/aseem/diva/AccessControl2Activity.java    |  2 +-
 .../jakhar/aseem/diva/AccessControl3Activity.java    |  2 +-
 .../aseem/diva/AccessControl3NotesActivity.java      |  4 +---
 .../java/jakhar/aseem/diva/Hardcode2Activity.java    |  2 +-
 .../java/jakhar/aseem/diva/HardcodeActivity.java     |  2 +-
 .../diva/InputValidation2URISchemeActivity.java      |  2 +-
 .../jakhar/aseem/diva/InputValidation3Activity.java  |  2 +-
 .../aseem/diva/InsecureDataStorage1Activity.java     |  2 +-
 .../aseem/diva/InsecureDataStorage2Activity.java     |  7 ++-----
 .../aseem/diva/InsecureDataStorage3Activity.java     |  4 +---
 .../aseem/diva/InsecureDataStorage4Activity.java     |  2 +-
 app/src/main/java/jakhar/aseem/diva/LogActivity.java |  2 +-
 .../main/java/jakhar/aseem/diva/MainActivity.java    |  7 +++----
 .../java/jakhar/aseem/diva/SQLInjectionActivity.java |  2 +-
 app/src/main/res/layout/activity_main.xml            | 10 +++++-----
 gradle.properties                                    |  2 ++
 20 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 469a5bb..3e89da2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,10 +24,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support:support-annotations:24.0.0'
-    androidTestImplementation 'com.android.support.test:runner:0.5'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 }
\ No newline at end of file
diff --git a/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java b/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java
index baaad21..994f956 100644
--- a/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java
@@ -32,8 +32,8 @@
 package jakhar.aseem.diva;
 
 import android.content.Intent;
-import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java b/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java
index e25cff2..e277958 100644
--- a/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java
@@ -31,7 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java
index d699b47..b0ee183 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java
@@ -32,7 +32,7 @@
 package jakhar.aseem.diva;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java
index 10cd6d5..10d6925 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java
@@ -32,7 +32,7 @@
 package jakhar.aseem.diva;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java
index 1dd179c..4584f3a 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java
@@ -34,7 +34,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java
index 9fc8002..5100f55 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java
@@ -31,18 +31,16 @@
  */
 package jakhar.aseem.diva;
 
-import android.content.ContentResolver;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
-import android.widget.TextView;
 import android.widget.Toast;
 
 public class AccessControl3NotesActivity extends AppCompatActivity {
diff --git a/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java b/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java
index 5a170a4..042ac9d 100644
--- a/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java
@@ -31,7 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java b/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java
index 3f9fc4b..da8b53a 100644
--- a/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java
@@ -31,7 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java b/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java
index a1db925..5867804 100644
--- a/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java
@@ -31,7 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.webkit.WebSettings;
diff --git a/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java b/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java
index f4e8421..244df78 100644
--- a/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java
@@ -31,7 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java
index c91e78e..a84c11a 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java
@@ -33,7 +33,7 @@
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java
index 4adf6d1..23558f5 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java
@@ -31,18 +31,15 @@
  */
 package jakhar.aseem.diva;
 
-import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import java.io.File;
-
 public class InsecureDataStorage2Activity extends AppCompatActivity {
 
     private SQLiteDatabase mDB;
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java
index 92f40a1..b0f9eda 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java
@@ -31,8 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -40,7 +39,6 @@
 import android.widget.Toast;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 
 public class InsecureDataStorage3Activity extends AppCompatActivity {
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java
index 31446da..f2b4026 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java
@@ -32,7 +32,7 @@
 package jakhar.aseem.diva;
 
 import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/java/jakhar/aseem/diva/LogActivity.java b/app/src/main/java/jakhar/aseem/diva/LogActivity.java
index 26e1173..3f54efc 100644
--- a/app/src/main/java/jakhar/aseem/diva/LogActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/LogActivity.java
@@ -31,7 +31,7 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/java/jakhar/aseem/diva/MainActivity.java b/app/src/main/java/jakhar/aseem/diva/MainActivity.java
index 4feea22..101a798 100644
--- a/app/src/main/java/jakhar/aseem/diva/MainActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/MainActivity.java
@@ -33,10 +33,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java b/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java
index b17132e..d797d9d 100644
--- a/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java
@@ -33,7 +33,7 @@
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 841af97..1366f72 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     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" android:fitsSystemWindows="true"
     tools:context=".MainActivity">
 
-    <android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
+    <com.google.android.material.appbar.AppBarLayout android:layout_height="wrap_content"
         android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar android:id="@+id/toolbar"
+        <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar"
             android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/gradle.properties b/gradle.properties
index 7e01bd6..36dfdfc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,3 +18,5 @@
 # org.gradle.parallel=true
 
 # Aseem - Added on 13 Jan 2016 for compiling divajni
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file