Skip to content

Commit 8d9f167

Browse files
author
dns
committed
fixed issues + updated config for oreo
1 parent 85b5764 commit 8d9f167

File tree

8 files changed

+20
-48
lines changed

8 files changed

+20
-48
lines changed

‎AndroLabServer/README.markdown‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Install the below libraries using: easy_install <libraryname>
1515
* cherrypy
1616
* web.py
1717

18+
Alternatively just use:
19+
pip install -r requirements.txt
20+
1821
Running the python server
1922
-----
2023
Change the current directory to the AndroLabServer folder

‎AndroLabServer/database.pyc‎

10 Bytes
Binary file not shown.

‎AndroLabServer/models.pyc‎

45 Bytes
Binary file not shown.

‎AndroLabServer/mydb.db‎

0 Bytes
Binary file not shown.

‎InsecureBankv2/app/app.iml‎

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -47,71 +46,40 @@
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5351
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5452
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5553
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5654
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5755
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6158
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6259
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6360
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6461
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6562
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6965
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7066
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7167
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7268
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7369
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7570
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7671
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7772
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7873
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7974
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
82-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8377
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8478
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8579
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8680
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8781
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8882
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.0.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.marcohc/Toasteroid/2.1.4/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/7.5.0/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/7.5.0/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appstate/7.5.0/jars" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.5.0/jars" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/7.5.0/jars" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/7.5.0/jars" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/7.5.0/jars" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-games/7.5.0/jars" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/7.5.0/jars" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/7.5.0/jars" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/7.5.0/jars" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/7.5.0/jars" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-nearby/7.5.0/jars" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/7.5.0/jars" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/7.5.0/jars" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/7.5.0/jars" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wallet/7.5.0/jars" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.5.0/jars" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/7.5.0/jars" />
11583
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
11684
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
11785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
@@ -121,36 +89,36 @@
12189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
12290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
12391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
124-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
12592
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
12693
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
12794
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
12895
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
12996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
13098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
13199
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
132100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
133101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
134102
</content>
135-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
103+
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
136104
<orderEntry type="sourceFolder" forTests="false" />
105+
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
137106
<orderEntry type="library" exported="" name="play-services-wallet-7.5.0" level="project" />
138107
<orderEntry type="library" exported="" name="play-services-cast-7.5.0" level="project" />
139108
<orderEntry type="library" exported="" name="mediarouter-v7-22.0.0" level="project" />
140109
<orderEntry type="library" exported="" name="play-services-drive-7.5.0" level="project" />
141-
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
142110
<orderEntry type="library" exported="" name="play-services-analytics-7.5.0" level="project" />
143111
<orderEntry type="library" exported="" name="play-services-panorama-7.5.0" level="project" />
144-
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
145112
<orderEntry type="library" exported="" name="play-services-appindexing-7.5.0" level="project" />
113+
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
146114
<orderEntry type="library" exported="" name="play-services-location-7.5.0" level="project" />
147115
<orderEntry type="library" exported="" name="play-services-ads-7.5.0" level="project" />
148116
<orderEntry type="library" exported="" name="play-services-safetynet-7.5.0" level="project" />
149117
<orderEntry type="library" exported="" name="play-services-base-7.5.0" level="project" />
150118
<orderEntry type="library" exported="" name="play-services-7.5.0" level="project" />
151119
<orderEntry type="library" exported="" name="play-services-gcm-7.5.0" level="project" />
152120
<orderEntry type="library" exported="" name="play-services-appinvite-7.5.0" level="project" />
153-
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
121+
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
154122
<orderEntry type="library" exported="" name="play-services-fitness-7.5.0" level="project" />
155123
<orderEntry type="library" exported="" name="play-services-nearby-7.5.0" level="project" />
156124
<orderEntry type="library" exported="" name="Toasteroid-2.1.4" level="project" />
@@ -160,5 +128,6 @@
160128
<orderEntry type="library" exported="" name="play-services-games-7.5.0" level="project" />
161129
<orderEntry type="library" exported="" name="play-services-identity-7.5.0" level="project" />
162130
<orderEntry type="library" exported="" name="play-services-maps-7.5.0" level="project" />
131+
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-26" level="project" />
163132
</component>
164133
</module>

‎InsecureBankv2/app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 26
5+
buildToolsVersion '26.0.2'
66

77
defaultConfig {
88
applicationId "com.android.insecurebankv2"
99
minSdkVersion 15
10-
targetSdkVersion 22
11-
versionCode 1
12-
versionName "1.0"
10+
targetSdkVersion 26
11+
versionCode 2
12+
versionName "2.0"
13+
useLibrary 'org.apache.http.legacy'
1314
}
1415
buildTypes {
1516
release {
@@ -20,11 +21,10 @@ android {
2021
}
2122

2223
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:22.2.0'
24+
compile fileTree(include: ['*.jar'], dir: 'libs')
25+
// compile 'com.android.support:appcompat-v7:22.2.0'
2526
compile 'com.google.android.gms:play-services:7.5.0'
2627
compile 'com.github.marcohc:Toasteroid:2.1.4'
27-
2828
}
2929

3030
repositories {

‎InsecureBankv2/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99

1010

1111
// NOTE: Do not place your application dependencies here; they belong

‎InsecureBankv2/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 24 23:27:15 EST 2017
1+
#Tue Oct 24 14:19:37 IST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)