김가영

file transfer to firebase server

Showing 29 changed files with 576 additions and 106 deletions
<component name="libraryTable">
<library name="Gradle: androidx.browser:browser:1.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d52aa75563c2cc8edb955a24f2134bd9/browser-1.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d52aa75563c2cc8edb955a24f2134bd9/browser-1.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d52aa75563c2cc8edb955a24f2134bd9/browser-1.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1964611a1907e3ea07b40ce4c516c284/legacy-support-v4-1.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1964611a1907e3ea07b40ce4c516c284/legacy-support-v4-1.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: androidx.media:media:1.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6ce3afbff3f1ae3fa1fe13048b173d9/media-1.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6ce3afbff3f1ae3fa1fe13048b173d9/media-1.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6ce3afbff3f1ae3fa1fe13048b173d9/media-1.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-auth-api-phone:17.4.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/017d0bb303d84a333d4b4a29db315a7c/play-services-auth-api-phone-17.4.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/017d0bb303d84a333d4b4a29db315a7c/play-services-auth-api-phone-17.4.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77bbfe436e143a45f1657a91df71e9ae/jetified-play-services-base-16.0.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77bbfe436e143a45f1657a91df71e9ae/jetified-play-services-base-16.0.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-base:17.1.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8499f8320ecc1cfe5d3e5d6e485ec6d/play-services-base-17.1.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8499f8320ecc1cfe5d3e5d6e485ec6d/play-services-base-17.1.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:16.1.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/be9bd10b903b75d2cca5ea3abf16bd4e/jetified-play-services-basement-16.1.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/be9bd10b903b75d2cca5ea3abf16bd4e/jetified-play-services-basement-16.1.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:17.1.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b82a0428c16549ffbde92717933cc782/jetified-play-services-basement-17.1.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b82a0428c16549ffbde92717933cc782/jetified-play-services-basement-17.1.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da64b67ab07eec09773e23c9f11142ef/play-services-flags-16.0.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da64b67ab07eec09773e23c9f11142ef/play-services-flags-16.0.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-safetynet:17.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ceaf02dd5287926c5f92b11b6e7ec4f/play-services-safetynet-17.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ceaf02dd5287926c5f92b11b6e7ec4f/play-services-safetynet-17.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7847e36338473a8f4cff1d7316c02b24/jetified-play-services-tasks-16.0.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7847e36338473a8f4cff1d7316c02b24/jetified-play-services-tasks-16.0.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-tasks:17.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3087f829ad78da1f0d52970740cc50c8/play-services-tasks-17.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3087f829ad78da1f0d52970740cc50c8/play-services-tasks-17.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-annotations:16.0.0@jar">
<CLASSES>
<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!/" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-auth:16.0.5@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/827c57542134912b87fbe726f33b714e/jetified-firebase-auth-16.0.5/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/827c57542134912b87fbe726f33b714e/jetified-firebase-auth-16.0.5/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-auth:20.0.4@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b83470f072bfdf32fae446e608c46c9/jetified-firebase-auth-20.0.4/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b83470f072bfdf32fae446e608c46c9/jetified-firebase-auth-20.0.4/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/087c996dab25f18317e0496cc0dae6a6/jetified-firebase-auth-interop-16.0.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/087c996dab25f18317e0496cc0dae6a6/jetified-firebase-auth-interop-16.0.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-auth-interop:19.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c901410e72419c2856c2635f03d28d8a/firebase-auth-interop-19.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c901410e72419c2856c2635f03d28d8a/firebase-auth-interop-19.0.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-common:16.0.3@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc13afd70058bbae5e08f5f271734cd9/jetified-firebase-common-16.0.3/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc13afd70058bbae5e08f5f271734cd9/jetified-firebase-common-16.0.3/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-common:19.5.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c1ef5ebc43a1f0dccdfca6ec561db769/jetified-firebase-common-19.5.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c1ef5ebc43a1f0dccdfca6ec561db769/jetified-firebase-common-19.5.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-components:16.1.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/215e9b34a2fdc84f19f4be499f57184f/jetified-firebase-components-16.1.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/215e9b34a2fdc84f19f4be499f57184f/jetified-firebase-components-16.1.0/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-storage:16.0.4@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/70ec808efc2410e1f116ec02a69a7470/jetified-firebase-storage-16.0.4/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/70ec808efc2410e1f116ec02a69a7470/jetified-firebase-storage-16.0.4/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-storage:19.2.2@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a762055916206e6e4d5e782b822b022b/firebase-storage-19.2.2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a762055916206e6e4d5e782b822b022b/firebase-storage-19.2.2/res" />
</CLASSES>
<JAVADOC>
<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!/" />
</JAVADOC>
<SOURCES>
<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!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
......@@ -6,6 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="MYLO" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="info" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
......@@ -26,7 +27,7 @@
<component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_28" />
<component name="ExecutionTargetManager" SELECTED_TARGET="ce12160cc327c64005" />
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
......@@ -56,8 +57,8 @@
<entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<caret line="29" column="51" lean-forward="true" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" />
<state relative-caret-position="233">
<caret line="37" column="45" selection-start-line="37" selection-start-column="45" selection-end-line="37" selection-end-column="45" />
</state>
</provider>
</entry>
......@@ -65,12 +66,50 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="16">
<caret line="234" lean-forward="true" selection-start-line="234" selection-end-line="234" />
<state relative-caret-position="179">
<caret line="433" column="76" lean-forward="true" selection-start-line="433" selection-start-column="76" selection-end-line="433" selection-end-column="76" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#10779#11051#0" expanded="true" />
<element signature="e#11050#11051#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/android/content/Intent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="10491" selection-start-line="10491" selection-end-line="10491" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551">
<caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3477">
<caret line="207" selection-start-line="207" selection-end-line="207" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="950">
<caret line="58" selection-start-line="58" selection-end-line="58" />
<folding>
<element signature="e#1161#1162#0" expanded="true" />
<element signature="e#1209#1210#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -79,8 +118,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" selection-start-line="20" selection-end-line="20" />
<state relative-caret-position="247">
<caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -110,12 +149,15 @@
<component name="FindInProjectRecents">
<findStrings>
<find>tag</find>
<find>alert</find>
<find>startLoading</find>
<find>sdca</find>
<find>/mnt/sdcard</find>
<find>getPhoto</find>
<find>alert</find>
<find>socket</find>
<find>oncreate</find>
<find>finish</find>
<find>copyFile</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -126,10 +168,10 @@
<list>
<option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" />
<option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" />
<option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" />
<option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" />
</list>
</option>
......@@ -202,13 +244,35 @@
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_61_jar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_3_61_jar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__org_nanohttpd_nanohttpd_2_3_1_jar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_1_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_0_5_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_3_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_4_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__androidx_browser_browser_1_0_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_auth_api_phone_17_4_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_17_1_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_1_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_safetynet_17_0_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_17_0_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_annotations_16_0_0_jar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_20_0_4_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_19_0_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_19_5_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_components_16_1_0_aar.xml" />
<option value="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_storage_19_2_2_aar.xml" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="705" />
<option name="width" value="1225" />
<option name="height" value="1049" />
<option name="x" value="951" />
<option name="width" value="978" />
<option name="height" value="1039" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
......@@ -216,6 +280,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="AndroidView">
<subPane>
<expand>
......@@ -226,35 +291,7 @@
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
</path>
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="dataextraction" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java (generated)" type="edd41e36:AndroidSourceTypeNode" />
</path>
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java (generated)" type="edd41e36:AndroidSourceTypeNode" />
<item name="test" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="res" type="d4f16f75:AndroidResFolderNode" />
</path>
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="res" type="d4f16f75:AndroidResFolderNode" />
<item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
<item name="manifests" type="f94875db:AndroidManifestsGroupNode" />
</path>
<path>
<item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
......@@ -264,9 +301,8 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -377,7 +413,7 @@
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.07114094" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.19261745" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" />
......@@ -386,14 +422,14 @@
<window_info id="Resources Explorer" order="7" />
<window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32765958" />
<window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" visible="true" weight="0.32056737" />
<window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" visible="true" weight="0.31914893" />
<window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.32907802" />
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49731544" weight="0.32907802" />
<window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50345623" side_tool="true" weight="0.3186969" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50201344" side_tool="true" weight="0.3248227" />
<window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49932885" weight="0.32907802" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.3248227" />
<window_info anchor="bottom" id="Android Profiler" order="8" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49798658" weight="0.3248227" />
<window_info anchor="bottom" id="Android Profiler" order="8" weight="0.32907802" />
<window_info anchor="bottom" id="Find" order="9" />
<window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.2872483" />
<window_info anchor="right" id="Capture Analysis" order="1" />
......@@ -401,6 +437,7 @@
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="right" id="Preview" order="4" />
<window_info anchor="right" id="Palette&#9;" order="5" />
<window_info anchor="right" id="Assistant" order="6" weight="0.357047" />
</layout>
<layout-to-restore>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
......@@ -496,13 +533,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="27" column="60" selection-start-line="27" selection-start-column="60" selection-end-line="27" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/SMSDataBase.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
......@@ -583,18 +613,35 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<entry file="file://$PROJECT_DIR$/build/generated/source/buildConfig/androidTest/debug/com/example/dataextraction/test/BuildConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<caret line="29" column="51" lean-forward="true" selection-start-line="29" selection-start-column="51" selection-end-line="29" selection-end-column="51" />
<state relative-caret-position="57">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build/generated/source/buildConfig/androidTest/debug/com/example/dataextraction/test/BuildConfig.java">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
<state relative-caret-position="551">
<caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
</state>
</provider>
</entry>
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3477">
<caret line="207" selection-start-line="207" selection-end-line="207" />
</state>
</provider>
</entry>
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="950">
<caret line="58" selection-start-line="58" selection-end-line="58" />
<folding>
<element signature="e#1161#1162#0" expanded="true" />
<element signature="e#1209#1210#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -606,24 +653,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="37" column="45" selection-start-line="37" selection-start-column="45" selection-end-line="37" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" selection-start-line="20" selection-end-line="20" />
<state relative-caret-position="247">
<caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/android/content/Intent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="10491" selection-start-line="10491" selection-end-line="10491" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="16">
<caret line="234" lean-forward="true" selection-start-line="234" selection-end-line="234" />
<state relative-caret-position="179">
<caret line="433" column="76" lean-forward="true" selection-start-line="433" selection-start-column="76" selection-end-line="433" selection-end-column="76" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#10779#11051#0" expanded="true" />
<element signature="e#11050#11051#0" expanded="true" />
</folding>
</state>
</provider>
......
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
android {
compileSdkVersion 29
......@@ -26,9 +27,38 @@ dependencies {
implementation 'me.jahnen:libaums:0.8.0'
implementation 'me.jahnen:libaums-httpserver:0.5.3'
implementation 'me.jahnen:libaums-storageprovider:0.5.1'
implementation platform('com.google.firebase:firebase-bom:27.1.0')
implementation 'com.google.firebase:firebase-storage:16.0.4'
implementation 'com.google.firebase:firebase-auth:16.0.5'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
implementation group: 'io.socket', name: 'socket.io-client', version: '1.0.0'
}
buildscript {
repositories {
google()
//jcenter()
jcenter {url 'https://dl.bintray.com/android/android-tools'}
jcenter {url 'https://firebase.bintray.com/gradle'}
mavenCentral ()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.google.firebase:firebase-plugins:1.1.5'
}
}
allprojects {
repositories {
google()
//jcenter()
jcenter {url 'https://dl.bintray.com/android/android-tools'}
jcenter {url 'https://firebase.bintray.com/gradle'}
mavenCentral ()
}
}
\ No newline at end of file
......
{
"project_info": {
"project_number": "606422301569",
"project_id": "capstone2-1e126",
"storage_bucket": "capstone2-1e126.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:606422301569:android:cdb3484fc2a653fa620680",
"android_client_info": {
"package_name": "com.example.dataextraction"
}
},
"oauth_client": [
{
"client_id": "606422301569-8b41bkeu0mckoidr8sv0nc88u193bcvt.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAh9wIKK8XmgdcPRfe_GV1r2uvhnB8v5KU"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "606422301569-8b41bkeu0mckoidr8sv0nc88u193bcvt.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
\ No newline at end of file
......@@ -46,6 +46,8 @@ import android.widget.Toast;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
......@@ -55,6 +57,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.InetAddress;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
......@@ -68,6 +71,8 @@ import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import com.google.gson.JsonObject;
import org.json.JSONException;
......@@ -276,7 +281,6 @@ public class LoadingActivity extends Activity {
@Override
public void run() {
makeTXT();
copyFile("/mnt/sdcard/TempTEMP/", "df.txt", "/mnt/media_rw/5822-DED4/Filefile/");
dbHelper = new DBHelper(getApplicationContext());
dbHelper.open();
......@@ -353,9 +357,16 @@ public class LoadingActivity extends Activity {
copyFile("/data/data/com.example.dataextraction/databases/", "InnerDatabase.db", "/sdcard/TempTEMP/");
copyFile("/data/data/com.example.dataextraction/databases/", "networkDatabase.db", "/sdcard/TempTEMP/");
goMainActivity();
//finish();
//startActivity(new Intent(LoadingActivity.this, MainActivity.class));
try {
Thread.sleep(1000000);
} catch (InterruptedException e) {
e.printStackTrace();
}
finish();
//alert("end", "end");
}
......@@ -419,6 +430,10 @@ public class LoadingActivity extends Activity {
};
}
public void goMainActivity() {
startActivity(new Intent(LoadingActivity.this, MainActivity.class));
}
public void getDocument() {
String[] projection = {
......
package com.example.dataextraction;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import com.google.firebase.storage.UploadTask;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
// 안드로이드 스튜디오 내에서 로그인 후 진행해야함
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
FirebaseStorage storage = FirebaseStorage.getInstance();
StorageReference storageRef = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "InnerDB2.db");
Uri file = Uri.fromFile(new File("/sdcard/TempTEMP/InnerDatabase.db"));
storageRef.putFile(file)
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
Log.i("MYLOG", "SUCCESS");
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception exception) {
// Handle unsuccessful uploads
// ...
}
});
private void copyFile(String inputPath, String inputFile, String outputPath) {
StorageReference storageRef2 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "networkDB2.db");
Uri file2 = Uri.fromFile(new File("/sdcard/TempTEMP/networkDatabase.db"));
InputStream in = null;
OutputStream out = null;
try {
storageRef2.putFile(file2)
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
Log.i("MYLOG", "SUCCESS");
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception exception) {
// Handle unsuccessful uploads
// ...
}
});
//create output directory if it doesn't exist
File dir = new File (outputPath);
if (!dir.exists())
{
dir.mkdirs();
StorageReference storageRef3 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "netstat.txt");
Uri file3 = Uri.fromFile(new File("/sdcard/TempTEMP/netstat.txt"));
storageRef3.putFile(file3)
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
Log.i("MYLOG", "SUCCESS");
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception exception) {
// Handle unsuccessful uploads
// ...
}
});
in = new FileInputStream(inputPath + inputFile);
out = new FileOutputStream(outputPath + inputFile);
StorageReference storageRef4 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "df.txt");
Uri file4 = Uri.fromFile(new File("/sdcard/TempTEMP/df.txt"));
byte[] buffer = new byte[1024];
int read;
while ((read = in.read(buffer)) != -1) {
out.write(buffer, 0, read);
storageRef4.putFile(file4)
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
Log.i("MYLOG", "SUCCESS");
}
in.close();
in = null;
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception exception) {
// Handle unsuccessful uploads
// ...
}
});
// write the output file (You have now copied the file)
out.flush();
out.close();
out = null;
StorageReference storageRef5 = storage.getReferenceFromUrl("gs://capstone2-1e126.appspot.com").child("db/" + "uptime.txt");
Uri file5 = Uri.fromFile(new File("/sdcard/TempTEMP/uptime.txt"));
} catch (FileNotFoundException fnfe1) {
Log.e("tag", fnfe1.getMessage());
storageRef5.putFile(file5)
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
Log.i("MYLOG", "SUCCESS");
}
catch (Exception e) {
Log.e("tag", e.getMessage());
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception exception) {
// Handle unsuccessful uploads
// ...
}
});
}
}
......