[Broken Builds] Project Maintenance

.gitignore

@@ -1,8 +1,36 @@
-.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
+obj/
+libs/
+jniLibs/

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>

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
+
+

app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    namespace 'jakhar.aseem.diva'
+    compileSdk 35
+
 
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdk 21
+        targetSdk 35
         versionCode 1
         versionName "1.0"
     }
@@ -17,16 +18,31 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
     sourceSets {
         main {
+            resources {
+                srcDirs = ['src/main/jni']
+            }
             jni.srcDirs = []
         }
     }
+    externalNativeBuild {
+        cmake {
+            version "3.22.1"
+        }
+    }
+    ndkVersion '27.1.12297006'
 }
 
 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.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'
 }

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());
+    }
+}

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" />
 

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;

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 {