huobb0 · timurxyz · Feb 19, 2021 · Feb 19, 2021 · Feb 20, 2021 · Feb 20, 2021
diff --git 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
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
-
+    compileSdkVersion 30
     defaultConfig {
         applicationId "jakhar.aseem.diva"
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.030"
     }
     buildTypes {
         release {
@@ -25,8 +23,11 @@ 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.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'
+}
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
@@ -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.030";
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,16 +31,14 @@
  */
 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;
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/build.gradle b/build.gradle
@@ -6,10 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }