2021-1-capstone-design2 / 2017103957

Go to a project
Toggle navigation Toggle navigation pinning
김가영
4b3def3b 1 parent 16e2850e

reupload

Inline Side-by-side
Showing 30 changed files with 570 additions and 106 deletions
1 /build 1 /build
2 +google-services.json
...\ No newline at end of file ...\ No newline at end of file
......
1 +<component name="libraryTable">
2 + <library name="Gradle: androidx.browser:browser:1.0.0@aar">
3 + <ANNOTATIONS>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d52aa75563c2cc8edb955a24f2134bd9/browser-1.0.0/annotations.zip!/" />
5 + </ANNOTATIONS>
6 + <CLASSES>
7 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d52aa75563c2cc8edb955a24f2134bd9/browser-1.0.0/jars/classes.jar!/" />
8 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d52aa75563c2cc8edb955a24f2134bd9/browser-1.0.0/res" />
9 + </CLASSES>
10 + <JAVADOC />
11 + <SOURCES>
12 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.browser/browser/1.0.0/804dc4c93b5f45da8f72c10a5080dbb21715d813/browser-1.0.0-sources.jar!/" />
13 + </SOURCES>
14 + </library>
15 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1964611a1907e3ea07b40ce4c516c284/legacy-support-v4-1.0.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1964611a1907e3ea07b40ce4c516c284/legacy-support-v4-1.0.0/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES>
9 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-v4/1.0.0/5b8f86fea035328fc9e8c660773037a3401ce25f/legacy-support-v4-1.0.0-sources.jar!/" />
10 + </SOURCES>
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: androidx.media:media:1.0.0@aar">
3 + <ANNOTATIONS>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6ce3afbff3f1ae3fa1fe13048b173d9/media-1.0.0/annotations.zip!/" />
5 + </ANNOTATIONS>
6 + <CLASSES>
7 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6ce3afbff3f1ae3fa1fe13048b173d9/media-1.0.0/jars/classes.jar!/" />
8 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6ce3afbff3f1ae3fa1fe13048b173d9/media-1.0.0/res" />
9 + </CLASSES>
10 + <JAVADOC />
11 + <SOURCES>
12 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.media/media/1.0.0/5faf25be15e16e27275f5c7e04e15e944ebccea0/media-1.0.0-sources.jar!/" />
13 + </SOURCES>
14 + </library>
15 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-auth-api-phone:17.4.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/017d0bb303d84a333d4b4a29db315a7c/play-services-auth-api-phone-17.4.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/017d0bb303d84a333d4b4a29db315a7c/play-services-auth-api-phone-17.4.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-auth-api-phone/17.4.0/b6b7f35110232b40de7a1374921fcff1eaa864ba/play-services-auth-api-phone-17.4.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77bbfe436e143a45f1657a91df71e9ae/jetified-play-services-base-16.0.1/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77bbfe436e143a45f1657a91df71e9ae/jetified-play-services-base-16.0.1/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES />
9 + </library>
10 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-base:17.1.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8499f8320ecc1cfe5d3e5d6e485ec6d/play-services-base-17.1.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8499f8320ecc1cfe5d3e5d6e485ec6d/play-services-base-17.1.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-base/17.1.0/d906658f01adc56396bea0573cf0ee171933e54/play-services-base-17.1.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-basement:16.1.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/be9bd10b903b75d2cca5ea3abf16bd4e/jetified-play-services-basement-16.1.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/be9bd10b903b75d2cca5ea3abf16bd4e/jetified-play-services-basement-16.1.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/16.1.0/b17ac2a01a8f2f3e29192a283123d39200c64f1b/play-services-basement-16.1.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-basement:17.1.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b82a0428c16549ffbde92717933cc782/jetified-play-services-basement-17.1.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b82a0428c16549ffbde92717933cc782/jetified-play-services-basement-17.1.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/17.1.0/7fa2e5498ad43ed18a3cf89f1c615821d2174dd8/play-services-basement-17.1.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da64b67ab07eec09773e23c9f11142ef/play-services-flags-16.0.1/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da64b67ab07eec09773e23c9f11142ef/play-services-flags-16.0.1/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES />
9 + </library>
10 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-safetynet:17.0.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ceaf02dd5287926c5f92b11b6e7ec4f/play-services-safetynet-17.0.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ceaf02dd5287926c5f92b11b6e7ec4f/play-services-safetynet-17.0.0/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES />
9 + </library>
10 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7847e36338473a8f4cff1d7316c02b24/jetified-play-services-tasks-16.0.1/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7847e36338473a8f4cff1d7316c02b24/jetified-play-services-tasks-16.0.1/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES />
9 + </library>
10 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.android.gms:play-services-tasks:17.0.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3087f829ad78da1f0d52970740cc50c8/play-services-tasks-17.0.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3087f829ad78da1f0d52970740cc50c8/play-services-tasks-17.0.0/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES />
9 + </library>
10 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-annotations:16.0.0@jar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-annotations/16.0.0/dbeae20d6c97b747b59ef47b6dcf770ba1a60fa6/firebase-annotations-16.0.0.jar!/" />
5 + </CLASSES>
6 + <JAVADOC>
7 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-annotations/16.0.0/547590a65ca39ae1f7c72b5f2028f9e1abe6429e/firebase-annotations-16.0.0-javadoc.jar!/" />
8 + </JAVADOC>
9 + <SOURCES>
10 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-annotations/16.0.0/c8e0434511a2f8f949f2c4e8af56cf690f596837/firebase-annotations-16.0.0-sources.jar!/" />
11 + </SOURCES>
12 + </library>
13 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-auth:16.0.5@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/827c57542134912b87fbe726f33b714e/jetified-firebase-auth-16.0.5/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/827c57542134912b87fbe726f33b714e/jetified-firebase-auth-16.0.5/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-auth/16.0.5/a52a62631987728ed029b753a4585dae04425b9a/firebase-auth-16.0.5-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-auth:20.0.4@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b83470f072bfdf32fae446e608c46c9/jetified-firebase-auth-20.0.4/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b83470f072bfdf32fae446e608c46c9/jetified-firebase-auth-20.0.4/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-auth/20.0.4/ec35eb9119cc9df43be51e0747fdb951378594b0/firebase-auth-20.0.4-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/087c996dab25f18317e0496cc0dae6a6/jetified-firebase-auth-interop-16.0.1/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/087c996dab25f18317e0496cc0dae6a6/jetified-firebase-auth-interop-16.0.1/res" />
6 + </CLASSES>
7 + <JAVADOC />
8 + <SOURCES />
9 + </library>
10 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-auth-interop:19.0.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c901410e72419c2856c2635f03d28d8a/firebase-auth-interop-19.0.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c901410e72419c2856c2635f03d28d8a/firebase-auth-interop-19.0.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-auth-interop/19.0.0/62360008013e207bf91d5b96c09eb0b9a3067393/firebase-auth-interop-19.0.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-common:16.0.3@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc13afd70058bbae5e08f5f271734cd9/jetified-firebase-common-16.0.3/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc13afd70058bbae5e08f5f271734cd9/jetified-firebase-common-16.0.3/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-common/16.0.3/d8fb501ad05b51e2a89e23dafeb391fd62a030b5/firebase-common-16.0.3-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-common:19.5.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c1ef5ebc43a1f0dccdfca6ec561db769/jetified-firebase-common-19.5.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c1ef5ebc43a1f0dccdfca6ec561db769/jetified-firebase-common-19.5.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-common/19.5.0/74c6d45bd7a7f96f91a986795e875bafc361902b/firebase-common-19.5.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES>
11 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-common/19.5.0/cd6c1ba1a90712022acda0def30cacec1111a9a/firebase-common-19.5.0-sources.jar!/" />
12 + </SOURCES>
13 + </library>
14 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-components:16.1.0@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/215e9b34a2fdc84f19f4be499f57184f/jetified-firebase-components-16.1.0/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/215e9b34a2fdc84f19f4be499f57184f/jetified-firebase-components-16.1.0/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-components/16.1.0/3a9c1cc3126d1c3fa181be1692de99be7cfe3b83/firebase-components-16.1.0-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES>
11 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-components/16.1.0/5f2661eee0882325baf3b7ed9626b0dcbd7cbbaf/firebase-components-16.1.0-sources.jar!/" />
12 + </SOURCES>
13 + </library>
14 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-storage:16.0.4@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/70ec808efc2410e1f116ec02a69a7470/jetified-firebase-storage-16.0.4/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/70ec808efc2410e1f116ec02a69a7470/jetified-firebase-storage-16.0.4/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-storage/16.0.4/150f431b172c8a893f4cb7941d5c052c31a5d0af/firebase-storage-16.0.4-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES />
11 + </library>
12 +</component>
...\ No newline at end of file ...\ No newline at end of file
1 +<component name="libraryTable">
2 + <library name="Gradle: com.google.firebase:firebase-storage:19.2.2@aar">
3 + <CLASSES>
4 + <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a762055916206e6e4d5e782b822b022b/firebase-storage-19.2.2/jars/classes.jar!/" />
5 + <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a762055916206e6e4d5e782b822b022b/firebase-storage-19.2.2/res" />
6 + </CLASSES>
7 + <JAVADOC>
8 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-storage/19.2.2/5f74817c466b7868dc2722df098f8eb72f1b5fc3/firebase-storage-19.2.2-javadoc.jar!/" />
9 + </JAVADOC>
10 + <SOURCES>
11 + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-storage/19.2.2/ff019215690808ade7a099b0e9ef8fd40bee5031/firebase-storage-19.2.2-sources.jar!/" />
12 + </SOURCES>
13 + </library>
14 +</component>
...\ No newline at end of file ...\ No newline at end of file
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 </shared> 6 </shared>
7 </component> 7 </component>
8 <component name="AndroidLogFilters"> 8 <component name="AndroidLogFilters">
9 + <option name="TOOL_WINDOW_CUSTOM_FILTER" value="MYLO" />
9 <option name="TOOL_WINDOW_LOG_LEVEL" value="info" /> 10 <option name="TOOL_WINDOW_LOG_LEVEL" value="info" />
10 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> 11 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
11 </component> 12 </component>
...@@ -26,7 +27,7 @@ ...@@ -26,7 +27,7 @@
26 <component name="DefaultGradleProjectSettings"> 27 <component name="DefaultGradleProjectSettings">
27 <option name="isMigrated" value="true" /> 28 <option name="isMigrated" value="true" />
28 </component> 29 </component>
29 - <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_28" /> 30 + <component name="ExecutionTargetManager" SELECTED_TARGET="ce12160cc327c64005" />
30 <component name="ExternalProjectsManager"> 31 <component name="ExternalProjectsManager">
31 <system id="GRADLE"> 32 <system id="GRADLE">
32 <state> 33 <state>
...@@ -56,8 +57,8 @@ ...@@ -56,8 +57,8 @@
56 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml"> 57 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
57 <provider editor-type-id="android-manifest" /> 58 <provider editor-type-id="android-manifest" />
58 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
59 - <state relative-caret-position="397"> 60 + <state relative-caret-position="233">
60 - <caret line="29" column="51" lean-forward="true" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" /> 61 + <caret line="37" column="45" selection-start-line="37" selection-start-column="45" selection-end-line="37" selection-end-column="45" />
61 </state> 62 </state>
62 </provider> 63 </provider>
63 </entry> 64 </entry>
...@@ -65,12 +66,50 @@ ...@@ -65,12 +66,50 @@
65 <file pinned="false" current-in-tab="true"> 66 <file pinned="false" current-in-tab="true">
66 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java"> 67 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
67 <provider selected="true" editor-type-id="text-editor"> 68 <provider selected="true" editor-type-id="text-editor">
68 - <state relative-caret-position="16"> 69 + <state relative-caret-position="179">
69 - <caret line="234" lean-forward="true" selection-start-line="234" selection-end-line="234" /> 70 + <caret line="433" column="76" lean-forward="true" selection-start-line="433" selection-start-column="76" selection-end-line="433" selection-end-column="76" />
70 <folding> 71 <folding>
71 <element signature="imports" expanded="true" /> 72 <element signature="imports" expanded="true" />
72 - <element signature="e#10779#11051#0" expanded="true" /> 73 + </folding>
73 - <element signature="e#11050#11051#0" expanded="true" /> 74 + </state>
75 + </provider>
76 + </entry>
77 + </file>
78 + <file pinned="false" current-in-tab="false">
79 + <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/android/content/Intent.java">
80 + <provider selected="true" editor-type-id="text-editor">
81 + <state relative-caret-position="309">
82 + <caret line="10491" selection-start-line="10491" selection-end-line="10491" />
83 + </state>
84 + </provider>
85 + </entry>
86 + </file>
87 + <file pinned="false" current-in-tab="false">
88 + <entry file="file://$PROJECT_DIR$/build.gradle">
89 + <provider selected="true" editor-type-id="text-editor">
90 + <state relative-caret-position="551">
91 + <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
92 + </state>
93 + </provider>
94 + </entry>
95 + </file>
96 + <file pinned="false" current-in-tab="false">
97 + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/socket.io-client/1.0.0/4b4143f3dd7f109762c43643b9c306bb33f94f5c/socket.io-client-1.0.0-sources.jar!/io/socket/client/Socket.java">
98 + <provider selected="true" editor-type-id="text-editor">
99 + <state relative-caret-position="3477">
100 + <caret line="207" selection-start-line="207" selection-end-line="207" />
101 + </state>
102 + </provider>
103 + </entry>
104 + </file>
105 + <file pinned="false" current-in-tab="false">
106 + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/engine.io-client/1.0.0/1c1cc12afc81c9d70b3eb436186189b1c56a1fc1/engine.io-client-1.0.0-sources.jar!/io/socket/thread/EventThread.java">
107 + <provider selected="true" editor-type-id="text-editor">
108 + <state relative-caret-position="950">
109 + <caret line="58" selection-start-line="58" selection-end-line="58" />
110 + <folding>
111 + <element signature="e#1161#1162#0" expanded="true" />
112 + <element signature="e#1209#1210#0" expanded="true" />
74 </folding> 113 </folding>
75 </state> 114 </state>
76 </provider> 115 </provider>
...@@ -79,8 +118,8 @@ ...@@ -79,8 +118,8 @@
79 <file pinned="false" current-in-tab="false"> 118 <file pinned="false" current-in-tab="false">
80 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java"> 119 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
81 <provider selected="true" editor-type-id="text-editor"> 120 <provider selected="true" editor-type-id="text-editor">
82 - <state relative-caret-position="380"> 121 + <state relative-caret-position="247">
83 - <caret line="20" selection-start-line="20" selection-end-line="20" /> 122 + <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
84 <folding> 123 <folding>
85 <element signature="imports" expanded="true" /> 124 <element signature="imports" expanded="true" />
86 </folding> 125 </folding>
...@@ -110,12 +149,15 @@ ...@@ -110,12 +149,15 @@
110 <component name="FindInProjectRecents"> 149 <component name="FindInProjectRecents">
111 <findStrings> 150 <findStrings>
112 <find>tag</find> 151 <find>tag</find>
113 - <find>alert</find>
114 <find>startLoading</find> 152 <find>startLoading</find>
115 <find>sdca</find> 153 <find>sdca</find>
116 <find>/mnt/sdcard</find> 154 <find>/mnt/sdcard</find>
117 <find>getPhoto</find> 155 <find>getPhoto</find>
156 + <find>alert</find>
157 + <find>socket</find>
158 + <find>oncreate</find>
118 <find>finish</find> 159 <find>finish</find>
160 + <find>copyFile</find>
119 </findStrings> 161 </findStrings>
120 </component> 162 </component>
121 <component name="Git.Settings"> 163 <component name="Git.Settings">
...@@ -126,10 +168,10 @@ ...@@ -126,10 +168,10 @@
126 <list> 168 <list>
127 <option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" /> 169 <option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" />
128 <option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" /> 170 <option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" />
171 + <option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" />
129 <option value="$PROJECT_DIR$/build.gradle" /> 172 <option value="$PROJECT_DIR$/build.gradle" />
130 - <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
131 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" /> 173 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" />
132 - <option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" /> 174 + <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
133 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" /> 175 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" />
134 </list> 176 </list>
135 </option> 177 </option>
...@@ -202,13 +244,35 @@ ...@@ -202,13 +244,35 @@
202 <option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_61_jar.xml" /> 244 <option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_61_jar.xml" />
203 <option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_61_jar.xml" /> 245 <option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_61_jar.xml" />
204 <option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_nanohttpd_nanohttpd_2_3_1_jar.xml" /> 246 <option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_nanohttpd_nanohttpd_2_3_1_jar.xml" />
247 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml" />
248 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml" />
249 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml" />
250 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_1_0_aar.xml" />
251 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml" />
252 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml" />
253 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_0_5_aar.xml" />
254 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml" />
255 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_3_aar.xml" />
256 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_4_aar.xml" />
257 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_browser_browser_1_0_0_aar.xml" />
258 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_api_phone_17_4_0_aar.xml" />
259 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_17_1_0_aar.xml" />
260 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_1_0_aar.xml" />
261 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_safetynet_17_0_0_aar.xml" />
262 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_17_0_0_aar.xml" />
263 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_annotations_16_0_0_jar.xml" />
264 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_20_0_4_aar.xml" />
265 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_19_0_0_aar.xml" />
266 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_19_5_0_aar.xml" />
267 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_components_16_1_0_aar.xml" />
268 + <option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_storage_19_2_2_aar.xml" />
205 </list> 269 </list>
206 </option> 270 </option>
207 </component> 271 </component>
208 <component name="ProjectFrameBounds" extendedState="6"> 272 <component name="ProjectFrameBounds" extendedState="6">
209 - <option name="x" value="705" /> 273 + <option name="x" value="951" />
210 - <option name="width" value="1225" /> 274 + <option name="width" value="978" />
211 - <option name="height" value="1049" /> 275 + <option name="height" value="1039" />
212 </component> 276 </component>
213 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 277 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
214 <component name="ProjectView"> 278 <component name="ProjectView">
...@@ -216,6 +280,7 @@ ...@@ -216,6 +280,7 @@
216 <foldersAlwaysOnTop value="true" /> 280 <foldersAlwaysOnTop value="true" />
217 </navigator> 281 </navigator>
218 <panes> 282 <panes>
283 + <pane id="Scope" />
219 <pane id="AndroidView"> 284 <pane id="AndroidView">
220 <subPane> 285 <subPane>
221 <expand> 286 <expand>
...@@ -226,35 +291,7 @@ ...@@ -226,35 +291,7 @@
226 <path> 291 <path>
227 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" /> 292 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
228 <item name="app" type="feadf853:AndroidModuleNode" /> 293 <item name="app" type="feadf853:AndroidModuleNode" />
229 - <item name="java" type="edd41e36:AndroidSourceTypeNode" /> 294 + <item name="manifests" type="f94875db:AndroidManifestsGroupNode" />
230 - </path>
231 - <path>
232 - <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
233 - <item name="app" type="feadf853:AndroidModuleNode" />
234 - <item name="java" type="edd41e36:AndroidSourceTypeNode" />
235 - <item name="dataextraction" type="cbb59c9e:AndroidPsiDirectoryNode" />
236 - </path>
237 - <path>
238 - <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
239 - <item name="app" type="feadf853:AndroidModuleNode" />
240 - <item name="java (generated)" type="edd41e36:AndroidSourceTypeNode" />
241 - </path>
242 - <path>
243 - <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
244 - <item name="app" type="feadf853:AndroidModuleNode" />
245 - <item name="java (generated)" type="edd41e36:AndroidSourceTypeNode" />
246 - <item name="test" type="cbb59c9e:AndroidPsiDirectoryNode" />
247 - </path>
248 - <path>
249 - <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
250 - <item name="app" type="feadf853:AndroidModuleNode" />
251 - <item name="res" type="d4f16f75:AndroidResFolderNode" />
252 - </path>
253 - <path>
254 - <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
255 - <item name="app" type="feadf853:AndroidModuleNode" />
256 - <item name="res" type="d4f16f75:AndroidResFolderNode" />
257 - <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
258 </path> 295 </path>
259 <path> 296 <path>
260 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" /> 297 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
...@@ -264,9 +301,8 @@ ...@@ -264,9 +301,8 @@
264 <select /> 301 <select />
265 </subPane> 302 </subPane>
266 </pane> 303 </pane>
267 - <pane id="Scope" />
268 - <pane id="PackagesPane" />
269 <pane id="ProjectPane" /> 304 <pane id="ProjectPane" />
305 + <pane id="PackagesPane" />
270 </panes> 306 </panes>
271 </component> 307 </component>
272 <component name="PropertiesComponent"> 308 <component name="PropertiesComponent">
...@@ -377,7 +413,7 @@ ...@@ -377,7 +413,7 @@
377 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 413 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
378 <layout> 414 <layout>
379 <window_info id="Captures" order="0" side_tool="true" weight="0.25" /> 415 <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
380 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.07114094" /> 416 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.19261745" />
381 <window_info id="Structure" order="2" side_tool="true" /> 417 <window_info id="Structure" order="2" side_tool="true" />
382 <window_info id="Favorites" order="3" side_tool="true" /> 418 <window_info id="Favorites" order="3" side_tool="true" />
383 <window_info id="Build Variants" order="4" side_tool="true" /> 419 <window_info id="Build Variants" order="4" side_tool="true" />
...@@ -386,14 +422,14 @@ ...@@ -386,14 +422,14 @@
386 <window_info id="Resources Explorer" order="7" /> 422 <window_info id="Resources Explorer" order="7" />
387 <window_info id="Capture Tool" order="8" /> 423 <window_info id="Capture Tool" order="8" />
388 <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32765958" /> 424 <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32765958" />
389 - <window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" visible="true" weight="0.32056737" /> 425 + <window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" visible="true" weight="0.31914893" />
390 <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" /> 426 <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" />
391 - <window_info anchor="bottom" id="Debug" order="3" weight="0.32907802" /> 427 + <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49731544" weight="0.32907802" />
392 <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" /> 428 <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" />
393 - <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50345623" side_tool="true" weight="0.3186969" /> 429 + <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50201344" side_tool="true" weight="0.3248227" />
394 <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49932885" weight="0.32907802" /> 430 <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49932885" weight="0.32907802" />
395 - <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.3248227" /> 431 + <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49798658" weight="0.3248227" />
396 - <window_info anchor="bottom" id="Android Profiler" order="8" /> 432 + <window_info anchor="bottom" id="Android Profiler" order="8" weight="0.32907802" />
397 <window_info anchor="bottom" id="Find" order="9" /> 433 <window_info anchor="bottom" id="Find" order="9" />
398 <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.2872483" /> 434 <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.2872483" />
399 <window_info anchor="right" id="Capture Analysis" order="1" /> 435 <window_info anchor="right" id="Capture Analysis" order="1" />
...@@ -401,6 +437,7 @@ ...@@ -401,6 +437,7 @@
401 <window_info anchor="right" id="Theme Preview" order="3" /> 437 <window_info anchor="right" id="Theme Preview" order="3" />
402 <window_info anchor="right" id="Preview" order="4" /> 438 <window_info anchor="right" id="Preview" order="4" />
403 <window_info anchor="right" id="Palette&#9;" order="5" /> 439 <window_info anchor="right" id="Palette&#9;" order="5" />
440 + <window_info anchor="right" id="Assistant" order="6" weight="0.357047" />
404 </layout> 441 </layout>
405 <layout-to-restore> 442 <layout-to-restore>
406 <window_info id="Captures" order="0" side_tool="true" weight="0.25" /> 443 <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
...@@ -496,13 +533,6 @@ ...@@ -496,13 +533,6 @@
496 </state> 533 </state>
497 </provider> 534 </provider>
498 </entry> 535 </entry>
499 - <entry file="file://$PROJECT_DIR$/build.gradle">
500 - <provider selected="true" editor-type-id="text-editor">
501 - <state relative-caret-position="513">
502 - <caret line="27" column="60" selection-start-line="27" selection-start-column="60" selection-end-line="27" selection-end-column="60" />
503 - </state>
504 - </provider>
505 - </entry>
506 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/SMSDataBase.java"> 536 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/SMSDataBase.java">
507 <provider selected="true" editor-type-id="text-editor"> 537 <provider selected="true" editor-type-id="text-editor">
508 <state relative-caret-position="76"> 538 <state relative-caret-position="76">
...@@ -583,18 +613,35 @@ ...@@ -583,18 +613,35 @@
583 </state> 613 </state>
584 </provider> 614 </provider>
585 </entry> 615 </entry>
586 - <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml"> 616 + <entry file="file://$PROJECT_DIR$/build/generated/source/buildConfig/androidTest/debug/com/example/dataextraction/test/BuildConfig.java">
587 - <provider editor-type-id="android-manifest" />
588 <provider selected="true" editor-type-id="text-editor"> 617 <provider selected="true" editor-type-id="text-editor">
589 - <state relative-caret-position="397"> 618 + <state relative-caret-position="57">
590 - <caret line="29" column="51" lean-forward="true" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" /> 619 + <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
591 </state> 620 </state>
592 </provider> 621 </provider>
593 </entry> 622 </entry>
594 - <entry file="file://$PROJECT_DIR$/build/generated/source/buildConfig/androidTest/debug/com/example/dataextraction/test/BuildConfig.java"> 623 + <entry file="file://$PROJECT_DIR$/build.gradle">
595 <provider selected="true" editor-type-id="text-editor"> 624 <provider selected="true" editor-type-id="text-editor">
596 - <state relative-caret-position="57"> 625 + <state relative-caret-position="551">
597 - <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" /> 626 + <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
627 + </state>
628 + </provider>
629 + </entry>
630 + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/socket.io-client/1.0.0/4b4143f3dd7f109762c43643b9c306bb33f94f5c/socket.io-client-1.0.0-sources.jar!/io/socket/client/Socket.java">
631 + <provider selected="true" editor-type-id="text-editor">
632 + <state relative-caret-position="3477">
633 + <caret line="207" selection-start-line="207" selection-end-line="207" />
634 + </state>
635 + </provider>
636 + </entry>
637 + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.socket/engine.io-client/1.0.0/1c1cc12afc81c9d70b3eb436186189b1c56a1fc1/engine.io-client-1.0.0-sources.jar!/io/socket/thread/EventThread.java">
638 + <provider selected="true" editor-type-id="text-editor">
639 + <state relative-caret-position="950">
640 + <caret line="58" selection-start-line="58" selection-end-line="58" />
641 + <folding>
642 + <element signature="e#1161#1162#0" expanded="true" />
643 + <element signature="e#1209#1210#0" expanded="true" />
644 + </folding>
598 </state> 645 </state>
599 </provider> 646 </provider>
600 </entry> 647 </entry>
...@@ -606,24 +653,37 @@ ...@@ -606,24 +653,37 @@
606 </state> 653 </state>
607 </provider> 654 </provider>
608 </entry> 655 </entry>
656 + <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
657 + <provider editor-type-id="android-manifest" />
658 + <provider selected="true" editor-type-id="text-editor">
659 + <state relative-caret-position="233">
660 + <caret line="37" column="45" selection-start-line="37" selection-start-column="45" selection-end-line="37" selection-end-column="45" />
661 + </state>
662 + </provider>
663 + </entry>
609 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java"> 664 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
610 <provider selected="true" editor-type-id="text-editor"> 665 <provider selected="true" editor-type-id="text-editor">
611 - <state relative-caret-position="380"> 666 + <state relative-caret-position="247">
612 - <caret line="20" selection-start-line="20" selection-end-line="20" /> 667 + <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
613 <folding> 668 <folding>
614 <element signature="imports" expanded="true" /> 669 <element signature="imports" expanded="true" />
615 </folding> 670 </folding>
616 </state> 671 </state>
617 </provider> 672 </provider>
618 </entry> 673 </entry>
674 + <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/android/content/Intent.java">
675 + <provider selected="true" editor-type-id="text-editor">
676 + <state relative-caret-position="309">
677 + <caret line="10491" selection-start-line="10491" selection-end-line="10491" />
678 + </state>
679 + </provider>
680 + </entry>
619 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java"> 681 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
620 <provider selected="true" editor-type-id="text-editor"> 682 <provider selected="true" editor-type-id="text-editor">
621 - <state relative-caret-position="16"> 683 + <state relative-caret-position="179">
622 - <caret line="234" lean-forward="true" selection-start-line="234" selection-end-line="234" /> 684 + <caret line="433" column="76" lean-forward="true" selection-start-line="433" selection-start-column="76" selection-end-line="433" selection-end-column="76" />
623 <folding> 685 <folding>
624 <element signature="imports" expanded="true" /> 686 <element signature="imports" expanded="true" />
625 - <element signature="e#10779#11051#0" expanded="true" />
626 - <element signature="e#11050#11051#0" expanded="true" />
627 </folding> 687 </folding>
628 </state> 688 </state>
629 </provider> 689 </provider>
......
1 apply plugin: 'com.android.application' 1 apply plugin: 'com.android.application'
2 +apply plugin: 'com.google.gms.google-services'
2 3
3 android { 4 android {
4 compileSdkVersion 29 5 compileSdkVersion 29
...@@ -26,9 +27,38 @@ dependencies { ...@@ -26,9 +27,38 @@ dependencies {
26 implementation 'me.jahnen:libaums:0.8.0' 27 implementation 'me.jahnen:libaums:0.8.0'
27 implementation 'me.jahnen:libaums-httpserver:0.5.3' 28 implementation 'me.jahnen:libaums-httpserver:0.5.3'
28 implementation 'me.jahnen:libaums-storageprovider:0.5.1' 29 implementation 'me.jahnen:libaums-storageprovider:0.5.1'
30 + implementation platform('com.google.firebase:firebase-bom:27.1.0')
31 + implementation 'com.google.firebase:firebase-storage:16.0.4'
32 + implementation 'com.google.firebase:firebase-auth:16.0.5'
29 testImplementation 'junit:junit:4.12' 33 testImplementation 'junit:junit:4.12'
30 androidTestImplementation 'androidx.test:runner:1.1.1' 34 androidTestImplementation 'androidx.test:runner:1.1.1'
31 androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' 35 androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
32 implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5' 36 implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
33 implementation group: 'io.socket', name: 'socket.io-client', version: '1.0.0' 37 implementation group: 'io.socket', name: 'socket.io-client', version: '1.0.0'
34 } 38 }
39 +
40 +buildscript {
41 + repositories {
42 + google()
43 + //jcenter()
44 + jcenter {url 'https://dl.bintray.com/android/android-tools'}
45 + jcenter {url 'https://firebase.bintray.com/gradle'}
46 + mavenCentral ()
47 + }
48 + dependencies {
49 + classpath 'com.android.tools.build:gradle:3.2.1'
50 + classpath 'com.google.gms:google-services:4.2.0'
51 + classpath 'com.google.firebase:firebase-plugins:1.1.5'
52 + }
53 +}
54 +
55 +allprojects {
56 + repositories {
57 + google()
58 + //jcenter()
59 + jcenter {url 'https://dl.bintray.com/android/android-tools'}
60 + jcenter {url 'https://firebase.bintray.com/gradle'}
61 + mavenCentral ()
62 +
63 + }
64 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -46,6 +46,8 @@ import android.widget.Toast; ...@@ -46,6 +46,8 @@ import android.widget.Toast;
46 46
47 import java.io.BufferedReader; 47 import java.io.BufferedReader;
48 import java.io.BufferedWriter; 48 import java.io.BufferedWriter;
49 +import java.io.DataInputStream;
50 +import java.io.DataOutputStream;
49 import java.io.File; 51 import java.io.File;
50 import java.io.FileInputStream; 52 import java.io.FileInputStream;
51 import java.io.FileNotFoundException; 53 import java.io.FileNotFoundException;
...@@ -55,6 +57,7 @@ import java.io.InputStream; ...@@ -55,6 +57,7 @@ import java.io.InputStream;
55 import java.io.InputStreamReader; 57 import java.io.InputStreamReader;
56 import java.io.OutputStream; 58 import java.io.OutputStream;
57 import java.io.OutputStreamWriter; 59 import java.io.OutputStreamWriter;
60 +import java.io.PrintWriter;
58 import java.net.InetAddress; 61 import java.net.InetAddress;
59 import java.text.DateFormat; 62 import java.text.DateFormat;
60 import java.text.SimpleDateFormat; 63 import java.text.SimpleDateFormat;
...@@ -68,6 +71,8 @@ import androidx.annotation.NonNull; ...@@ -68,6 +71,8 @@ import androidx.annotation.NonNull;
68 import androidx.core.content.ContextCompat; 71 import androidx.core.content.ContextCompat;
69 72
70 73
74 +import com.google.firebase.storage.FirebaseStorage;
75 +import com.google.firebase.storage.StorageReference;
71 import com.google.gson.JsonObject; 76 import com.google.gson.JsonObject;
72 77
73 import org.json.JSONException; 78 import org.json.JSONException;
...@@ -276,7 +281,6 @@ public class LoadingActivity extends Activity { ...@@ -276,7 +281,6 @@ public class LoadingActivity extends Activity {
276 @Override 281 @Override
277 public void run() { 282 public void run() {
278 makeTXT(); 283 makeTXT();
279 - copyFile("/mnt/sdcard/TempTEMP/", "df.txt", "/mnt/media_rw/5822-DED4/Filefile/");
280 284
281 dbHelper = new DBHelper(getApplicationContext()); 285 dbHelper = new DBHelper(getApplicationContext());
282 dbHelper.open(); 286 dbHelper.open();
...@@ -353,9 +357,16 @@ public class LoadingActivity extends Activity { ...@@ -353,9 +357,16 @@ public class LoadingActivity extends Activity {
353 357
354 copyFile("/data/data/com.example.dataextraction/databases/", "InnerDatabase.db", "/sdcard/TempTEMP/"); 358 copyFile("/data/data/com.example.dataextraction/databases/", "InnerDatabase.db", "/sdcard/TempTEMP/");
355 copyFile("/data/data/com.example.dataextraction/databases/", "networkDatabase.db", "/sdcard/TempTEMP/"); 359 copyFile("/data/data/com.example.dataextraction/databases/", "networkDatabase.db", "/sdcard/TempTEMP/");
360 + goMainActivity();
356 361
357 - //finish(); 362 + try {
358 - //startActivity(new Intent(LoadingActivity.this, MainActivity.class)); 363 + Thread.sleep(1000000);
364 + } catch (InterruptedException e) {
365 + e.printStackTrace();
366 + }
367 +
368 +
369 + finish();
359 //alert("end", "end"); 370 //alert("end", "end");
360 371
361 } 372 }
...@@ -419,6 +430,10 @@ public class LoadingActivity extends Activity { ...@@ -419,6 +430,10 @@ public class LoadingActivity extends Activity {
419 }; 430 };
420 } 431 }
421 432
433 + public void goMainActivity() {
434 + startActivity(new Intent(LoadingActivity.this, MainActivity.class));
435 + }
436 +
422 public void getDocument() { 437 public void getDocument() {
423 438
424 String[] projection = { 439 String[] projection = {
......
1 package com.example.dataextraction; 1 package com.example.dataextraction;
2 2
3 +import androidx.annotation.NonNull;
3 import androidx.appcompat.app.AppCompatActivity; 4 import androidx.appcompat.app.AppCompatActivity;
5 +
6 +import android.net.Uri;
4 import android.os.Bundle; 7 import android.os.Bundle;
5 import android.util.Log; 8 import android.util.Log;
6 9
10 +import com.google.android.gms.tasks.OnCompleteListener;
11 +import com.google.android.gms.tasks.OnFailureListener;
12 +import com.google.android.gms.tasks.OnSuccessListener;
13 +import com.google.android.gms.tasks.Task;
14 +import com.google.firebase.auth.AuthResult;
15 +import com.google.firebase.auth.FirebaseAuth;
16 +import com.google.firebase.auth.FirebaseUser;
17 +import com.google.firebase.storage.FirebaseStorage;
18 +import com.google.firebase.storage.StorageReference;
19 +import com.google.firebase.storage.UploadTask;
20 +
7 import java.io.File; 21 import java.io.File;
8 -import java.io.FileInputStream;
9 -import java.io.FileNotFoundException;
10 -import java.io.FileOutputStream;
11 -import java.io.InputStream;
12 -import java.io.OutputStream;
13 22
23 +// 안드로이드 스튜디오 내에서 로그인 후 진행해야함
14 public class MainActivity extends AppCompatActivity { 24 public class MainActivity extends AppCompatActivity {
15 -
16 @Override 25 @Override
17 protected void onCreate(Bundle savedInstanceState) { 26 protected void onCreate(Bundle savedInstanceState) {
18 super.onCreate(savedInstanceState); 27 super.onCreate(savedInstanceState);
19 setContentView(R.layout.activity_main); 28 setContentView(R.layout.activity_main);
20 29
30 + FirebaseStorage storage = FirebaseStorage.getInstance();
31 + StorageReference storageRef = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "InnerDB2.db");
32 + Uri file = Uri.fromFile(new File("/sdcard/TempTEMP/InnerDatabase.db"));
21 33
34 + storageRef.putFile(file)
35 + .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
36 + @Override
37 + public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
38 + Log.i("MYLOG", "SUCCESS");
39 + }
40 + })
41 + .addOnFailureListener(new OnFailureListener() {
42 + @Override
43 + public void onFailure(@NonNull Exception exception) {
44 + // Handle unsuccessful uploads
45 + // ...
22 } 46 }
47 + });
23 48
24 - private void copyFile(String inputPath, String inputFile, String outputPath) { 49 + StorageReference storageRef2 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "networkDB2.db");
50 + Uri file2 = Uri.fromFile(new File("/sdcard/TempTEMP/networkDatabase.db"));
25 51
26 - InputStream in = null; 52 + storageRef2.putFile(file2)
27 - OutputStream out = null; 53 + .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
28 - try { 54 + @Override
55 + public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
56 + Log.i("MYLOG", "SUCCESS");
57 + }
58 + })
59 + .addOnFailureListener(new OnFailureListener() {
60 + @Override
61 + public void onFailure(@NonNull Exception exception) {
62 + // Handle unsuccessful uploads
63 + // ...
64 + }
65 + });
29 66
30 - //create output directory if it doesn't exist 67 + StorageReference storageRef3 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "netstat.txt");
31 - File dir = new File (outputPath); 68 + Uri file3 = Uri.fromFile(new File("/sdcard/TempTEMP/netstat.txt"));
32 - if (!dir.exists()) 69 +
33 - { 70 + storageRef3.putFile(file3)
34 - dir.mkdirs(); 71 + .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
72 + @Override
73 + public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
74 + Log.i("MYLOG", "SUCCESS");
35 } 75 }
76 + })
77 + .addOnFailureListener(new OnFailureListener() {
78 + @Override
79 + public void onFailure(@NonNull Exception exception) {
80 + // Handle unsuccessful uploads
81 + // ...
82 + }
83 + });
36 84
37 - in = new FileInputStream(inputPath + inputFile); 85 + StorageReference storageRef4 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "df.txt");
38 - out = new FileOutputStream(outputPath + inputFile); 86 + Uri file4 = Uri.fromFile(new File("/sdcard/TempTEMP/df.txt"));
39 87
40 - byte[] buffer = new byte[1024]; 88 + storageRef4.putFile(file4)
41 - int read; 89 + .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
42 - while ((read = in.read(buffer)) != -1) { 90 + @Override
43 - out.write(buffer, 0, read); 91 + public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
92 + Log.i("MYLOG", "SUCCESS");
44 } 93 }
45 - in.close(); 94 + })
46 - in = null; 95 + .addOnFailureListener(new OnFailureListener() {
96 + @Override
97 + public void onFailure(@NonNull Exception exception) {
98 + // Handle unsuccessful uploads
99 + // ...
100 + }
101 + });
47 102
48 - // write the output file (You have now copied the file) 103 + StorageReference storageRef5 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "uptime.txt");
49 - out.flush(); 104 + Uri file5 = Uri.fromFile(new File("/sdcard/TempTEMP/uptime.txt"));
50 - out.close();
51 - out = null;
52 105
53 - } catch (FileNotFoundException fnfe1) { 106 + storageRef5.putFile(file5)
54 - Log.e("tag", fnfe1.getMessage()); 107 + .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
108 + @Override
109 + public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
110 + Log.i("MYLOG", "SUCCESS");
55 } 111 }
56 - catch (Exception e) { 112 + })
57 - Log.e("tag", e.getMessage()); 113 + .addOnFailureListener(new OnFailureListener() {
114 + @Override
115 + public void onFailure(@NonNull Exception exception) {
116 + // Handle unsuccessful uploads
117 + // ...
58 } 118 }
119 + });
59 120
60 } 121 }
61 } 122 }
......
1 +1. 서론
2 +- 디지털 포렌식 개념, 그 중에서 모바일 포렌식이 왜 필요한지
3 +- 본 연구의 목표**(목표 확실하게 다른 학생분들과 분류)
4 +
5 +2. 관련 연구
6 +- 기존 연구 및 문제점
7 +-- 루팅이 필요하다는 것
8 +-- 커널 취약점을 공격하거나 보안 설정을 우회해 루트 권한을 획득 해야 한다는 것
9 +-- 그렇기 때문에 데이터 획득 자체가 어려워짐.
10 +
11 +-- 기존 획득 방식은 PC에 연결을 해야하기 때문에 이동성이 부족함.
12 +-- 실제 현장에서 간편하게 이용할 수 있는 방법이 필요함.
13 +
14 +- 해결 방안
15 +
16 +-- Content Provider로 기본 데이터 얻어오기
17 +-- USB 연결 방식으로 데이터 획득 후 USB 내에 데이터 저장한 후 분석 할 수 있도록 하기.
18 +
19 +3. 제안하는 포렌식 도구
20 +3.1 시나리오
21 +- 사용자가 누구인가
22 +- 데이터 서버에 전송할 때 어떻게 안전하게 할 것인지 방법에 대한 것도 고려
23 +
24 +3.2 요구사항
25 +
26 +4. 결론 및 향후 연구
27 +
28 +5. 참고 문헌
29 +
30 +
31 +중간보고서 보내드리기.
32 +