From 61e9b29585a5c2c3cfacc42ae46f8933dd167959 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Heydarchi <mhheidarchi2003@yahoo.com>
Date: Fri, 19 May 2023 20:17:01 +0200
Subject: [PATCH 01/10] Update .gitignore

---
 .gitignore                  | 41 +++++++++++++++++++++++++++++--------
 .idea/runConfigurations.xml | 12 -----------
 2 files changed, 33 insertions(+), 20 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.gitignore b/.gitignore
index 22a4ae4..16dcd12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,33 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-/app/build
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
\ 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

From d3d1145c9146ed359a2b34a211e578906c4a44f9 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Heydarchi <mhheidarchi2003@yahoo.com>
Date: Fri, 19 May 2023 21:21:39 +0200
Subject: [PATCH 02/10] Update resource files

---
 .../res/layout/activity_access_control1.xml   |  6 +++--
 .../res/layout/activity_access_control2.xml   |  6 +++--
 .../res/layout/activity_access_control3.xml   |  9 ++++---
 .../layout/activity_access_control3_notes.xml |  9 ++++---
 app/src/main/res/layout/activity_apicreds.xml |  6 +++--
 .../main/res/layout/activity_apicreds2.xml    |  6 +++--
 app/src/main/res/layout/activity_hardcode.xml |  9 ++++---
 .../main/res/layout/activity_hardcode2.xml    |  9 ++++---
 .../activity_input_validation2_urischeme.xml  |  9 ++++---
 .../res/layout/activity_input_validation3.xml |  9 ++++---
 .../activity_insecure_data_storage1.xml       | 12 ++++++---
 .../activity_insecure_data_storage2.xml       | 12 ++++++---
 .../activity_insecure_data_storage3.xml       | 12 ++++++---
 .../activity_insecure_data_storage4.xml       | 12 ++++++---
 app/src/main/res/layout/activity_log.xml      |  9 ++++---
 app/src/main/res/layout/activity_main.xml     | 27 ++++++++++++-------
 .../main/res/layout/activity_sqlinjection.xml |  9 ++++---
 app/src/main/res/layout/content_main.xml      | 15 +++++++----
 18 files changed, 123 insertions(+), 63 deletions(-)

diff --git a/app/src/main/res/layout/activity_access_control1.xml b/app/src/main/res/layout/activity_access_control1.xml
index 03ff9dd..d1fd0df 100644
--- a/app/src/main/res/layout/activity_access_control1.xml
+++ b/app/src/main/res/layout/activity_access_control1.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_access_control2.xml b/app/src/main/res/layout/activity_access_control2.xml
index a5bbfdb..370a12a 100644
--- a/app/src/main/res/layout/activity_access_control2.xml
+++ b/app/src/main/res/layout/activity_access_control2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_access_control3.xml b/app/src/main/res/layout/activity_access_control3.xml
index 9409f73..187b657 100644
--- a/app/src/main/res/layout/activity_access_control3.xml
+++ b/app/src/main/res/layout/activity_access_control3.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -30,7 +32,8 @@
         android:hint="@string/aci3_enterpin"
         android:textAlignment="center"
         android:inputType="numberPassword"
-        android:maxLength="4" />
+        android:maxLength="4"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_access_control3_notes.xml b/app/src/main/res/layout/activity_access_control3_notes.xml
index 8399676..ca86461 100644
--- a/app/src/main/res/layout/activity_access_control3_notes.xml
+++ b/app/src/main/res/layout/activity_access_control3_notes.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -18,7 +20,8 @@
         android:maxLength="4"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:layout_alignParentStart="true"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_apicreds.xml b/app/src/main/res/layout/activity_apicreds.xml
index 041cbcd..873b0d2 100644
--- a/app/src/main/res/layout/activity_apicreds.xml
+++ b/app/src/main/res/layout/activity_apicreds.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_apicreds2.xml b/app/src/main/res/layout/activity_apicreds2.xml
index eb6d99c..6acb0b9 100644
--- a/app/src/main/res/layout/activity_apicreds2.xml
+++ b/app/src/main/res/layout/activity_apicreds2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_hardcode.xml b/app/src/main/res/layout/activity_hardcode.xml
index 1af0337..37e9508 100644
--- a/app/src/main/res/layout/activity_hardcode.xml
+++ b/app/src/main/res/layout/activity_hardcode.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -26,7 +28,8 @@
         android:layout_alignParentStart="true"
         android:hint="@string/hardcode_enter"
         android:textAlignment="center"
-        android:inputType="text" />
+        android:inputType="text"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_hardcode2.xml b/app/src/main/res/layout/activity_hardcode2.xml
index bd1db0d..48e139d 100644
--- a/app/src/main/res/layout/activity_hardcode2.xml
+++ b/app/src/main/res/layout/activity_hardcode2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -26,7 +28,8 @@
         android:layout_alignParentStart="true"
         android:hint="@string/hardcode_enter"
         android:textAlignment="center"
-        android:inputType="text" />
+        android:inputType="text"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_input_validation2_urischeme.xml b/app/src/main/res/layout/activity_input_validation2_urischeme.xml
index 482a08b..aed9816 100644
--- a/app/src/main/res/layout/activity_input_validation2_urischeme.xml
+++ b/app/src/main/res/layout/activity_input_validation2_urischeme.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ivi2_enter"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_input_validation3.xml b/app/src/main/res/layout/activity_input_validation3.xml
index 3659acd..f4d4eae 100644
--- a/app/src/main/res/layout/activity_input_validation3.xml
+++ b/app/src/main/res/layout/activity_input_validation3.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ivi3_enter"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_insecure_data_storage1.xml b/app/src/main/res/layout/activity_insecure_data_storage1.xml
index b2df51c..776d09e 100644
--- a/app/src/main/res/layout/activity_insecure_data_storage1.xml
+++ b/app/src/main/res/layout/activity_insecure_data_storage1.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_user"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <EditText
         android:layout_width="match_parent"
@@ -42,7 +45,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_password"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_insecure_data_storage2.xml b/app/src/main/res/layout/activity_insecure_data_storage2.xml
index f4fe80f..4fa56c3 100644
--- a/app/src/main/res/layout/activity_insecure_data_storage2.xml
+++ b/app/src/main/res/layout/activity_insecure_data_storage2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_user"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <EditText
         android:layout_width="match_parent"
@@ -42,7 +45,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_password"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_insecure_data_storage3.xml b/app/src/main/res/layout/activity_insecure_data_storage3.xml
index f7fe10e..13c23ad 100644
--- a/app/src/main/res/layout/activity_insecure_data_storage3.xml
+++ b/app/src/main/res/layout/activity_insecure_data_storage3.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_user"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <EditText
         android:layout_width="match_parent"
@@ -42,7 +45,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_password"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_insecure_data_storage4.xml b/app/src/main/res/layout/activity_insecure_data_storage4.xml
index b98fd53..b13f372 100644
--- a/app/src/main/res/layout/activity_insecure_data_storage4.xml
+++ b/app/src/main/res/layout/activity_insecure_data_storage4.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_user"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <EditText
         android:layout_width="match_parent"
@@ -42,7 +45,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ids1_password"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
index 944da0f..3e3bd29 100644
--- a/app/src/main/res/layout/activity_log.xml
+++ b/app/src/main/res/layout/activity_log.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/log_enter"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 841af97..e663e26 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,20 +1,27 @@
 <?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"
+    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"
-        android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
+    <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"
-            android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" />
+        <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/app/src/main/res/layout/activity_sqlinjection.xml b/app/src/main/res/layout/activity_sqlinjection.xml
index 18aa50a..ffee68d 100644
--- a/app/src/main/res/layout/activity_sqlinjection.xml
+++ b/app/src/main/res/layout/activity_sqlinjection.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -29,7 +31,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:hint="@string/ivi1_enter"
-        android:textAlignment="center" />
+        android:textAlignment="center"
+        android:gravity="center_horizontal" />
 
     <Button
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 33b258b..a6c4964 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -3,13 +3,16 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_main" tools:context=".MainActivity">
+    tools:showIn="@layout/activity_main"
+    tools:context=".MainActivity">
 
     <ScrollView
         android:id="@+id/sc1"
@@ -21,13 +24,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <TextView android:text="@string/dwelcome" android:layout_width="wrap_content"
+    <TextView android:text="@string/dwelcome"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:id="@+id/textWelcome"
         android:textStyle="bold"
         android:textSize="30dp"
-        android:layout_alignParentEnd="false" />
+        android:layout_alignParentEnd="false"
+        android:layout_alignParentRight="false" />
 
     <TextView
         android:layout_width="wrap_content"

From 56526e7d355161b1bc630a11cc75aa433b39fc08 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Heydarchi <mhheidarchi2003@yahoo.com>
Date: Fri, 19 May 2023 21:22:05 +0200
Subject: [PATCH 03/10] Update java classes base on the new libs

---
 .../main/java/jakhar/aseem/diva/APICreds2Activity.java   | 3 +--
 .../main/java/jakhar/aseem/diva/APICredsActivity.java    | 2 +-
 .../java/jakhar/aseem/diva/AccessControl1Activity.java   | 2 +-
 .../java/jakhar/aseem/diva/AccessControl2Activity.java   | 2 +-
 .../java/jakhar/aseem/diva/AccessControl3Activity.java   | 2 +-
 .../jakhar/aseem/diva/AccessControl3NotesActivity.java   | 6 ++----
 .../main/java/jakhar/aseem/diva/Hardcode2Activity.java   | 2 +-
 .../main/java/jakhar/aseem/diva/HardcodeActivity.java    | 2 +-
 .../aseem/diva/InputValidation2URISchemeActivity.java    | 2 +-
 .../java/jakhar/aseem/diva/InputValidation3Activity.java | 2 +-
 .../jakhar/aseem/diva/InsecureDataStorage1Activity.java  | 2 +-
 .../jakhar/aseem/diva/InsecureDataStorage2Activity.java  | 5 +----
 .../jakhar/aseem/diva/InsecureDataStorage3Activity.java  | 4 +---
 .../jakhar/aseem/diva/InsecureDataStorage4Activity.java  | 2 +-
 app/src/main/java/jakhar/aseem/diva/LogActivity.java     | 2 +-
 app/src/main/java/jakhar/aseem/diva/MainActivity.java    | 9 ++++-----
 .../java/jakhar/aseem/diva/SQLInjectionActivity.java     | 2 +-
 17 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java b/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java
index baaad21..d594ced 100644
--- a/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java
@@ -32,9 +32,8 @@
 package jakhar.aseem.diva;
 
 import android.content.Intent;
-import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java b/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java
index e25cff2..46eae3c 100644
--- a/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java
@@ -31,8 +31,8 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
 public class APICredsActivity extends AppCompatActivity {
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java
index d699b47..f126901 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java
@@ -32,8 +32,8 @@
 package jakhar.aseem.diva;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java
index 10cd6d5..d9c2326 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java
@@ -32,8 +32,8 @@
 package jakhar.aseem.diva;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.RadioButton;
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java
index 1dd179c..a9de556 100644
--- a/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java
@@ -34,8 +34,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java
index 9fc8002..da2bfa3 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 android.os.Bundle;
+import android.preference.PreferenceManager;
+import androidx.appcompat.app.AppCompatActivity;
 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..81bd03f 100644
--- a/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java
@@ -31,8 +31,8 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
diff --git a/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java b/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java
index 3f9fc4b..c7ed1ed 100644
--- a/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java
@@ -31,8 +31,8 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
diff --git a/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java b/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java
index a1db925..dee46de 100644
--- a/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java
@@ -31,8 +31,8 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
diff --git a/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java b/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java
index f4e8421..0e631b6 100644
--- a/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java
@@ -31,8 +31,8 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java
index c91e78e..18041a0 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java
@@ -33,8 +33,8 @@
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java
index 4adf6d1..053d457 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java
@@ -31,17 +31,14 @@
  */
 package jakhar.aseem.diva;
 
-import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Environment;
-import android.support.v7.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;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class InsecureDataStorage2Activity extends AppCompatActivity {
 
diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java
index 92f40a1..03378f7 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java
@@ -31,16 +31,14 @@
  */
 package jakhar.aseem.diva;
 
-import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 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..64351a3 100644
--- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java
+++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java
@@ -32,8 +32,8 @@
 package jakhar.aseem.diva;
 
 import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/LogActivity.java b/app/src/main/java/jakhar/aseem/diva/LogActivity.java
index 26e1173..ce55106 100644
--- a/app/src/main/java/jakhar/aseem/diva/LogActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/LogActivity.java
@@ -31,8 +31,8 @@
  */
 package jakhar.aseem.diva;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/jakhar/aseem/diva/MainActivity.java b/app/src/main/java/jakhar/aseem/diva/MainActivity.java
index 4feea22..d3cddc6 100644
--- a/app/src/main/java/jakhar/aseem/diva/MainActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/MainActivity.java
@@ -33,13 +33,12 @@
 
 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 android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java b/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java
index b17132e..5fee4a0 100644
--- a/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java
+++ b/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java
@@ -33,8 +33,8 @@
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;

From c9fdbeac39c2139e694862daf64b67f1374f5246 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Heydarchi <mhheidarchi2003@yahoo.com>
Date: Fri, 19 May 2023 21:22:30 +0200
Subject: [PATCH 04/10] - Upgrade libs - Replace new libraries with new ones -
 Update gradle configs - Use new Android SDK version to build

---
 .idea/compiler.xml                            | 18 +---------
 .idea/gradle.xml                              |  5 +--
 .idea/misc.xml                                | 34 ++++++++++---------
 .idea/modules.xml                             |  5 ++-
 Diva.iml                                      | 13 ++-----
 app/build.gradle                              | 23 ++++++++-----
 .../jakhar/aseem/diva/ApplicationTest.java    | 13 -------
 .../aseem/diva/ExampleInstrumentedTest.java   | 26 ++++++++++++++
 app/src/main/AndroidManifest.xml              | 11 +++---
 build.gradle                                  | 24 ++-----------
 gradle.properties                             |  4 +--
 gradle/wrapper/gradle-wrapper.properties      |  6 ++--
 settings.gradle                               | 15 ++++++++
 13 files changed, 100 insertions(+), 97 deletions(-)
 delete mode 100644 app/src/androidTest/java/jakhar/aseem/diva/ApplicationTest.java
 create mode 100644 app/src/androidTest/java/jakhar/aseem/diva/ExampleInstrumentedTest.java

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 0833b17..4535ee4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,12 +1,13 @@
 <?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="LOCAL" />
         <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="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a3eaff..8dc3d47 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.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" 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 146fd35..76d2193 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,10 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Diva.iml" filepath="$PROJECT_DIR$/Diva.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Diva.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Diva.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Diva.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Diva.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Diva.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Diva.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Diva.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Diva.app.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Diva.iml b/Diva.iml
index 4abea91..af7a2bf 100644
--- a/Diva.iml
+++ b/Diva.iml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="Diva" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0a95252..7a762d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    namespace 'jakhar.aseem.diva'
+    compileSdk 33
+
 
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdk 15
+        targetSdk 33
         versionCode 1
         versionName "1.0"
     }
@@ -17,6 +18,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     sourceSets {
         main {
             jni.srcDirs = []
@@ -25,8 +30,10 @@ 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 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.android.support:design:28.0.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/app/src/androidTest/java/jakhar/aseem/diva/ApplicationTest.java b/app/src/androidTest/java/jakhar/aseem/diva/ApplicationTest.java
deleted file mode 100644
index d704618..0000000
--- a/app/src/androidTest/java/jakhar/aseem/diva/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package jakhar.aseem.diva;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/jakhar/aseem/diva/ExampleInstrumentedTest.java b/app/src/androidTest/java/jakhar/aseem/diva/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..765dc15
--- /dev/null
+++ b/app/src/androidTest/java/jakhar/aseem/diva/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package jakhar.aseem.diva;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("jakhar.aseem.diva", appContext.getPackageName());
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3d7e83..a526e7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="jakhar.aseem.diva" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -15,7 +15,8 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -60,7 +61,8 @@
         </activity>
         <activity
             android:name=".APICredsActivity"
-            android:label="@string/apic_label" >
+            android:label="@string/apic_label"
+            android:exported="true">
             <intent-filter>
                 <action android:name="jakhar.aseem.diva.action.VIEW_CREDS" />
 
@@ -73,7 +75,8 @@
         </activity>
         <activity
             android:name=".APICreds2Activity"
-            android:label="@string/apic2_label" >
+            android:label="@string/apic2_label"
+            android:exported="true">
             <intent-filter>
                 <action android:name="jakhar.aseem.diva.action.VIEW_CREDS2" />
 
diff --git a/build.gradle b/build.gradle
index be515a8..03607ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,23 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+plugins {
+    id 'com.android.application' version '7.4.0' apply false
+    id 'com.android.library' version '7.4.0' apply false
 }
diff --git a/gradle.properties b/gradle.properties
index 220fd31..ccb748f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# Aseem - Added on 13 Jan 2016 for compiling divajni
-android.useDeprecatedNdk=true
\ No newline at end of file
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4a98645..152a4b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 02 14:05:35 IST 2015
+#Fri May 19 16:14:46 CEST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index e7b4def..2735305 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,16 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "Diva"
 include ':app'

From f27575125d8880fe7a2f28aaf8aeb42ca065f160 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Heydarchi <mhheidarchi2003@yahoo.com>
Date: Fri, 19 May 2023 22:46:37 +0200
Subject: [PATCH 05/10] Update READEME file

---
 README.md | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 8f731a9..b55f642 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+# Attention
+
+I've update the project to the a newer Android SDK version since it seems that the author is not willing to maintain it anymore. Besides I have kept the original README file as much as possible where ever it has a useful information.
+
+<br/>
+
 # DIVA Android
 ---
 ## What is DIVA?
@@ -30,8 +36,8 @@ I tried to put as much vulnerabilities as possible in a short period of time. I
 9. Access Control Issues – Part 1
 10. Access Control Issues – Part 2
 11. Access Control Issues – Part 3
-12. Hardcoding Issues – Part 2
-13. Input Validation Issues – Part 3
+12. Hardcoding Issues – Part 2  **(Not fixed for the new Android SDK)**
+13. Input Validation Issues – Part 3 **(Not fixed for the new Android SDK)**
 
 ## Can I contribute?
 Yes, you can help by sending us the details of vulnerabilities that we can implement in future versions of Diva. Please send an email to info [at] payatu.com with subject “DIVA Contribution”.
@@ -65,17 +71,7 @@ We would love to hear from you about your experience with Diva. Please send us a
 
 ## Author
 Aseem Jakhar
-
-## About Payatu
-Payatu is a boutique security testing company with specialization in:
-* IoT Security
-* Mobile Security
-* Cloud security
-* Web Security
-
-We also organize two International Security Conferences
-* nullcon International Security Conference - http://nullcon.net
-* hardwear.io Hardware Security Conference - http://hardwear.io
-
 **Website:** http://payatu.com
 **Email:** info (at) payatu dot com
+
+

From 13d8dc58ccc31170bb37aac4adb5ca4823675192 Mon Sep 17 00:00:00 2001
From: Mohammad Hossein Heydarchi <mhheidarchi2003@yahoo.com>
Date: Fri, 19 May 2023 23:02:54 +0200
Subject: [PATCH 06/10] Fix NDK config to build native code

---
 .idea/gradle.xml  | 2 +-
 .idea/vcs.xml     | 2 +-
 app/build.gradle  | 7 +++++++
 gradle.properties | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4535ee4..89a68a8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <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 7a762d1..640d33d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,6 +27,13 @@ android {
             jni.srcDirs = []
         }
     }
+    externalNativeBuild {
+        cmake {
+            version "3.22.1"
+        }
+    }
+    ndkVersion '25.2.9519653'
+    buildToolsVersion '33.0.0'
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index ccb748f..8220541 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,5 @@
 # org.gradle.parallel=true
 
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+org.gradle.unsafe.configuration-cache=true
\ No newline at end of file

From 0f949664f58b61603ed68fdf34b626901f54f5a3 Mon Sep 17 00:00:00 2001
From: Rhony <5601175+rhonyabdullah@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:09:55 +0700
Subject: [PATCH 07/10] chore(Build) remove unwanted .idea files changes

---
 .idea/compiler.xml |  6 ------
 .idea/gradle.xml   | 20 -------------------
 .idea/misc.xml     | 48 ----------------------------------------------
 3 files changed, 74 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/misc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 89a68a8..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="LOCAL" />
-        <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>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 8dc3d47..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <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="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="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="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file

From 8ed8175e9d9fcfbf855604bf2bfd07789c61d9b3 Mon Sep 17 00:00:00 2001
From: Rhony <5601175+rhonyabdullah@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:11:15 +0700
Subject: [PATCH 08/10] fix(Build) Add missing Makefile command.

- Create jniLibs before copy
---
 app/src/main/jni/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/jni/Makefile b/app/src/main/jni/Makefile
index 910fe43..2b43506 100644
--- a/app/src/main/jni/Makefile
+++ b/app/src/main/jni/Makefile
@@ -34,6 +34,7 @@
 all:
 	ndk-build
 	rm -rf ../jniLibs/*
+	mkdir -p ../jniLibs
 	cp -r ../libs/* ../jniLibs/
 clean:
 	ndk-build clean

From 1e04be2334e95d62e2cf7899729d597fafbd83ef Mon Sep 17 00:00:00 2001
From: Rhony <5601175+rhonyabdullah@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:25:58 +0700
Subject: [PATCH 09/10] fix(Build) Dependency upgrades.

- ignore unwanted so files
- upgrade ndk version to 27
- remove build tools version as today it isn't required
- use google material instead support design
- upgrade min and target sdk
- upgrade target java compatibility
---
 .gitignore                               |  5 ++++-
 app/build.gradle                         | 17 ++++++++---------
 build.gradle                             |  4 ++--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16dcd12..90a2043 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,7 @@ render.experimental.xml
 google-services.json
 
 # Android Profiling
-*.hprof
\ No newline at end of file
+*.hprof
+obj/
+libs/
+jniLibs/
diff --git a/app/build.gradle b/app/build.gradle
index 640d33d..5fd67a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     namespace 'jakhar.aseem.diva'
-    compileSdk 33
+    compileSdk 35
 
 
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdk 15
-        targetSdk 33
+        minSdk 21
+        targetSdk 35
         versionCode 1
         versionName "1.0"
     }
@@ -19,8 +19,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     sourceSets {
         main {
@@ -32,14 +32,13 @@ android {
             version "3.22.1"
         }
     }
-    ndkVersion '25.2.9519653'
-    buildToolsVersion '33.0.0'
+    ndkVersion '27.1.12297006'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.android.support:design:28.0.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/build.gradle b/build.gradle
index 03607ba..85f9292 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.0' apply false
-    id 'com.android.library' version '7.4.0' apply false
+    id 'com.android.application' version '8.9.1' apply false
+    id 'com.android.library' version '8.9.1' apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 152a4b9..11541be 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri May 19 16:14:46 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 01f04b44963000166411d17bd82829ce2526ce57 Mon Sep 17 00:00:00 2001
From: Rhony <5601175+rhonyabdullah@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:37:43 +0700
Subject: [PATCH 10/10] chore(JNI) add JNI folder as resource

- To make it visible on Android project view
---
 app/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 5fd67a4..43deaa7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,6 +24,9 @@ android {
     }
     sourceSets {
         main {
+            resources {
+                srcDirs = ['src/main/jni']
+            }
             jni.srcDirs = []
         }
     }