Skip to content

Commit 3393f47

Browse files
author
dns
committed
Updated Code
1 parent 629b2fc commit 3393f47

26 files changed

+352
-106
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎AndroLabServer/mydb.db‎

0 Bytes
Binary file not shown.

‎InsecureBankv2/.idea/encodings.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎InsecureBankv2/.idea/gradle.xml‎

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎InsecureBankv2/.idea/misc.xml‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎InsecureBankv2/.idea/runConfigurations.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎InsecureBankv2/InsecureBankv2.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎InsecureBankv2/app/app.iml‎

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
18-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2120
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,54 +23,73 @@
2423
</configuration>
2524
</facet>
2625
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2827
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3029
<exclude-output />
3130
<content url="file://$MODULE_DIR$">
3231
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4241
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4443
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5049
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5159
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5260
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5563
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5664
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5765
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
5867
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5968
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6069
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6170
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6271
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6372
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6473
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6583
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
6686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
7390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.0.0/jars" />
7491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.marcohc/Toasteroid/2.1.4/jars" />
7593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars" />
7694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars" />
7795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/7.5.0/jars" />
@@ -94,17 +112,20 @@
94112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.5.0/jars" />
95113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/7.5.0/jars" />
96114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
116+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
117+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
118+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
119+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
120+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
101121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
122+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
105123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
106125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
107127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
128+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
108129
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
109130
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
110131
</content>
@@ -129,6 +150,7 @@
129150
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
130151
<orderEntry type="library" exported="" name="play-services-fitness-7.5.0" level="project" />
131152
<orderEntry type="library" exported="" name="play-services-nearby-7.5.0" level="project" />
153+
<orderEntry type="library" exported="" name="Toasteroid-2.1.4" level="project" />
132154
<orderEntry type="library" exported="" name="play-services-plus-7.5.0" level="project" />
133155
<orderEntry type="library" exported="" name="play-services-wearable-7.5.0" level="project" />
134156
<orderEntry type="library" exported="" name="play-services-appstate-7.5.0" level="project" />

‎InsecureBankv2/app/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,12 @@ dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile 'com.android.support:appcompat-v7:22.2.0'
2525
compile 'com.google.android.gms:play-services:7.5.0'
26+
compile 'com.github.marcohc:Toasteroid:2.1.4'
27+
2628
}
29+
30+
repositories {
31+
maven {
32+
url "https://jitpack.io"
33+
}
34+
}

‎InsecureBankv2/app/src/main/java/com/android/insecurebankv2/DoLogin.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import android.view.MenuItem;
3939
import android.widget.Toast;
4040

41+
import com.marcohc.toasteroid.Toasteroid;
42+
4143
/*
4244
The page that accepts new password and passes it on to the change password
4345
module. This new password can then be used by the user to log in to the account.
@@ -82,7 +84,8 @@ protected void onCreate(Bundle savedInstanceState) {
8284
{
8385
Intent setupServerdetails =new Intent(this,FilePrefActivity.class);
8486
startActivity(setupServerdetails);
85-
Toast.makeText(this, "Server path/port not set!",Toast.LENGTH_LONG).show();
87+
Toasteroid.show(this, "Server path/port not set!!", Toasteroid.STYLES.WARNING, Toasteroid.LENGTH_SHORT);
88+
8689

8790
}
8891
}

0 commit comments

Comments
 (0)