diff --git a/Android/MSTG-Android-Kotlin-App/.gitignore b/Android/MSTG-Android-Kotlin-App/.gitignore index 39fb081..25bf2ae 100755 --- a/Android/MSTG-Android-Kotlin-App/.gitignore +++ b/Android/MSTG-Android-Kotlin-App/.gitignore @@ -1,5 +1,6 @@ *.iml .gradle +.idea /local.properties /.idea/workspace.xml /.idea/libraries diff --git a/Android/MSTG-Android-Kotlin-App/.idea/caches/build_file_checksums.ser b/Android/MSTG-Android-Kotlin-App/.idea/caches/build_file_checksums.ser deleted file mode 100755 index b16b4f8..0000000 Binary files a/Android/MSTG-Android-Kotlin-App/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml b/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml deleted file mode 100755 index ae78c11..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/compiler.xml b/Android/MSTG-Android-Kotlin-App/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml b/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml deleted file mode 100755 index 9129a9f..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/jarRepositories.xml b/Android/MSTG-Android-Kotlin-App/.idea/jarRepositories.xml deleted file mode 100644 index a5f05cd..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/kotlinc.xml b/Android/MSTG-Android-Kotlin-App/.idea/kotlinc.xml deleted file mode 100755 index 5806fb3..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/kotlinc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/misc.xml b/Android/MSTG-Android-Kotlin-App/.idea/misc.xml deleted file mode 100755 index 4c1b071..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/misc.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/modules.xml b/Android/MSTG-Android-Kotlin-App/.idea/modules.xml deleted file mode 100644 index 95077a2..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/.idea/vcs.xml b/Android/MSTG-Android-Kotlin-App/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/Android/MSTG-Android-Kotlin-App/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/README.md b/Android/MSTG-Android-Kotlin-App/README.md index 4583bd5..d26aa31 100755 --- a/Android/MSTG-Android-Kotlin-App/README.md +++ b/Android/MSTG-Android-Kotlin-App/README.md @@ -1 +1,3 @@ -This is the source code for MSTG Kotlin App prior to pushing into public Github as part of the MSTG Hacking Playground. \ No newline at end of file +This is the source code for MSTG Kotlin App prior to pushing into public Github as part of the MSTG Hacking Playground. + + diff --git a/Android/MSTG-Android-Kotlin-App/app/build.gradle b/Android/MSTG-Android-Kotlin-App/app/build.gradle index 0b202a6..c30d99f 100755 --- a/Android/MSTG-Android-Kotlin-App/app/build.gradle +++ b/Android/MSTG-Android-Kotlin-App/app/build.gradle @@ -5,14 +5,14 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 + compileSdkVersion 33 defaultConfig { applicationId "sg.vantagepoint.mstgkotlin" - minSdkVersion 19 - targetSdkVersion 26 + minSdk 29 + targetSdkVersion 33 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -29,8 +29,8 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.anko:anko-common:$anko_version" - implementation "com.android.support:appcompat-v7:$support_version" - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "com.github.kittinunf.fuel:fuel:$fuelLibVersion" implementation "com.github.kittinunf.fuel:fuel-android:$fuelLibVersion" implementation "com.github.kittinunf.fuel:fuel-rxjava:$fuelLibVersion" @@ -38,6 +38,6 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' implementation "de.adorsys.android:securestoragelibrary:$securestorage_version" testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' } diff --git a/Android/MSTG-Android-Kotlin-App/app/src/androidTest/java/sg/vantagepoint/mstgkotlin/ExampleInstrumentedTest.kt b/Android/MSTG-Android-Kotlin-App/app/src/androidTest/java/sg/vantagepoint/mstgkotlin/ExampleInstrumentedTest.kt index 820fbad..b357850 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/androidTest/java/sg/vantagepoint/mstgkotlin/ExampleInstrumentedTest.kt +++ b/Android/MSTG-Android-Kotlin-App/app/src/androidTest/java/sg/vantagepoint/mstgkotlin/ExampleInstrumentedTest.kt @@ -1,7 +1,7 @@ package sg.vantagepoint.mstgkotlin -import android.support.test.InstrumentationRegistry -import android.support.test.runner.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith @@ -18,7 +18,7 @@ class ExampleInstrumentedTest { @Test fun useAppContext() { // Context of the app under test. - val appContext = InstrumentationRegistry.getTargetContext() + val appContext = InstrumentationRegistry.getInstrumentation().getTargetContext() assertEquals("sg.vantagepoint.mstgkotlin", appContext.packageName) } } diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/AndroidManifest.xml b/Android/MSTG-Android-Kotlin-App/app/src/main/AndroidManifest.xml index c95a43e..adf5d98 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/AndroidManifest.xml +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/AndroidManifest.xml @@ -10,8 +10,10 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> - + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true"> + diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/InsecureWebViewActivity.kt b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/InsecureWebViewActivity.kt index cd37145..d311fd3 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/InsecureWebViewActivity.kt +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/InsecureWebViewActivity.kt @@ -1,6 +1,6 @@ package sg.vantagepoint.mstgkotlin -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log import android.webkit.WebChromeClient diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MainActivity.kt b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MainActivity.kt index 00fb2f0..4252b8b 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MainActivity.kt +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MainActivity.kt @@ -1,7 +1,7 @@ package sg.vantagepoint.mstgkotlin import android.content.SharedPreferences -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.text.TextUtils import android.util.Log @@ -43,7 +43,7 @@ class MainActivity : AppCompatActivity() { } btnsubmit.setOnClickListener { - FuelManager.instance.basePath = "http://52.221.247.56" + FuelManager.instance.basePath = "http://10.0.0.24" val loginurl = "/auth/login" val loginbody = "{ \"email\" : \"${loginemail.text}\", \"password\" : \"${loginpassword.text}\" }" diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MenuActivity.kt b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MenuActivity.kt index 715bca9..69e2294 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MenuActivity.kt +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/MenuActivity.kt @@ -1,6 +1,6 @@ package sg.vantagepoint.mstgkotlin -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/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/RegisterActivity.kt b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/RegisterActivity.kt index c2dc898..3714379 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/RegisterActivity.kt +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/RegisterActivity.kt @@ -1,6 +1,6 @@ package sg.vantagepoint.mstgkotlin -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.widget.Button import android.widget.EditText @@ -47,7 +47,7 @@ class RegisterActivity : AppCompatActivity() { } btnsubmit.setOnClickListener { - FuelManager.instance.basePath = "http://52.221.247.56" + FuelManager.instance.basePath = "http://10.0.0.24" val loginurl = "/signup" val loginbody = "{ \"name\" : \"${username.text}\", \"email\" : \"${email.text}\", \"password\" : \"${password.text}\" }" diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/SecureWebViewActivity.kt b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/SecureWebViewActivity.kt index 107d890..5d0600d 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/SecureWebViewActivity.kt +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/java/sg/vantagepoint/mstgkotlin/SecureWebViewActivity.kt @@ -1,6 +1,6 @@ package sg.vantagepoint.mstgkotlin -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log import android.webkit.WebSettings diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_insecure_web_view.xml b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_insecure_web_view.xml index 404bbc9..03a2dc1 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_insecure_web_view.xml +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_insecure_web_view.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_main.xml b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_main.xml index 1c51d03..7da6e3c 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_main.xml +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_menu.xml b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_menu.xml index bc4ce5d..a0bfb70 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_menu.xml +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_menu.xml @@ -1,5 +1,5 @@ - - + diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_register.xml b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_register.xml index 32269ff..92f7cbd 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_register.xml +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_register.xml @@ -1,5 +1,5 @@ - - + diff --git a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_secure_web_view.xml b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_secure_web_view.xml index dfcc412..bdda73e 100755 --- a/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_secure_web_view.xml +++ b/Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_secure_web_view.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/Android/MSTG-Android-Kotlin-App/gradle.properties b/Android/MSTG-Android-Kotlin-App/gradle.properties index aac7c9b..9e6fce1 100755 --- a/Android/MSTG-Android-Kotlin-App/gradle.properties +++ b/Android/MSTG-Android-Kotlin-App/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode.