diff --git a/.gitignore b/.gitignore index 22a4ae4..aa724b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,15 @@ +*.iml .gradle /local.properties -/.idea/workspace.xml +/.idea/caches /.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures -/app/build +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index a4e102e..0000000 Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 089a5ff..c5e6d9d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,7 +8,6 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index be1ee49..ef3bc0c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index ffa05be..c99d852 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0a95252..3e89da2 100644 --- 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' +} \ No newline at end of file diff --git a/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java b/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java new file mode 100644 index 0000000..e388ac0 --- /dev/null +++ b/app/build/generated/source/buildConfig/debug/jakhar/aseem/diva/BuildConfig.java @@ -0,0 +1,12 @@ +/** + * Automatically generated file. DO NOT MODIFY + */ +package jakhar.aseem.diva; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String APPLICATION_ID = "jakhar.aseem.diva"; + public static final String BUILD_TYPE = "debug"; + public static final int VERSION_CODE = 1; + public static final String VERSION_NAME = "1.030"; +} diff --git a/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java b/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java index baaad21..994f956 100644 --- a/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/APICreds2Activity.java @@ -32,8 +32,8 @@ package jakhar.aseem.diva; import android.content.Intent; -import android.os.Environment; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java b/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java index e25cff2..e277958 100644 --- a/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/APICredsActivity.java @@ -31,7 +31,7 @@ */ package jakhar.aseem.diva; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.widget.TextView; diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java index d699b47..b0ee183 100644 --- a/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/AccessControl1Activity.java @@ -32,7 +32,7 @@ package jakhar.aseem.diva; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java index 10cd6d5..10d6925 100644 --- a/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/AccessControl2Activity.java @@ -32,7 +32,7 @@ package jakhar.aseem.diva; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java index 1dd179c..4584f3a 100644 --- a/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/AccessControl3Activity.java @@ -34,7 +34,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java b/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java index 9fc8002..5100f55 100644 --- a/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/AccessControl3NotesActivity.java @@ -31,18 +31,16 @@ */ package jakhar.aseem.diva; -import android.content.ContentResolver; import android.content.SharedPreferences; import android.database.Cursor; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.ListView; import android.widget.SimpleCursorAdapter; -import android.widget.TextView; import android.widget.Toast; public class AccessControl3NotesActivity extends AppCompatActivity { diff --git a/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java b/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java index 5a170a4..042ac9d 100644 --- a/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/Hardcode2Activity.java @@ -31,7 +31,7 @@ */ package jakhar.aseem.diva; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java b/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java index 3f9fc4b..da8b53a 100644 --- a/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/HardcodeActivity.java @@ -31,7 +31,7 @@ */ package jakhar.aseem.diva; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java b/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java index a1db925..5867804 100644 --- a/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/InputValidation2URISchemeActivity.java @@ -31,7 +31,7 @@ */ package jakhar.aseem.diva; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.webkit.WebSettings; diff --git a/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java b/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java index f4e8421..244df78 100644 --- a/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/InputValidation3Activity.java @@ -31,7 +31,7 @@ */ package jakhar.aseem.diva; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java index c91e78e..a84c11a 100644 --- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage1Activity.java @@ -33,7 +33,7 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java index 4adf6d1..23558f5 100644 --- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage2Activity.java @@ -31,18 +31,15 @@ */ package jakhar.aseem.diva; -import android.content.Context; import android.database.sqlite.SQLiteDatabase; -import android.os.Environment; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.Toast; -import java.io.File; - public class InsecureDataStorage2Activity extends AppCompatActivity { private SQLiteDatabase mDB; diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java index 92f40a1..b0f9eda 100644 --- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage3Activity.java @@ -31,8 +31,7 @@ */ package jakhar.aseem.diva; -import android.os.Environment; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -40,7 +39,6 @@ import android.widget.Toast; import java.io.File; -import java.io.FileOutputStream; import java.io.FileWriter; public class InsecureDataStorage3Activity extends AppCompatActivity { diff --git a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java index 31446da..f2b4026 100644 --- a/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java +++ b/app/src/main/java/jakhar/aseem/diva/InsecureDataStorage4Activity.java @@ -32,7 +32,7 @@ package jakhar.aseem.diva; import android.os.Environment; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/jakhar/aseem/diva/LogActivity.java b/app/src/main/java/jakhar/aseem/diva/LogActivity.java index 26e1173..3f54efc 100644 --- a/app/src/main/java/jakhar/aseem/diva/LogActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/LogActivity.java @@ -31,7 +31,7 @@ */ package jakhar.aseem.diva; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/jakhar/aseem/diva/MainActivity.java b/app/src/main/java/jakhar/aseem/diva/MainActivity.java index 4feea22..101a798 100644 --- a/app/src/main/java/jakhar/aseem/diva/MainActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/MainActivity.java @@ -33,10 +33,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java b/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java index b17132e..d797d9d 100644 --- a/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java +++ b/app/src/main/java/jakhar/aseem/diva/SQLInjectionActivity.java @@ -33,7 +33,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 841af97..1366f72 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,20 +1,20 @@ - - - - + - + diff --git a/build.gradle b/build.gradle index a6ad490..8bdb7c3 100644 --- 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' } } diff --git a/gradle.properties b/gradle.properties index 220fd31..36dfdfc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,5 @@ # org.gradle.parallel=true # Aseem - Added on 13 Jan 2016 for compiling divajni -android.useDeprecatedNdk=true \ No newline at end of file +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 465614b..abec834 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Oct 08 15:55:24 CEST 2020 +#Fri Feb 19 04:27:47 CET 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip