2021-1-capstone-design2 / 2017103957

Go to a project
Toggle navigation Toggle navigation pinning
김가영
044d8e1c 1 parent 0e49901b

meeting report and source update

Inline Side-by-side
Showing 5 changed files with 311 additions and 207 deletions
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
6 </shared> 6 </shared>
7 </component> 7 </component>
8 <component name="AndroidLogFilters"> 8 <component name="AndroidLogFilters">
9 - <option name="TOOL_WINDOW_CUSTOM_FILTER" value="MYLOG" />
10 <option name="TOOL_WINDOW_LOG_LEVEL" value="info" /> 9 <option name="TOOL_WINDOW_LOG_LEVEL" value="info" />
11 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> 10 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
12 </component> 11 </component>
...@@ -54,69 +53,34 @@ ...@@ -54,69 +53,34 @@
54 <component name="FileEditorManager"> 53 <component name="FileEditorManager">
55 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 54 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
56 <file pinned="false" current-in-tab="false"> 55 <file pinned="false" current-in-tab="false">
57 - <entry file="file://$PROJECT_DIR$/build.gradle">
58 - <provider selected="true" editor-type-id="text-editor">
59 - <state relative-caret-position="513">
60 - <caret line="27" column="60" selection-start-line="27" selection-start-column="60" selection-end-line="27" selection-end-column="60" />
61 - </state>
62 - </provider>
63 - </entry>
64 - </file>
65 - <file pinned="false" current-in-tab="false">
66 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml"> 56 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
67 - <provider selected="true" editor-type-id="text-editor">
68 - <state relative-caret-position="76">
69 - <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
70 - </state>
71 - </provider>
72 <provider editor-type-id="android-manifest" /> 57 <provider editor-type-id="android-manifest" />
73 - </entry>
74 - </file>
75 - <file pinned="false" current-in-tab="false">
76 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/SMSDataBase.java">
77 <provider selected="true" editor-type-id="text-editor"> 58 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="76"> 59 + <state relative-caret-position="397">
79 - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> 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" />
80 </state> 61 </state>
81 </provider> 62 </provider>
82 </entry> 63 </entry>
83 </file> 64 </file>
84 - <file pinned="false" current-in-tab="false"> 65 + <file pinned="false" current-in-tab="true">
85 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/networkDBHelper.java"> 66 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
86 - <provider selected="true" editor-type-id="text-editor">
87 - <state relative-caret-position="76">
88 - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
89 - </state>
90 - </provider>
91 - </entry>
92 - </file>
93 - <file pinned="false" current-in-tab="false">
94 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
95 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
96 - <state relative-caret-position="239"> 68 + <state relative-caret-position="16">
97 - <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" /> 69 + <caret line="234" lean-forward="true" selection-start-line="234" selection-end-line="234" />
98 <folding> 70 <folding>
99 <element signature="imports" expanded="true" /> 71 <element signature="imports" expanded="true" />
72 + <element signature="e#10779#11051#0" expanded="true" />
73 + <element signature="e#11050#11051#0" expanded="true" />
100 </folding> 74 </folding>
101 </state> 75 </state>
102 </provider> 76 </provider>
103 </entry> 77 </entry>
104 </file> 78 </file>
105 - <file pinned="false" current-in-tab="true">
106 - <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml">
107 - <provider editor-type-id="android-designer2" />
108 - <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="266">
110 - <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
111 - </state>
112 - </provider>
113 - </entry>
114 - </file>
115 <file pinned="false" current-in-tab="false"> 79 <file pinned="false" current-in-tab="false">
116 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java"> 80 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
117 <provider selected="true" editor-type-id="text-editor"> 81 <provider selected="true" editor-type-id="text-editor">
118 - <state relative-caret-position="-763"> 82 + <state relative-caret-position="380">
119 - <caret line="270" selection-start-line="270" selection-end-line="270" /> 83 + <caret line="20" selection-start-line="20" selection-end-line="20" />
120 <folding> 84 <folding>
121 <element signature="imports" expanded="true" /> 85 <element signature="imports" expanded="true" />
122 </folding> 86 </folding>
...@@ -125,10 +89,11 @@ ...@@ -125,10 +89,11 @@
125 </entry> 89 </entry>
126 </file> 90 </file>
127 <file pinned="false" current-in-tab="false"> 91 <file pinned="false" current-in-tab="false">
128 - <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/io/BufferedReader.java"> 92 + <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml">
93 + <provider editor-type-id="android-designer2" />
129 <provider selected="true" editor-type-id="text-editor"> 94 <provider selected="true" editor-type-id="text-editor">
130 - <state relative-caret-position="127"> 95 + <state relative-caret-position="475">
131 - <caret line="399" selection-start-line="399" selection-end-line="399" /> 96 + <caret line="25" selection-start-line="25" selection-end-line="25" />
132 </state> 97 </state>
133 </provider> 98 </provider>
134 </entry> 99 </entry>
...@@ -147,9 +112,10 @@ ...@@ -147,9 +112,10 @@
147 <find>tag</find> 112 <find>tag</find>
148 <find>alert</find> 113 <find>alert</find>
149 <find>startLoading</find> 114 <find>startLoading</find>
150 - <find>getPhoto</find>
151 <find>sdca</find> 115 <find>sdca</find>
152 <find>/mnt/sdcard</find> 116 <find>/mnt/sdcard</find>
117 + <find>getPhoto</find>
118 + <find>finish</find>
153 </findStrings> 119 </findStrings>
154 </component> 120 </component>
155 <component name="Git.Settings"> 121 <component name="Git.Settings">
...@@ -161,8 +127,8 @@ ...@@ -161,8 +127,8 @@
161 <option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" /> 127 <option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" />
162 <option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" /> 128 <option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" />
163 <option value="$PROJECT_DIR$/build.gradle" /> 129 <option value="$PROJECT_DIR$/build.gradle" />
164 - <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" />
165 <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" /> 130 <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
131 + <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" />
166 <option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" /> 132 <option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" />
167 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" /> 133 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" />
168 </list> 134 </list>
...@@ -240,9 +206,9 @@ ...@@ -240,9 +206,9 @@
240 </option> 206 </option>
241 </component> 207 </component>
242 <component name="ProjectFrameBounds" extendedState="6"> 208 <component name="ProjectFrameBounds" extendedState="6">
243 - <option name="x" value="952" /> 209 + <option name="x" value="705" />
244 - <option name="width" value="977" /> 210 + <option name="width" value="1225" />
245 - <option name="height" value="1038" /> 211 + <option name="height" value="1049" />
246 </component> 212 </component>
247 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 213 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
248 <component name="ProjectView"> 214 <component name="ProjectView">
...@@ -250,20 +216,57 @@ ...@@ -250,20 +216,57 @@
250 <foldersAlwaysOnTop value="true" /> 216 <foldersAlwaysOnTop value="true" />
251 </navigator> 217 </navigator>
252 <panes> 218 <panes>
253 - <pane id="PackagesPane" />
254 - <pane id="ProjectPane" />
255 - <pane id="Scope" />
256 <pane id="AndroidView"> 219 <pane id="AndroidView">
257 <subPane> 220 <subPane>
258 <expand> 221 <expand>
259 <path> 222 <path>
260 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" /> 223 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
224 + <item name="app" type="feadf853:AndroidModuleNode" />
225 + </path>
226 + <path>
227 + <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
228 + <item name="app" type="feadf853:AndroidModuleNode" />
229 + <item name="java" type="edd41e36:AndroidSourceTypeNode" />
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>
259 + <path>
260 + <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
261 <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" /> 261 <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
262 </path> 262 </path>
263 </expand> 263 </expand>
264 <select /> 264 <select />
265 </subPane> 265 </subPane>
266 </pane> 266 </pane>
267 + <pane id="Scope" />
268 + <pane id="PackagesPane" />
269 + <pane id="ProjectPane" />
267 </panes> 270 </panes>
268 </component> 271 </component>
269 <component name="PropertiesComponent"> 272 <component name="PropertiesComponent">
...@@ -374,7 +377,7 @@ ...@@ -374,7 +377,7 @@
374 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 377 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
375 <layout> 378 <layout>
376 <window_info id="Captures" order="0" side_tool="true" weight="0.25" /> 379 <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
377 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.14899328" /> 380 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.07114094" />
378 <window_info id="Structure" order="2" side_tool="true" /> 381 <window_info id="Structure" order="2" side_tool="true" />
379 <window_info id="Favorites" order="3" side_tool="true" /> 382 <window_info id="Favorites" order="3" side_tool="true" />
380 <window_info id="Build Variants" order="4" side_tool="true" /> 383 <window_info id="Build Variants" order="4" side_tool="true" />
...@@ -383,7 +386,7 @@ ...@@ -383,7 +386,7 @@
383 <window_info id="Resources Explorer" order="7" /> 386 <window_info id="Resources Explorer" order="7" />
384 <window_info id="Capture Tool" order="8" /> 387 <window_info id="Capture Tool" order="8" />
385 <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32765958" /> 388 <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32765958" />
386 - <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" weight="0.32056737" /> 389 + <window_info active="true" anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" visible="true" weight="0.32056737" />
387 <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" /> 390 <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" />
388 <window_info anchor="bottom" id="Debug" order="3" weight="0.32907802" /> 391 <window_info anchor="bottom" id="Debug" order="3" weight="0.32907802" />
389 <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" /> 392 <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" />
...@@ -392,7 +395,7 @@ ...@@ -392,7 +395,7 @@
392 <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.3248227" /> 395 <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.3248227" />
393 <window_info anchor="bottom" id="Android Profiler" order="8" /> 396 <window_info anchor="bottom" id="Android Profiler" order="8" />
394 <window_info anchor="bottom" id="Find" order="9" /> 397 <window_info anchor="bottom" id="Find" order="9" />
395 - <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.3295302" /> 398 + <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.2872483" />
396 <window_info anchor="right" id="Capture Analysis" order="1" /> 399 <window_info anchor="right" id="Capture Analysis" order="1" />
397 <window_info anchor="right" id="Gradle" order="2" sideWeight="0.3319239" weight="0.3295302" /> 400 <window_info anchor="right" id="Gradle" order="2" sideWeight="0.3319239" weight="0.3295302" />
398 <window_info anchor="right" id="Theme Preview" order="3" /> 401 <window_info anchor="right" id="Theme Preview" order="3" />
...@@ -427,18 +430,6 @@ ...@@ -427,18 +430,6 @@
427 <window_info anchor="right" id="Palette&#9;" order="5" /> 430 <window_info anchor="right" id="Palette&#9;" order="5" />
428 </layout-to-restore> 431 </layout-to-restore>
429 </component> 432 </component>
430 - <component name="XDebuggerManager">
431 - <breakpoint-manager>
432 - <breakpoints>
433 - <line-breakpoint enabled="true" type="java-line">
434 - <url>file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java</url>
435 - <line>172</line>
436 - <properties />
437 - <option name="timeStamp" value="2" />
438 - </line-breakpoint>
439 - </breakpoints>
440 - </breakpoint-manager>
441 - </component>
442 <component name="editorHistoryManager"> 433 <component name="editorHistoryManager">
443 <entry file="file://$PROJECT_DIR$/src/main/res/xml/network_security_config.xml"> 434 <entry file="file://$PROJECT_DIR$/src/main/res/xml/network_security_config.xml">
444 <provider editor-type-id="android-designer2" /> 435 <provider editor-type-id="android-designer2" />
...@@ -448,13 +439,6 @@ ...@@ -448,13 +439,6 @@
448 </state> 439 </state>
449 </provider> 440 </provider>
450 </entry> 441 </entry>
451 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/ContactDataBase.java">
452 - <provider selected="true" editor-type-id="text-editor">
453 - <state relative-caret-position="76">
454 - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
455 - </state>
456 - </provider>
457 - </entry>
458 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/calendarItem.java"> 442 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/calendarItem.java">
459 <provider selected="true" editor-type-id="text-editor"> 443 <provider selected="true" editor-type-id="text-editor">
460 <state relative-caret-position="76"> 444 <state relative-caret-position="76">
...@@ -462,23 +446,6 @@ ...@@ -462,23 +446,6 @@
462 </state> 446 </state>
463 </provider> 447 </provider>
464 </entry> 448 </entry>
465 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/Databases.java">
466 - <provider selected="true" editor-type-id="text-editor">
467 - <state relative-caret-position="95">
468 - <caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
469 - <folding>
470 - <element signature="imports" expanded="true" />
471 - </folding>
472 - </state>
473 - </provider>
474 - </entry>
475 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/DBHelper.java">
476 - <provider selected="true" editor-type-id="text-editor">
477 - <state relative-caret-position="665">
478 - <caret line="42" column="29" selection-start-line="42" selection-start-column="29" selection-end-line="42" selection-end-column="29" />
479 - </state>
480 - </provider>
481 - </entry>
482 <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-29/android.jar!/android/Manifest.class"> 449 <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-29/android.jar!/android/Manifest.class">
483 <provider selected="true" editor-type-id="text-editor"> 450 <provider selected="true" editor-type-id="text-editor">
484 <state relative-caret-position="52"> 451 <state relative-caret-position="52">
...@@ -543,53 +510,121 @@ ...@@ -543,53 +510,121 @@
543 </state> 510 </state>
544 </provider> 511 </provider>
545 </entry> 512 </entry>
546 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/networkDBHelper.java"> 513 + <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/io/BufferedReader.java">
514 + <provider selected="true" editor-type-id="text-editor">
515 + <state relative-caret-position="6992">
516 + <caret line="399" selection-start-line="399" selection-end-line="399" />
517 + </state>
518 + </provider>
519 + </entry>
520 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/PhotoDataBase.java">
547 <provider selected="true" editor-type-id="text-editor"> 521 <provider selected="true" editor-type-id="text-editor">
548 <state relative-caret-position="76"> 522 <state relative-caret-position="76">
549 - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> 523 + <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
550 </state> 524 </state>
551 </provider> 525 </provider>
552 </entry> 526 </entry>
553 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java"> 527 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/Databases.java">
554 <provider selected="true" editor-type-id="text-editor"> 528 <provider selected="true" editor-type-id="text-editor">
555 - <state relative-caret-position="239"> 529 + <state relative-caret-position="-2557">
556 - <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" /> 530 + <caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
557 <folding> 531 <folding>
558 <element signature="imports" expanded="true" /> 532 <element signature="imports" expanded="true" />
559 </folding> 533 </folding>
560 </state> 534 </state>
561 </provider> 535 </provider>
562 </entry> 536 </entry>
563 - <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/io/BufferedReader.java"> 537 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/ContactDataBase.java">
564 <provider selected="true" editor-type-id="text-editor"> 538 <provider selected="true" editor-type-id="text-editor">
565 - <state relative-caret-position="127"> 539 + <state relative-caret-position="76">
566 - <caret line="399" selection-start-line="399" selection-end-line="399" /> 540 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
567 </state> 541 </state>
568 </provider> 542 </provider>
569 </entry> 543 </entry>
570 - <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml"> 544 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/CallLogDataBase.java">
571 <provider selected="true" editor-type-id="text-editor"> 545 <provider selected="true" editor-type-id="text-editor">
572 <state relative-caret-position="76"> 546 <state relative-caret-position="76">
573 - <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" /> 547 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
548 + </state>
549 + </provider>
550 + </entry>
551 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/CalendarDataBase.java">
552 + <provider selected="true" editor-type-id="text-editor">
553 + <state relative-caret-position="76">
554 + <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
555 + </state>
556 + </provider>
557 + </entry>
558 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/AudioDataBase.java">
559 + <provider selected="true" editor-type-id="text-editor">
560 + <state relative-caret-position="-163">
561 + <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
574 </state> 562 </state>
575 </provider> 563 </provider>
564 + </entry>
565 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/DBHelper.java">
566 + <provider selected="true" editor-type-id="text-editor">
567 + <state relative-caret-position="437">
568 + <caret line="42" column="29" selection-start-line="42" selection-start-column="29" selection-end-line="42" selection-end-column="29" />
569 + </state>
570 + </provider>
571 + </entry>
572 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/networkDBHelper.java">
573 + <provider selected="true" editor-type-id="text-editor">
574 + <state relative-caret-position="285">
575 + <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
576 + </state>
577 + </provider>
578 + </entry>
579 + <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/android/os/StrictMode.java">
580 + <provider selected="true" editor-type-id="text-editor">
581 + <state relative-caret-position="445">
582 + <caret line="1454" selection-start-line="1454" selection-end-line="1454" />
583 + </state>
584 + </provider>
585 + </entry>
586 + <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
576 <provider editor-type-id="android-manifest" /> 587 <provider editor-type-id="android-manifest" />
588 + <provider selected="true" editor-type-id="text-editor">
589 + <state relative-caret-position="397">
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" />
591 + </state>
592 + </provider>
577 </entry> 593 </entry>
578 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java"> 594 + <entry file="file://$PROJECT_DIR$/build/generated/source/buildConfig/androidTest/debug/com/example/dataextraction/test/BuildConfig.java">
595 + <provider selected="true" editor-type-id="text-editor">
596 + <state relative-caret-position="57">
597 + <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
598 + </state>
599 + </provider>
600 + </entry>
601 + <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml">
602 + <provider editor-type-id="android-designer2" />
579 <provider selected="true" editor-type-id="text-editor"> 603 <provider selected="true" editor-type-id="text-editor">
580 - <state relative-caret-position="-763"> 604 + <state relative-caret-position="475">
581 - <caret line="270" selection-start-line="270" selection-end-line="270" /> 605 + <caret line="25" selection-start-line="25" selection-end-line="25" />
606 + </state>
607 + </provider>
608 + </entry>
609 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
610 + <provider selected="true" editor-type-id="text-editor">
611 + <state relative-caret-position="380">
612 + <caret line="20" selection-start-line="20" selection-end-line="20" />
582 <folding> 613 <folding>
583 <element signature="imports" expanded="true" /> 614 <element signature="imports" expanded="true" />
584 </folding> 615 </folding>
585 </state> 616 </state>
586 </provider> 617 </provider>
587 </entry> 618 </entry>
588 - <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml"> 619 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
589 - <provider editor-type-id="android-designer2" />
590 <provider selected="true" editor-type-id="text-editor"> 620 <provider selected="true" editor-type-id="text-editor">
591 - <state relative-caret-position="266"> 621 + <state relative-caret-position="16">
592 - <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" /> 622 + <caret line="234" lean-forward="true" selection-start-line="234" selection-end-line="234" />
623 + <folding>
624 + <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>
593 </state> 628 </state>
594 </provider> 629 </provider>
595 </entry> 630 </entry>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
27 android:roundIcon="@mipmap/ic_launcher_round" 27 android:roundIcon="@mipmap/ic_launcher_round"
28 android:supportsRtl="true" 28 android:supportsRtl="true"
29 android:networkSecurityConfig="@xml/network_security_config" 29 android:networkSecurityConfig="@xml/network_security_config"
30 + android:requestLegacyExternalStorage="true"
30 android:theme="@style/AppTheme"> 31 android:theme="@style/AppTheme">
31 <activity android:name=".LoadingActivity"> 32 <activity android:name=".LoadingActivity">
32 <intent-filter> 33 <intent-filter>
......
...@@ -41,6 +41,7 @@ import android.provider.UserDictionary; ...@@ -41,6 +41,7 @@ import android.provider.UserDictionary;
41 import android.telephony.TelephonyManager; 41 import android.telephony.TelephonyManager;
42 import android.util.Log; 42 import android.util.Log;
43 import android.widget.ProgressBar; 43 import android.widget.ProgressBar;
44 +import android.widget.TextView;
44 import android.widget.Toast; 45 import android.widget.Toast;
45 46
46 import java.io.BufferedReader; 47 import java.io.BufferedReader;
...@@ -71,6 +72,7 @@ import com.google.gson.JsonObject; ...@@ -71,6 +72,7 @@ import com.google.gson.JsonObject;
71 72
72 import org.json.JSONException; 73 import org.json.JSONException;
73 import org.json.JSONObject; 74 import org.json.JSONObject;
75 +import org.w3c.dom.Text;
74 76
75 import io.socket.client.IO; 77 import io.socket.client.IO;
76 import io.socket.client.Socket; 78 import io.socket.client.Socket;
...@@ -80,7 +82,9 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; ...@@ -80,7 +82,9 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
80 public class LoadingActivity extends Activity { 82 public class LoadingActivity extends Activity {
81 83
82 private Socket socket; 84 private Socket socket;
83 - private ProgressBar bar; 85 + public ProgressBar bar;
86 + TextView progressText;
87 + TextView dataListText;
84 DBHelper dbHelper; 88 DBHelper dbHelper;
85 89
86 String[] permission_list = { 90 String[] permission_list = {
...@@ -105,6 +109,8 @@ public class LoadingActivity extends Activity { ...@@ -105,6 +109,8 @@ public class LoadingActivity extends Activity {
105 super.onCreate(savedInstanceState); 109 super.onCreate(savedInstanceState);
106 setContentView(R.layout.activity_loading); 110 setContentView(R.layout.activity_loading);
107 bar = (ProgressBar) findViewById(R.id.simpleProgressBar); 111 bar = (ProgressBar) findViewById(R.id.simpleProgressBar);
112 + progressText = (TextView) findViewById(R.id.textView);
113 + dataListText = (TextView) findViewById(R.id.textView2);
108 } 114 }
109 115
110 @Override 116 @Override
...@@ -131,8 +137,11 @@ public class LoadingActivity extends Activity { ...@@ -131,8 +137,11 @@ public class LoadingActivity extends Activity {
131 // e.printStackTrace(); 137 // e.printStackTrace();
132 // Log.i("SOCKET", "Not Connected"); 138 // Log.i("SOCKET", "Not Connected");
133 // } 139 // }
140 + BackThread thread = new BackThread();
141 + thread.setDaemon(true);
142 + thread.start();
143 + bar.setMax(140);
134 144
135 - startLoading();
136 } 145 }
137 } 146 }
138 } 147 }
...@@ -263,69 +272,151 @@ public class LoadingActivity extends Activity { ...@@ -263,69 +272,151 @@ public class LoadingActivity extends Activity {
263 } 272 }
264 } 273 }
265 274
266 - private void startLoading() { 275 + class BackThread extends Thread {
267 - Handler handler = new Handler(); 276 + @Override
268 - handler.postDelayed(new Runnable() { 277 + public void run() {
278 + makeTXT();
279 + copyFile("/mnt/sdcard/TempTEMP/", "df.txt", "/mnt/media_rw/5822-DED4/Filefile/");
280 +
281 + dbHelper = new DBHelper(getApplicationContext());
282 + dbHelper.open();
283 +
284 + getPhoto();
285 + //alert("alert","photo");
286 + Log.i("MYLOG", "DB HY Part:1/14");
287 + handler.sendEmptyMessage(10);
288 +
289 + getVideo();
290 + //alert("alert","video");
291 + Log.i("MYLOG", "DB HY Part:2/14");
292 + handler.sendEmptyMessage(20);
293 + getAudio();
294 + //alert("alert","audio");
295 + Log.i("MYLOG", "DB HY Part:3/14");
296 + handler.sendEmptyMessage(30);
297 +
298 + getCalendarInfo();
299 + //alert("alert","calendar");
300 + Log.i("MYLOG", "DB HY Part:4/14");
301 + handler.sendEmptyMessage(40);
302 +
303 + getNetworkInfo();
304 + //alert("alert","network");
305 + Log.i("MYLOG", "DB HY Part:5/14");
306 + handler.sendEmptyMessage(50);
307 +
308 + getCallLog();
309 + //alert("alert","calllog");
310 + Log.i("MYLOG", "DB YM Part:6/14");
311 + handler.sendEmptyMessage(60);
312 +
313 + getContact();
314 + //alert("alert","contact");
315 + Log.i("MYLOG", "DB YM Part:7/14");
316 + handler.sendEmptyMessage(70);
317 +
318 + getSMSMessage();
319 + //alert("alert","sms");
320 + Log.i("MYLOG", "DB YM Part:8/14");
321 + handler.sendEmptyMessage(80);
322 +
323 + getWIFI();
324 + //alert("alert","wifi");
325 + Log.i("MYLOG", "DB YM Part:9/14");
326 + handler.sendEmptyMessage(90);
327 +
328 + getPhoneInfo();
329 + //alert("alert","phoneinfo");
330 + Log.i("MYLOG", "DB YY Part:10/14");
331 + handler.sendEmptyMessage(100);
332 +
333 + getAccountInfo();
334 + //alert("alert","accountinfo");
335 + Log.i("MYLOG", "DB YY Part:11/14");
336 + handler.sendEmptyMessage(110);
337 +
338 + getAppInfo();
339 + //alert("alert","appinfo");
340 + Log.i("MYLOG", "DB YY Part:12/14");
341 + handler.sendEmptyMessage(120);
342 +
343 + getUsageStats();
344 + //alert("alert","usagestats");
345 + Log.i("MYLOG", "DB YY Part:13/14");
346 + handler.sendEmptyMessage(130);
347 +
348 + getDocument();
349 + Log.i("MYLOG", "DB YY Part:14/14");
350 + handler.sendEmptyMessage(140);
351 +
352 + dbHelper.close();
353 +
354 + copyFile("/data/data/com.example.dataextraction/databases/", "InnerDatabase.db", "/sdcard/TempTEMP/");
355 + copyFile("/data/data/com.example.dataextraction/databases/", "networkDatabase.db", "/sdcard/TempTEMP/");
356 +
357 + //finish();
358 + //startActivity(new Intent(LoadingActivity.this, MainActivity.class));
359 + //alert("end", "end");
360 +
361 + }
362 +
363 + Handler handler = new Handler(){
269 @Override 364 @Override
270 - public void run() { 365 + public void handleMessage(Message msg) {
271 - makeTXT(); 366 + if(msg.what != 0){ // Message id 가 0 이면
272 - copyFile("/mnt/sdcard/TempTEMP/", "df.txt", "/mnt/media_rw/5822-DED4/"); 367 + bar.setProgress(msg.what); // 메인스레드의 UI 내용 변경
273 - 368 + if(msg.what == 10){
274 - dbHelper = new DBHelper(getApplicationContext()); 369 + dataListText.append("\n사진 데이터 추출 완료\n");
275 - dbHelper.open(); 370 + }
276 - 371 + else if(msg.what == 20){
277 - getPhoto(); 372 + dataListText.append("\n비디오 데이터 추출 완료\n");
278 - //alert("alert","photo"); 373 + }
279 - Log.i("MYLOG", "DB HY Part:1/14"); 374 + else if(msg.what == 30){
280 - 375 + dataListText.append("\n오디오 데이터 추출 완료\n");
281 - getVideo(); 376 + }
282 - //alert("alert","video"); 377 + else if(msg.what == 40){
283 - Log.i("MYLOG", "DB HY Part:2/14"); 378 + dataListText.append("\n캘린더 데이터 추출 완료\n");
284 - getAudio(); 379 + }
285 - //alert("alert","audio"); 380 + else if(msg.what == 50){
286 - Log.i("MYLOG", "DB HY Part:3/14"); 381 + dataListText.append("\n네트워크 데이터 추출 완료\n");
287 - getCalendarInfo(); 382 + }
288 - //alert("alert","calendar"); 383 + else if(msg.what == 60){
289 - Log.i("MYLOG", "DB HY Part:4/14"); 384 + dataListText.append("\n통화 데이터 추출 완료\n");
290 - getNetworkInfo(); 385 + }
291 - //alert("alert","network"); 386 + else if(msg.what == 70){
292 - Log.i("MYLOG", "DB HY Part:5/14"); 387 + dataListText.append("\n연락처 데이터 추출 완료\n");
293 - 388 + }
294 - getCallLog(); 389 + else if(msg.what == 80){
295 - //alert("alert","calllog"); 390 + dataListText.append("\n문자 데이터 추출 완료\n");
296 - Log.i("MYLOG", "DB YM Part:6/14"); 391 + }
297 - getContact(); 392 + else if(msg.what == 90){
298 - //alert("alert","contact"); 393 + dataListText.append("\n와이파이 데이터 추출 완료\n");
299 - Log.i("MYLOG", "DB YM Part:7/14"); 394 + }
300 - getSMSMessage(); 395 + else if(msg.what == 100){
301 - //alert("alert","sms"); 396 + dataListText.append("\n스마트폰 정보 데이터 추출 완료\n");
302 - Log.i("MYLOG", "DB YM Part:8/14"); 397 + }
303 - getWIFI(); 398 + else if(msg.what == 110){
304 - //alert("alert","wifi"); 399 + dataListText.append("\n계정 데이터 추출 완료\n");
305 - Log.i("MYLOG", "DB YM Part:9/14"); 400 + }
306 - 401 + else if(msg.what == 120){
307 - getPhoneInfo(); 402 + dataListText.append("\n앱 정보 데이터 추출 완료\n");
308 - //alert("alert","phoneinfo"); 403 + }
309 - Log.i("MYLOG", "DB YY Part:10/14"); 404 + else if(msg.what == 130){
310 - getAccountInfo(); 405 + dataListText.append("\n사용량 데이터 추출 완료\n");
311 - //alert("alert","accountinfo"); 406 + }
312 - Log.i("MYLOG", "DB YY Part:11/14"); 407 + else if(msg.what == 140){
313 - getAppInfo(); 408 + dataListText.append("\n문서 데이터 추출 완료\n");
314 - //alert("alert","appinfo"); 409 + try {
315 - Log.i("MYLOG", "DB YY Part:12/14"); 410 + Thread.sleep(5000);
316 - getUsageStats(); 411 + } catch (InterruptedException e) {
317 - //alert("alert","usagestats"); 412 + e.printStackTrace();
318 - Log.i("MYLOG", "DB YY Part:13/14"); 413 + }
319 - getDocument(); 414 + progressText.setText("모든 데이터 추출 완료 > 내부 저장소의 TempTEMP 폴더를 USB로 이동시키세요.\n");
320 - Log.i("MYLOG", "DB YY Part:14/14"); 415 + }
321 - dbHelper.close();
322 - finish();
323 - startActivity(new Intent(LoadingActivity.this, MainActivity.class));
324 -
325 - //alert("end", "end");
326 416
417 + }
327 } 418 }
328 - }, 2000); 419 + };
329 } 420 }
330 421
331 public void getDocument() { 422 public void getDocument() {
...@@ -648,34 +739,6 @@ public class LoadingActivity extends Activity { ...@@ -648,34 +739,6 @@ public class LoadingActivity extends Activity {
648 } 739 }
649 dbNHelper.close(); 740 dbNHelper.close();
650 } 741 }
651 -// private class GoogleAppIdTask extends AsyncTask<Void, Void, String> {
652 -// protected String doInBackground(final Void... params) {
653 -// String adId = null;
654 -// try {
655 -// AdvertisingIdClient.Info advertisingIdInfo = AdvertisingIdClient.getAdvertisingIdInfo(getApplicationContext());
656 -// adId = advertisingIdInfo.getId();
657 -// if (!advertisingIdInfo.isLimitAdTrackingEnabled())
658 -// Log.d("adid : ", adId);
659 -// } catch (IllegalStateException ex) {
660 -// ex.printStackTrace();
661 -// Log.e("GoogleAppidTask","IllegalStateException");
662 -// } catch (GooglePlayServicesRepairableException ex) {
663 -// ex.printStackTrace();
664 -// Log.e("GoogleAppidTask","GooglePlayServicesRepairable Exception");
665 -// } catch (IOException ex) {
666 -// ex.printStackTrace();
667 -// Log.e("GoogleAppidTask","IOException");
668 -// } catch (GooglePlayServicesNotAvailableException ex) {
669 -// ex.printStackTrace();
670 -// Log.e("GoogleAppidTask","GooglePlayServicesNotAvailableException");
671 -// }
672 -// return adId;
673 -// }
674 -//
675 -// protected void onPostExecute(String adId) {
676 -// //작업 수행
677 -// }
678 -// }
679 742
680 public void getPhoneInfo(){ 743 public void getPhoneInfo(){
681 TelephonyManager tm = (TelephonyManager) getSystemService(TELEPHONY_SERVICE); 744 TelephonyManager tm = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
......
...@@ -18,8 +18,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -18,8 +18,7 @@ public class MainActivity extends AppCompatActivity {
18 super.onCreate(savedInstanceState); 18 super.onCreate(savedInstanceState);
19 setContentView(R.layout.activity_main); 19 setContentView(R.layout.activity_main);
20 20
21 - copyFile("/data/data/com.example.dataextraction/databases/", "InnerDatabase.db", "/sdcard/TestLog/InnerDatabase.db"); 21 +
22 - copyFile("/data/data/com.example.dataextraction/databases/", "networkDatabase.db", "/sdcard/TestLog/networkDatabase.db");
23 } 22 }
24 23
25 private void copyFile(String inputPath, String inputFile, String outputPath) { 24 private void copyFile(String inputPath, String inputFile, String outputPath) {
......
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 + android:layout_gravity="center"
5 xmlns:tools="http://schemas.android.com/tools" 6 xmlns:tools="http://schemas.android.com/tools"
6 android:orientation="vertical"> 7 android:orientation="vertical">
7 <TextView 8 <TextView
8 android:id="@+id/textView" 9 android:id="@+id/textView"
9 android:layout_width="match_parent" 10 android:layout_width="match_parent"
10 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
11 - android:text="CapstoneDesign2" /> 12 + android:text="스마트폰 내의 데이터를 추출합니다." />
12 <ProgressBar 13 <ProgressBar
13 android:id="@+id/simpleProgressBar" 14 android:id="@+id/simpleProgressBar"
14 android:layout_width="match_parent" 15 android:layout_width="match_parent"
...@@ -18,4 +19,9 @@ ...@@ -18,4 +19,9 @@
18 tools:layout_editor_absoluteY="0dp" 19 tools:layout_editor_absoluteY="0dp"
19 tools:layout_editor_absoluteX="8dp" 20 tools:layout_editor_absoluteX="8dp"
20 android:visibility="visible"/> 21 android:visibility="visible"/>
22 + <TextView
23 + android:id="@+id/textView2"
24 + android:layout_width="match_parent"
25 + android:layout_height="wrap_content"
26 + android:text="추출 로그 : \n\n" />
21 </LinearLayout> 27 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......