Merge pull request #37 from jsherm-fwdsec/upgrade-android-version

Upgrade Android version

Android/MSTG-Android-Kotlin-App/.gitignore

@@ -1,5 +1,6 @@
 *.iml
 .gradle
+.idea
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries

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.
+This is the source code for MSTG Kotlin App prior to pushing into public Github as part of the MSTG Hacking Playground.
+
+

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,15 +29,15 @@ 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"
     implementation 'com.google.code.gson:gson:2.8.2'
     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'
 }

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)
     }
 }

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">
-        <activity android:name=".MainActivity">
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

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}\" }"
 

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

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}\" }"
 

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

Android/MSTG-Android-Kotlin-App/app/src/main/res/layout/activity_insecure_web_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -11,4 +11,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>