diff --git a/.gradle/7.5/checksums/checksums.lock b/.gradle/7.5/checksums/checksums.lock deleted file mode 100644 index e3a03fa..0000000 Binary files a/.gradle/7.5/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/7.5/checksums/md5-checksums.bin b/.gradle/7.5/checksums/md5-checksums.bin deleted file mode 100644 index 0934390..0000000 Binary files a/.gradle/7.5/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/7.5/checksums/sha1-checksums.bin b/.gradle/7.5/checksums/sha1-checksums.bin deleted file mode 100644 index bf97ee0..0000000 Binary files a/.gradle/7.5/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index e722ed1..0000000 Binary files a/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/7.5/dependencies-accessors/gc.properties b/.gradle/7.5/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin deleted file mode 100644 index c610d31..0000000 Binary files a/.gradle/7.5/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock deleted file mode 100644 index a773acf..0000000 Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/7.5/fileChanges/last-build.bin b/.gradle/7.5/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/7.5/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin deleted file mode 100644 index a564d46..0000000 Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock deleted file mode 100644 index b93c2ea..0000000 Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin deleted file mode 100644 index c3f9a0a..0000000 Binary files a/.gradle/7.5/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/7.5/gc.properties b/.gradle/7.5/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 9d8502c..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 00a1c7d..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Apr 04 09:59:53 CST 2023 -gradle.version=7.5 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 6709e6d..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe deleted file mode 100644 index 16dca7d..0000000 Binary files a/.gradle/file-system.probe and /dev/null differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7b46144..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index e4719e5..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 54d5acd..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index b6ee58c..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 33 - buildToolsVersion "33.0.2" - useLibrary 'org.apache.http.legacy' - defaultConfig { - applicationId "net.micode.notes" - minSdkVersion 14 - targetSdkVersion 14 - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - android { - packagingOptions - { - exclude'META-INF/DEPENDENCIES' - } - } -} - -dependencies { - implementation fileTree(dir: '/Users/ruhuitong/Documents/xiaomi/httpcomponents-client-4.5.14-bin', include: ['*.aar', '*.jar'], exclude: []) -} diff --git a/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java deleted file mode 100644 index db17690..0000000 --- a/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package net.micode.notes; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String APPLICATION_ID = "net.micode.notes"; - public static final String BUILD_TYPE = "debug"; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "0.1"; -} diff --git a/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json deleted file mode 100644 index 9e26dfe..0000000 --- a/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk deleted file mode 100644 index 24edfa2..0000000 Binary files a/app/build/intermediates/apk/debug/app-debug.apk and /dev/null differ diff --git a/app/build/intermediates/apk/debug/output-metadata.json b/app/build/intermediates/apk/debug/output-metadata.json deleted file mode 100644 index b2231b9..0000000 --- a/app/build/intermediates/apk/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "app-debug.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt deleted file mode 100644 index 46dacc6..0000000 --- a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt +++ /dev/null @@ -1,2 +0,0 @@ -#- File Locator - -listingFile=../../apk/debug/output-metadata.json diff --git a/app/build/intermediates/app_metadata/debug/app-metadata.properties b/app/build/intermediates/app_metadata/debug/app-metadata.properties deleted file mode 100644 index 260f1ee..0000000 --- a/app/build/intermediates/app_metadata/debug/app-metadata.properties +++ /dev/null @@ -1,2 +0,0 @@ -appMetadataVersion=1.1 -androidGradlePluginVersion=7.4.2 diff --git a/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json deleted file mode 100644 index 714f651..0000000 --- a/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "COMPATIBLE_SCREEN_MANIFEST", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [] -} \ No newline at end of file diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar deleted file mode 100644 index a54964f..0000000 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c6cbf17ce8c2758cfe20ec8a6ae6dc1cd36653aff89e6db628e4e3bfd10e3646_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex deleted file mode 100644 index 6f7e6f5..0000000 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out deleted file mode 100644 index a566b38..0000000 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ diff --git a/app/build/intermediates/dex_number_of_buckets_file/debug/out b/app/build/intermediates/dex_number_of_buckets_file/debug/out deleted file mode 100644 index bf0d87a..0000000 --- a/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ /dev/null @@ -1 +0,0 @@ -4 \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state deleted file mode 100644 index 1c983fc..0000000 Binary files a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties deleted file mode 100644 index 0405acf..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Tue Apr 04 11:28:31 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml deleted file mode 100644 index 909509e..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - #335b5b5b33sp26sp20sp17sp14sp - -%s - --%s - --%s - --%s - - Messaging - Email - NotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml deleted file mode 100644 index 4eef298..0000000 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 70f2c43..0000000 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 07622f4..0000000 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt deleted file mode 100644 index 25410ae..0000000 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Apr 04 11:28:35 CST 2023 -base.0=/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex -renamed.0=classes.dex -path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources deleted file mode 100644 index e976b2d..0000000 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 deleted file mode 100644 index 945a7c5..0000000 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class deleted file mode 100644 index f98637b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class deleted file mode 100644 index 6e28b50..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class deleted file mode 100644 index 534af6e..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class deleted file mode 100644 index 4be9a30..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class deleted file mode 100644 index 0d9547b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class deleted file mode 100644 index 37c051d..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class deleted file mode 100644 index a78b61a..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class deleted file mode 100644 index bdc56b1..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class deleted file mode 100644 index 56d65f1..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class deleted file mode 100644 index 1f3ea0b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class deleted file mode 100644 index 976265d..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class deleted file mode 100644 index 2319eaf..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class deleted file mode 100644 index d2dcfb5..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class deleted file mode 100644 index c61d69f..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class deleted file mode 100644 index 26c68fb..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class deleted file mode 100644 index d4e7deb..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class deleted file mode 100644 index 69ac9b5..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class deleted file mode 100644 index 3c7e5b6..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class deleted file mode 100644 index 06827bd..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class deleted file mode 100644 index b9dde0d..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class deleted file mode 100644 index fd895e5..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class deleted file mode 100644 index 212c0c3..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class deleted file mode 100644 index f305e18..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class deleted file mode 100644 index f105e8c..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class deleted file mode 100644 index cecf07f..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class deleted file mode 100644 index 5d5ada0..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class deleted file mode 100644 index 30318fc..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class deleted file mode 100644 index bbbea2e..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class deleted file mode 100644 index 46734e7..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class deleted file mode 100644 index e9f5b68..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class deleted file mode 100644 index bfb671c..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class deleted file mode 100644 index ed4ac8e..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class deleted file mode 100644 index fc1d9a2..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class deleted file mode 100644 index d4500ff..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class deleted file mode 100644 index f1053bc..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class deleted file mode 100644 index 34b5c02..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class deleted file mode 100644 index 1714fc2..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class deleted file mode 100644 index 595f36d..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class deleted file mode 100644 index 7ded6f4..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class deleted file mode 100644 index 79598f6..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class deleted file mode 100644 index 124eb6a..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class deleted file mode 100644 index e8e0e45..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class deleted file mode 100644 index c3ee8d8..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class deleted file mode 100644 index 4812c99..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class deleted file mode 100644 index 0754ffc..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class deleted file mode 100644 index dc60fe0..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class deleted file mode 100644 index 6597282..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class deleted file mode 100644 index ff95cab..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class deleted file mode 100644 index 75a9a17..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class deleted file mode 100644 index fa573a1..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class deleted file mode 100644 index 81d6513..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class deleted file mode 100644 index 66c9e6f..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class deleted file mode 100644 index 86cabc1..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class deleted file mode 100644 index 5012ef9..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class deleted file mode 100644 index 354ae8e..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class deleted file mode 100644 index 4064ac0..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class deleted file mode 100644 index 19383ea..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class deleted file mode 100644 index 29d4cf9..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class deleted file mode 100644 index 432dd4e..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class deleted file mode 100644 index ad7cce4..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class deleted file mode 100644 index 6e0f050..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class deleted file mode 100644 index 1a3310a..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class deleted file mode 100644 index 93cd34b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class deleted file mode 100644 index fea6568..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class deleted file mode 100644 index 1588b99..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class deleted file mode 100644 index d4e78a1..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class deleted file mode 100644 index e7ac3f6..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class deleted file mode 100644 index 11e437f..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class deleted file mode 100644 index df2d946..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class deleted file mode 100644 index dbd12f5..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class deleted file mode 100644 index 4981765..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class deleted file mode 100644 index 64f15ff..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class deleted file mode 100644 index 817bf17..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class deleted file mode 100644 index 77d2608..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class deleted file mode 100644 index b979434..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class deleted file mode 100644 index e8eaf4b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class deleted file mode 100644 index b243892..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class deleted file mode 100644 index 06036f1..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class deleted file mode 100644 index 08ab9fa..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class deleted file mode 100644 index ff543cd..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class deleted file mode 100644 index d42da3c..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class deleted file mode 100644 index 5d8717b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class deleted file mode 100644 index b58eac3..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class deleted file mode 100644 index 9ec847b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class deleted file mode 100644 index 7598ed0..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class deleted file mode 100644 index 573ba34..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class deleted file mode 100644 index a1c7178..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class deleted file mode 100644 index c01fcae..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class deleted file mode 100644 index d7027b9..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class deleted file mode 100644 index eb4eff7..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class deleted file mode 100644 index 245633b..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class deleted file mode 100644 index bcc1f6d..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class deleted file mode 100644 index 5053337..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class deleted file mode 100644 index f6e1ed8..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class deleted file mode 100644 index fabc84f..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class deleted file mode 100644 index e33d1c0..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and /dev/null differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class deleted file mode 100644 index e315716..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and /dev/null differ diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index 42e9d4e..0000000 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,287 +0,0 @@ -1 -2 -17 -21 -22 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 -23 android:minSdkVersion="14" -23-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:15-41 -24 android:targetSdkVersion="14" /> -24-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 -25 -26 -26-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:26:5-81 -26-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:26:22-78 -27 -27-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:27:5-88 -27-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:27:22-85 -28 -28-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:28:5-67 -28-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:28:22-64 -29 -29-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:29:5-72 -29-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:29:22-69 -30 -30-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:30:5-74 -30-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:30:22-71 -31 -31-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:31:5-80 -31-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:31:22-77 -32 -32-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:32:5-71 -32-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:32:22-68 -33 -33-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:33:5-74 -33-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:33:22-71 -34 -34-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:34:5-81 -34-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:34:22-78 -35 -36 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:36:5-157:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:37:9-42 -39 android:label="@string/app_name" -39-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:38:9-41 -40 android:testOnly="true" > -41 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:39:9-53:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:40:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:41:13-74 -44 android:exported="true" -44-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:47:13-36 -45 android:label="@string/app_name" -45-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:42:13-45 -46 android:launchMode="singleTop" -46-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:43:13-43 -47 android:theme="@style/NoteTheme" -47-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:44:13-45 -48 android:uiOptions="splitActionBarWhenNarrow" -48-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:45:13-57 -49 android:windowSoftInputMode="adjustPan" > -49-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:46:13-52 -50 -50-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:49:13-52:29 -51 -51-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:50:17-69 -51-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:50:25-66 -52 -53 -53-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:51:17-77 -53-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:51:27-74 -54 -55 -56 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:55:9-85:20 -57 android:name="net.micode.notes.ui.NoteEditActivity" -57-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:56:13-48 -58 android:configChanges="keyboardHidden|orientation|screenSize" -58-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:57:13-74 -59 android:exported="true" -59-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:60:13-36 -60 android:launchMode="singleTop" -60-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:58:13-43 -61 android:theme="@style/NoteTheme" > -61-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:59:13-45 -62 -62-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:62:13-68:29 -62-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:62:28-49 -63 -63-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:64:17-69 -63-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:64:25-66 -64 -65 -65-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:17-76 -65-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:27-73 -66 -67 -67-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:17-78 -67-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:23-75 -68 -68-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:17-78 -68-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:23-75 -69 -70 -70-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:70:13-75:29 -71 -71-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:71:17-79 -71-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:71:25-76 -72 -73 -73-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:17-76 -73-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:27-73 -74 -75 -75-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:17-78 -75-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:23-75 -76 -76-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:17-78 -76-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:23-75 -77 -78 -78-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:77:13-80:29 -79 -79-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:78:17-71 -79-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:78:25-68 -80 -81 -81-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:17-76 -81-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:27-73 -82 -83 -84 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:82:13-84:54 -85 android:name="android.app.searchable" -85-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:83:17-54 -86 android:resource="@xml/searchable" /> -86-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:84:17-51 -87 -88 -89 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:87:9-91:38 -90 android:name="net.micode.notes.data.NotesProvider" -90-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:88:13-63 -91 android:authorities="micode_notes" -91-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:89:13-47 -92 android:exported="true" -92-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:91:13-36 -93 android:multiprocess="true" /> -93-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:90:13-40 -94 -95 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:93:9-106:20 -96 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -96-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:94:13-57 -97 android:exported="true" -97-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:96:13-36 -98 android:label="@string/app_widget2x2" > -98-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:95:13-50 -99 -99-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:97:13-101:29 -100 -100-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:98:17-84 -100-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:98:25-81 -101 -101-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:99:17-85 -101-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:99:25-82 -102 -102-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:100:17-85 -102-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:100:25-82 -103 -104 -105 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:103:13-105:58 -106 android:name="android.appwidget.provider" -106-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:104:17-58 -107 android:resource="@xml/widget_2x_info" /> -107-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:105:17-55 -108 -109 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:107:9-121:20 -110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -110-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:108:13-57 -111 android:exported="true" -111-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:110:13-36 -112 android:label="@string/app_widget4x4" > -112-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:109:13-50 -113 -113-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:97:13-101:29 -114 -114-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:98:17-84 -114-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:98:25-81 -115 -115-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:99:17-85 -115-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:99:25-82 -116 -116-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:100:17-85 -116-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:100:25-82 -117 -118 -119 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:103:13-105:58 -120 android:name="android.appwidget.provider" -120-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:104:17-58 -121 android:resource="@xml/widget_4x_info" /> -121-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:105:17-55 -122 -123 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:123:9-128:20 -124 android:name="net.micode.notes.ui.AlarmInitReceiver" -124-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:123:19-55 -125 android:exported="true" > -125-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:124:13-36 -126 -126-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:125:13-127:29 -127 -127-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:126:17-79 -127-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:126:25-76 -128 -129 -130 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:130:9-133:20 -131 android:name="net.micode.notes.ui.AlarmReceiver" -131-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:131:13-61 -132 android:process=":remote" > -132-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:132:13-38 -133 -134 -135 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:135:9-140:20 -136 android:name="net.micode.notes.ui.AlarmAlertActivity" -136-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:136:13-50 -137 android:label="@string/app_name" -137-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:137:13-45 -138 android:launchMode="singleInstance" -138-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:138:13-48 -139 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -139-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:139:13-75 -140 -141 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:142:9-147:20 -142 android:name="net.micode.notes.ui.NotesPreferenceActivity" -142-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:143:13-71 -143 android:label="@string/preferences_title" -143-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:144:13-54 -144 android:launchMode="singleTop" -144-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:145:13-43 -145 android:theme="@android:style/Theme.Holo.Light" > -145-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:146:13-60 -146 -147 -148 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:149:9-152:19 -149 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -149-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:150:13-74 -150 android:exported="false" > -150-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:151:13-37 -151 -152 -153 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:154:9-156:52 -154 android:name="android.app.default_searchable" -154-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:155:13-58 -155 android:value=".ui.NoteEditActivity" /> -155-->/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:156:13-49 -156 -157 -158 diff --git a/app/build/intermediates/merged_java_res/debug/base.jar b/app/build/intermediates/merged_java_res/debug/base.jar deleted file mode 100644 index 15cb0ec..0000000 Binary files a/app/build/intermediates/merged_java_res/debug/base.jar and /dev/null differ diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml deleted file mode 100644 index e22f041..0000000 --- a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml deleted file mode 100644 index e22f041..0000000 --- a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/debug/output-metadata.json b/app/build/intermediates/merged_manifests/debug/output-metadata.json deleted file mode 100644 index a56d03a..0000000 --- a/app/build/intermediates/merged_manifests/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "MERGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat deleted file mode 100644 index 802be34..0000000 Binary files a/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat deleted file mode 100644 index 2d9ddb4..0000000 Binary files a/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat deleted file mode 100644 index a783113..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat deleted file mode 100644 index a9576bb..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat deleted file mode 100644 index 0692876..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat deleted file mode 100644 index a5cd8ef..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat deleted file mode 100644 index b5e283d..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat deleted file mode 100644 index 74c78c0..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat deleted file mode 100644 index 5436926..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat deleted file mode 100644 index 4d95a89..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat deleted file mode 100644 index ce52bc1..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat deleted file mode 100644 index b376e80..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat deleted file mode 100644 index b8cc9ab..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat deleted file mode 100644 index 2af509b..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat deleted file mode 100644 index f3a6c60..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat deleted file mode 100644 index 8828ae3..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat deleted file mode 100644 index 8a98c38..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat deleted file mode 100644 index 4c9bdf9..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat deleted file mode 100644 index 1422573..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat deleted file mode 100644 index 704993a..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat deleted file mode 100644 index 9a4b989..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat deleted file mode 100644 index 11857a4..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat deleted file mode 100644 index 2227ab8..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat deleted file mode 100644 index 27a8412..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat deleted file mode 100644 index 0bda0bc..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat deleted file mode 100644 index 75f3cd0..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat deleted file mode 100644 index f82dd6d..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat deleted file mode 100644 index d57fe3a..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat deleted file mode 100644 index 683b6f1..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat deleted file mode 100644 index e75e056..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat deleted file mode 100644 index 3f89243..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat deleted file mode 100644 index 6b24efc..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat deleted file mode 100644 index 4f7fa61..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat deleted file mode 100644 index 725a39f..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat deleted file mode 100644 index f7b11e8..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat deleted file mode 100644 index 82de739..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat deleted file mode 100644 index 224f699..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat deleted file mode 100644 index 6c1bc35..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat deleted file mode 100644 index d29584e..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat deleted file mode 100644 index 394cf64..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat deleted file mode 100644 index 6a55c1f..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat deleted file mode 100644 index d3094aa..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat deleted file mode 100644 index a3558dd..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat deleted file mode 100644 index e9e827a..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat deleted file mode 100644 index 812fbce..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat deleted file mode 100644 index c4a34ba..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat deleted file mode 100644 index a0b2963..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat deleted file mode 100644 index 0d0a7c7..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat deleted file mode 100644 index 7b7b9c9..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat deleted file mode 100644 index ac802ba..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat deleted file mode 100644 index ee82d6c..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat deleted file mode 100644 index 8d48e8e..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat deleted file mode 100644 index dbeee0b..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat deleted file mode 100644 index e55822d..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat deleted file mode 100644 index be2aedd..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat deleted file mode 100644 index 8f6daec..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat deleted file mode 100644 index 87aeb20..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat deleted file mode 100644 index 825e93d..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat deleted file mode 100644 index e039b02..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat deleted file mode 100644 index a2eb42b..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat deleted file mode 100644 index c7eff78..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat deleted file mode 100644 index decfaad..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat deleted file mode 100644 index 7c3cf3a..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat deleted file mode 100644 index 1c75d02..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat deleted file mode 100644 index e82e879..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat deleted file mode 100644 index 366fd2c..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat deleted file mode 100644 index ac23b11..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat deleted file mode 100644 index 8b4b3a5..0000000 Binary files a/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat deleted file mode 100644 index 5fdf154..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat deleted file mode 100644 index f2fd34a..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat deleted file mode 100644 index 16cf2ef..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat deleted file mode 100644 index afee10f..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat deleted file mode 100644 index b3d34f5..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat deleted file mode 100644 index 951dd2f..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat deleted file mode 100644 index 544cfb6..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat deleted file mode 100644 index 2ae3d38..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat deleted file mode 100644 index b092461..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat deleted file mode 100644 index ef9a690..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat deleted file mode 100644 index 48aa960..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat deleted file mode 100644 index 4b1a1cd..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat deleted file mode 100644 index c923e71..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat deleted file mode 100644 index bd9974e..0000000 Binary files a/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat deleted file mode 100644 index c89b09d..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat deleted file mode 100644 index 504fc9c..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat deleted file mode 100644 index c2c61cc..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat deleted file mode 100644 index c138bc9..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat deleted file mode 100644 index 6e3c761..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat deleted file mode 100644 index 60513de..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat deleted file mode 100644 index 4e4f099..0000000 Binary files a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat deleted file mode 100644 index 17cb018..0000000 Binary files a/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/raw_introduction.flat b/app/build/intermediates/merged_res/debug/raw_introduction.flat deleted file mode 100644 index 608c6fd..0000000 Binary files a/app/build/intermediates/merged_res/debug/raw_introduction.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat deleted file mode 100644 index 035ddcd..0000000 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat deleted file mode 100644 index 1043ced..0000000 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat deleted file mode 100644 index ea0ebfc..0000000 Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat deleted file mode 100644 index e36a338..0000000 Binary files a/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat deleted file mode 100644 index c4dc076..0000000 Binary files a/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat deleted file mode 100644 index b960844..0000000 Binary files a/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat deleted file mode 100644 index 1605ca0..0000000 Binary files a/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json deleted file mode 100644 index 850fe21..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rCN/arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rCN/strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rTW/strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rTW/arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json deleted file mode 100644 index 2785f39..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rCN/arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rCN/strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json deleted file mode 100644 index 0c39f33..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rTW/strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values-zh-rTW/arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json deleted file mode 100644 index 25e9837..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", - "map": [ - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "/Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res/values/arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json deleted file mode 100644 index 2a106a9..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ /dev/null @@ -1,382 +0,0 @@ -[ - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" - } -] \ No newline at end of file diff --git a/app/build/intermediates/navigation_json/debug/navigation.json b/app/build/intermediates/navigation_json/debug/navigation.json deleted file mode 100644 index 0637a08..0000000 --- a/app/build/intermediates/navigation_json/debug/navigation.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml deleted file mode 100644 index e22f041..0000000 --- a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/app/build/intermediates/packaged_manifests/debug/output-metadata.json deleted file mode 100644 index eea66e3..0000000 --- a/app/build/intermediates/packaged_manifests/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PACKAGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/processed_res/debug/out/output-metadata.json b/app/build/intermediates/processed_res/debug/out/output-metadata.json deleted file mode 100644 index 1eefece..0000000 --- a/app/build/intermediates/processed_res/debug/out/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PROCESSED_RES", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "resources-debug.ap_" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ deleted file mode 100644 index 8b736e2..0000000 Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar b/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar deleted file mode 100644 index 0d0f1fc..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex deleted file mode 100644 index ebf79ba..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex deleted file mode 100644 index 1f9ff81..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex deleted file mode 100644 index a2b0525..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex deleted file mode 100644 index 2fbf54b..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex deleted file mode 100644 index bec0b42..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex deleted file mode 100644 index 7302df1..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex deleted file mode 100644 index 55c07e3..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex deleted file mode 100644 index 55990a0..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex deleted file mode 100644 index 0138acd..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex deleted file mode 100644 index c514f8d..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex deleted file mode 100644 index 33a1e8e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex deleted file mode 100644 index edca6c2..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex deleted file mode 100644 index 43fbb95..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex deleted file mode 100644 index c804edb..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex deleted file mode 100644 index 7a975d2..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex deleted file mode 100644 index 24984cf..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex deleted file mode 100644 index 8fa92ab..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex deleted file mode 100644 index 7484169..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex deleted file mode 100644 index aa009a0..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex deleted file mode 100644 index ee79a6c..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex deleted file mode 100644 index 6b5778b..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex deleted file mode 100644 index 257ceef..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex deleted file mode 100644 index 00ad8f3..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex deleted file mode 100644 index 3f534f4..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex deleted file mode 100644 index 66440b5..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex deleted file mode 100644 index db641dc..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex deleted file mode 100644 index 7d8a2cc..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex deleted file mode 100644 index f34ea10..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex deleted file mode 100644 index 6f5252f..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex deleted file mode 100644 index d8d0af5..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex deleted file mode 100644 index 36627fa..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex deleted file mode 100644 index 16a8e64..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex deleted file mode 100644 index 7193315..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex deleted file mode 100644 index 5888fc6..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex deleted file mode 100644 index 86f7f9f..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex deleted file mode 100644 index ef2fe6c..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex deleted file mode 100644 index a49e587..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex deleted file mode 100644 index 296ff56..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex deleted file mode 100644 index 602aad6..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex deleted file mode 100644 index 93f17cb..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex deleted file mode 100644 index 54adcf9..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex deleted file mode 100644 index c6e8fd8..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex deleted file mode 100644 index c38244b..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex deleted file mode 100644 index b7482d9..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex deleted file mode 100644 index 2d3dad9..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex deleted file mode 100644 index 288c6fd..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex deleted file mode 100644 index c129c9e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex deleted file mode 100644 index bd744fe..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex deleted file mode 100644 index ac6117e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex deleted file mode 100644 index 7201f1d..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex deleted file mode 100644 index 1fb0182..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex deleted file mode 100644 index 1cbdbb2..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex deleted file mode 100644 index 6c5293d..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex deleted file mode 100644 index f2219ba..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex deleted file mode 100644 index c64b75d..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex deleted file mode 100644 index d76f231..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex deleted file mode 100644 index 0d3d400..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex deleted file mode 100644 index 33ac2d5..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex deleted file mode 100644 index 5c48404..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex deleted file mode 100644 index 4146280..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex deleted file mode 100644 index 6f0d01c..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex deleted file mode 100644 index 312fbad..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex deleted file mode 100644 index 5b91144..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex deleted file mode 100644 index feb5c80..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex deleted file mode 100644 index 6b44eab..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex deleted file mode 100644 index 54e30f8..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex deleted file mode 100644 index 59d7247..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex deleted file mode 100644 index 115709e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex deleted file mode 100644 index 8c202a1..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex deleted file mode 100644 index fb8b80e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex deleted file mode 100644 index 76dc737..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex deleted file mode 100644 index 99d12e8..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex deleted file mode 100644 index 97ed6fa..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex deleted file mode 100644 index 8d7e1d8..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex deleted file mode 100644 index 600d8fb..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex deleted file mode 100644 index 4c8920b..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex deleted file mode 100644 index 9dee3c8..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex deleted file mode 100644 index ea4f037..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex deleted file mode 100644 index 768eac9..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex deleted file mode 100644 index 4a109e9..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex deleted file mode 100644 index c3344a9..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex deleted file mode 100644 index dd72238..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex deleted file mode 100644 index ab39c99..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex deleted file mode 100644 index f8c2de3..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex deleted file mode 100644 index 3884261..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex deleted file mode 100644 index b125b7f..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex deleted file mode 100644 index ea4d3bb..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex deleted file mode 100644 index 303cd9e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex deleted file mode 100644 index 55eeca3..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex deleted file mode 100644 index 4ff53c2..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex deleted file mode 100644 index 2559347..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex deleted file mode 100644 index 1b88930..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex deleted file mode 100644 index aae067f..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex deleted file mode 100644 index 2c28295..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex deleted file mode 100644 index 61db915..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex deleted file mode 100644 index c8c3677..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex deleted file mode 100644 index affae58..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and /dev/null differ diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/app/build/intermediates/runtime_symbol_list/debug/R.txt deleted file mode 100644 index 00d6e91..0000000 --- a/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ /dev/null @@ -1,283 +0,0 @@ -int array format_for_exported_note 0x7f010000 -int array menu_share_ways 0x7f010001 -int color primary_text_dark 0x7f020000 -int color secondary_text_dark 0x7f020001 -int color user_query_highlight 0x7f020002 -int dimen text_font_size_large 0x7f030000 -int dimen text_font_size_medium 0x7f030001 -int dimen text_font_size_normal 0x7f030002 -int dimen text_font_size_small 0x7f030003 -int dimen text_font_size_super 0x7f030004 -int drawable bg_btn_set_color 0x7f040000 -int drawable bg_color_btn_mask 0x7f040001 -int drawable call_record 0x7f040002 -int drawable clock 0x7f040003 -int drawable delete 0x7f040004 -int drawable dropdown_icon 0x7f040005 -int drawable edit_blue 0x7f040006 -int drawable edit_green 0x7f040007 -int drawable edit_red 0x7f040008 -int drawable edit_title_blue 0x7f040009 -int drawable edit_title_green 0x7f04000a -int drawable edit_title_red 0x7f04000b -int drawable edit_title_white 0x7f04000c -int drawable edit_title_yellow 0x7f04000d -int drawable edit_white 0x7f04000e -int drawable edit_yellow 0x7f04000f -int drawable font_large 0x7f040010 -int drawable font_normal 0x7f040011 -int drawable font_size_selector_bg 0x7f040012 -int drawable font_small 0x7f040013 -int drawable font_super 0x7f040014 -int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 -int id account_dialog_subtitle 0x7f050000 -int id account_dialog_title 0x7f050001 -int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 -int layout account_dialog_title 0x7f060000 -int layout add_account_text 0x7f060001 -int layout datetime_picker 0x7f060002 -int layout dialog_edit_text 0x7f060003 -int layout folder_list_item 0x7f060004 -int layout note_edit 0x7f060005 -int layout note_edit_list_item 0x7f060006 -int layout note_item 0x7f060007 -int layout note_list 0x7f060008 -int layout note_list_dropdown_menu 0x7f060009 -int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d -int menu call_note_edit 0x7f070000 -int menu call_record_folder 0x7f070001 -int menu note_edit 0x7f070002 -int menu note_list 0x7f070003 -int menu note_list_dropdown 0x7f070004 -int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 -int plurals search_results_title 0x7f080000 -int raw introduction 0x7f090000 -int string alert_message_delete_folder 0x7f0a0000 -int string alert_message_delete_note 0x7f0a0001 -int string alert_message_delete_notes 0x7f0a0002 -int string alert_title_delete 0x7f0a0003 -int string app_name 0x7f0a0004 -int string app_widget2x2 0x7f0a0005 -int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 -int style HighlightTextAppearancePrimary 0x7f0b0000 -int style HighlightTextAppearanceSecondary 0x7f0b0001 -int style NoteActionBarStyle 0x7f0b0002 -int style NoteTheme 0x7f0b0003 -int style TextAppearanceLarge 0x7f0b0004 -int style TextAppearanceMedium 0x7f0b0005 -int style TextAppearanceNormal 0x7f0b0006 -int style TextAppearancePrimaryItem 0x7f0b0007 -int style TextAppearanceSecondaryItem 0x7f0b0008 -int style TextAppearanceSuper 0x7f0b0009 -int style TextAppearanceUnderMenuIcon 0x7f0b000a -int xml preferences 0x7f0c0000 -int xml searchable 0x7f0c0001 -int xml widget_2x_info 0x7f0c0002 -int xml widget_4x_info 0x7f0c0003 diff --git a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json deleted file mode 100644 index 51f6368..0000000 --- a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt deleted file mode 100644 index abb1e71..0000000 --- a/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ /dev/null @@ -1,8 +0,0 @@ -net.micode.notes.app-pngs-0 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/generated/res/pngs/debug -net.micode.notes.app-resValues-1 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/generated/res/resValues/debug -net.micode.notes.app-rs-2 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/generated/res/rs/debug -net.micode.notes.app-mergeDebugResources-3 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir -net.micode.notes.app-mergeDebugResources-4 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir -net.micode.notes.app-merged_res-5 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/build/intermediates/merged_res/debug -net.micode.notes.app-debug-6 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/debug/res -net.micode.notes.app-main-7 /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/res diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt deleted file mode 100644 index c78041f..0000000 --- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ /dev/null @@ -1,283 +0,0 @@ -net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:string/sync_progress_login = 0x7f0a005e -net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:string/search_setting_description = 0x7f0a0059 -net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:string/search = 0x7f0a0056 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_setting = 0x7f0a0036 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:id/note_edit_list = 0x7f050031 -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:drawable/list_red_single = 0x7f040023 -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:id/tv_title = 0x7f05003f -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:string/button_delete = 0x7f0a0007 -net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c -net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/app_name = 0x7f0a0004 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:drawable/list_red_down = 0x7f040021 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:menu/note_list = 0x7f070003 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:drawable/menu_move = 0x7f04002e -net.micode.notes:id/menu_search = 0x7f050028 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:drawable/icon_app = 0x7f040015 -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/widget_text = 0x7f050042 -net.micode.notes:id/widget_bg_image = 0x7f050041 -net.micode.notes:string/menu_folder_delete = 0x7f0a0025 -net.micode.notes:id/tv_name = 0x7f05003d -net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/tv_folder_name = 0x7f05003b -net.micode.notes:id/tv_alert_date = 0x7f05003a -net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:id/tv_time = 0x7f05003e -net.micode.notes:id/selection_menu = 0x7f050038 -net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:id/note_title = 0x7f050034 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:id/navigation_bar = 0x7f05002f -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:id/menu_share = 0x7f05002b -net.micode.notes:string/format_folder_files_count = 0x7f0a001b -net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:id/date = 0x7f050007 -net.micode.notes:id/note_item = 0x7f050033 -net.micode.notes:id/menu_setting = 0x7f05002a -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 -net.micode.notes:id/note_edit_view = 0x7f050032 -net.micode.notes:id/menu_list_mode = 0x7f050025 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:id/menu_font_size = 0x7f050024 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:id/ll_font_small = 0x7f05001e -net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d -net.micode.notes:id/minute = 0x7f05002d -net.micode.notes:id/ll_font_normal = 0x7f05001d -net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c -net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:drawable/delete = 0x7f040004 -net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:drawable/list_green_single = 0x7f04001f -net.micode.notes:id/iv_alert_icon = 0x7f05000d -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:id/cb_edit_item = 0x7f050006 -net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:id/account_dialog_subtitle = 0x7f050000 -net.micode.notes:id/menu_new_note = 0x7f050027 -net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:drawable/widget_2x_red = 0x7f04003a -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 -net.micode.notes:drawable/clock = 0x7f040003 -net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:id/btn_set_bg_color = 0x7f050005 -net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:drawable/notification = 0x7f040033 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:drawable/widget_2x_white = 0x7f04003b -net.micode.notes:drawable/font_large = 0x7f040010 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:string/error_sync_internal = 0x7f0a0012 -net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:drawable/title_bar_bg = 0x7f040037 -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:drawable/widget_2x_green = 0x7f040039 -net.micode.notes:id/iv_bg_red = 0x7f050012 -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:layout/note_edit_list_item = 0x7f060006 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:id/menu_delete_remind = 0x7f050022 -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:id/menu_export_text = 0x7f050023 -net.micode.notes:id/hour = 0x7f05000c -net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:drawable/list_blue_single = 0x7f040019 -net.micode.notes:drawable/list_white_middle = 0x7f040026 -net.micode.notes:id/tv_title_bar = 0x7f050040 -net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:drawable/list_folder = 0x7f04001b -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:id/iv_small_select = 0x7f05001a -net.micode.notes:drawable/list_blue_down = 0x7f040017 -net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:array/format_for_exported_note = 0x7f010000 -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/menu_new_folder = 0x7f050026 -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:id/tv_modified_date = 0x7f05003c -net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:layout/account_dialog_title = 0x7f060000 -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:drawable/menu_delete = 0x7f04002d -net.micode.notes:id/iv_bg_red_select = 0x7f050013 -net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:drawable/list_red_up = 0x7f040024 -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:menu/note_list_options = 0x7f070005 -net.micode.notes:drawable/widget_4x_white = 0x7f040040 diff --git a/app/build/intermediates/variant_model/debug/variant_model.json b/app/build/intermediates/variant_model/debug/variant_model.json deleted file mode 100644 index fbfb74a..0000000 Binary files a/app/build/intermediates/variant_model/debug/variant_model.json and /dev/null differ diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index c2ed1d7..0000000 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,253 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:1-158:12 - package - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:20:5-31 - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - android:versionName - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:22:5-30 - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - xmlns:tools - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:19:5-51 - xmlns:android - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:21:5-28 - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml -uses-sdk -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 -INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 - android:targetSdkVersion - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:5-44 - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - android:minSdkVersion - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:24:15-41 - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml - INJECTED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:26:5-81 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:26:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:27:5-88 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:27:22-85 -uses-permission#android.permission.INTERNET -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:28:5-67 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:28:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:29:5-72 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:29:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:30:5-74 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:30:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:31:5-80 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:31:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:32:5-71 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:32:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:33:5-74 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:33:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:34:5-81 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:34:22-78 -application -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:36:5-157:19 - android:label - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:38:9-41 - android:icon - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:37:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:39:9-53:20 - android:label - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:42:13-45 - android:launchMode - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:43:13-43 - android:windowSoftInputMode - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:46:13-52 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:47:13-36 - android:uiOptions - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:45:13-57 - android:configChanges - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:41:13-74 - android:theme - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:44:13-45 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:40:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:49:13-52:29 -action#android.intent.action.MAIN -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:50:17-69 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:50:25-66 -category#android.intent.category.LAUNCHER -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:51:17-77 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:51:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:55:9-85:20 - android:launchMode - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:58:13-43 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:60:13-36 - android:configChanges - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:57:13-74 - android:theme - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:59:13-45 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:56:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:62:13-68:29 - android:scheme - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:62:28-49 - tools:ignore - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:63:17-47 -action#android.intent.action.VIEW -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:64:17-69 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:64:25-66 -category#android.intent.category.DEFAULT -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:17-76 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:65:27-73 -data -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:17-78 - android:mimeType - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:66:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:70:13-75:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:71:17-79 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:71:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:77:13-80:29 -action#android.intent.action.SEARCH -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:78:17-71 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:78:25-68 -meta-data#android.app.searchable -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:82:13-84:54 - android:resource - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:84:17-51 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:83:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:87:9-91:38 - android:authorities - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:89:13-47 - android:multiprocess - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:90:13-40 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:91:13-36 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:88:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:93:9-106:20 - android:label - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:95:13-50 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:96:13-36 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:94:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:97:13-101:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:98:17-84 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:98:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:99:17-85 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:99:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:100:17-85 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:100:25-82 -meta-data#android.appwidget.provider -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:103:13-105:58 - android:resource - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:105:17-55 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:104:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:107:9-121:20 - android:label - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:109:13-50 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:110:13-36 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:108:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:123:9-128:20 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:124:13-36 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:123:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:125:13-127:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:126:17-79 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:126:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:130:9-133:20 - android:process - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:132:13-38 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:131:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:135:9-140:20 - android:label - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:137:13-45 - android:launchMode - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:138:13-48 - android:theme - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:139:13-75 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:136:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:142:9-147:20 - android:label - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:144:13-54 - android:launchMode - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:145:13-43 - android:theme - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:146:13-60 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:143:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:149:9-152:19 - android:exported - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:151:13-37 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:150:13-74 -meta-data#android.app.default_searchable -ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:154:9-156:52 - android:value - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:156:13-49 - android:name - ADDED from /Users/ruhuitong/AndroidStudioProjects/xiaomi/app/src/main/AndroidManifest.xml:155:13-58 diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin deleted file mode 100644 index 725ac98..0000000 Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ diff --git a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java deleted file mode 100644 index ffe5d57..0000000 --- a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ /dev/null @@ -1,362 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.content.ContentValues; -import android.content.Context; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; - -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; - - -public class NotesDatabaseHelper extends SQLiteOpenHelper { - private static final String DB_NAME = "note.db"; - - private static final int DB_VERSION = 4; - - public interface TABLE { - public static final String NOTE = "note"; - - public static final String DATA = "data"; - } - - private static final String TAG = "NotesDatabaseHelper"; - - private static NotesDatabaseHelper mInstance; - - private static final String CREATE_NOTE_TABLE_SQL = - "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + - ")"; - - private static final String CREATE_DATA_TABLE_SQL = - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA1 + " INTEGER," + - DataColumns.DATA2 + " INTEGER," + - DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + - ")"; - - private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; - - /** - * Increase folder's note count when move note to the folder - */ - private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_update "+ - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; - - /** - * Decrease folder's note count when move note from folder - */ - private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_update " + - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; - - /** - * Increase folder's note count when insert new note to the folder - */ - private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; - - /** - * Decrease folder's note count when delete note from the folder - */ - private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; - - /** - * Update note's content when insert data with type {@link DataConstants#NOTE} - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = - "CREATE TRIGGER update_note_content_on_insert " + - " AFTER INSERT ON " + TABLE.DATA + - " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - * Update note's content when data with {@link DataConstants#NOTE} type has changed - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER update_note_content_on_update " + - " AFTER UPDATE ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - * Update note's content when data with {@link DataConstants#NOTE} type has deleted - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = - "CREATE TRIGGER update_note_content_on_delete " + - " AFTER delete ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=''" + - " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - * Delete datas belong to note which has been deleted - */ - private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = - "CREATE TRIGGER delete_data_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.DATA + - " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - /** - * Delete notes belong to folder which has been deleted - */ - private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = - "CREATE TRIGGER folder_delete_notes_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.NOTE + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - /** - * Move notes belong to folder which has been moved to trash folder - */ - private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = - "CREATE TRIGGER folder_move_notes_on_trash " + - " AFTER UPDATE ON " + TABLE.NOTE + - " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - public NotesDatabaseHelper(Context context) { - super(context, DB_NAME, null, DB_VERSION); - } - - public void createNoteTable(SQLiteDatabase db) { - db.execSQL(CREATE_NOTE_TABLE_SQL); - reCreateNoteTableTriggers(db); - createSystemFolder(db); - Log.d(TAG, "note table has been created"); - } - - private void reCreateNoteTableTriggers(SQLiteDatabase db) { - db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); - - db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); - db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); - db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER); - db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER); - db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); - db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); - db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); - } - - private void createSystemFolder(SQLiteDatabase db) { - ContentValues values = new ContentValues(); - - /** - * call record foler for call notes - */ - values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - * root folder which is default folder - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - * temporary folder which is used for moving note - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - * create trash folder - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - } - - public void createDataTable(SQLiteDatabase db) { - db.execSQL(CREATE_DATA_TABLE_SQL); - reCreateDataTableTriggers(db); - db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); - Log.d(TAG, "data table has been created"); - } - - private void reCreateDataTableTriggers(SQLiteDatabase db) { - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); - - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); - } - - static synchronized NotesDatabaseHelper getInstance(Context context) { - if (mInstance == null) { - mInstance = new NotesDatabaseHelper(context); - } - return mInstance; - } - - @Override - public void onCreate(SQLiteDatabase db) { - createNoteTable(db); - createDataTable(db); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; - boolean skipV2 = false; - - if (oldVersion == 1) { - upgradeToV2(db); - skipV2 = true; // this upgrade including the upgrade from v2 to v3 - oldVersion++; - } - - if (oldVersion == 2 && !skipV2) { - upgradeToV3(db); - reCreateTriggers = true; - oldVersion++; - } - - if (oldVersion == 3) { - upgradeToV4(db); - oldVersion++; - } - - if (reCreateTriggers) { - reCreateNoteTableTriggers(db); - reCreateDataTableTriggers(db); - } - - if (oldVersion != newVersion) { - throw new IllegalStateException("Upgrade notes database to version " + newVersion - + "fails"); - } - } - - private void upgradeToV2(SQLiteDatabase db) { - db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); - db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); - createNoteTable(db); - createDataTable(db); - } - - private void upgradeToV3(SQLiteDatabase db) { - // drop unused triggers - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); - // add a column for gtask id - db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID - + " TEXT NOT NULL DEFAULT ''"); - // add a trash system folder - ContentValues values = new ContentValues(); - values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - } - - private void upgradeToV4(SQLiteDatabase db) { - db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION - + " INTEGER NOT NULL DEFAULT 0"); - } -} diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 0a12d0d..0000000 --- a/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - maven { url 'https://maven.aliyun.com/repository/jcenter' } - maven { url 'https://maven.aliyun.com/repository/google' } - maven { url 'https://maven.aliyun.com/repository/central' } - maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - maven { url 'https://maven.aliyun.com/repository/jcenter' } - maven { url 'https://maven.aliyun.com/repository/google' } - maven { url 'https://maven.aliyun.com/repository/central' } - maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } - google() - jcenter() - } -} \ No newline at end of file diff --git a/小米便签开源代码的泛读报告.doc b/doc/小米便签开源代码的泛读报告.doc similarity index 100% rename from 小米便签开源代码的泛读报告.doc rename to doc/小米便签开源代码的泛读报告.doc diff --git a/doc/小米便签精读报告.docx b/doc/小米便签精读报告.docx new file mode 100644 index 0000000..d67e151 Binary files /dev/null and b/doc/小米便签精读报告.docx differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 8e29ca0..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Apr 04 09:59:49 CST 2023 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew deleted file mode 100755 index 4f906e0..0000000 --- a/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index ac1b06f..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/httpcomponents-client-4.5.14-bin/LICENSE.txt b/httpcomponents-client-4.5.14-bin/LICENSE.txt deleted file mode 100755 index e9bd0ea..0000000 --- a/httpcomponents-client-4.5.14-bin/LICENSE.txt +++ /dev/null @@ -1,558 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - -========================================================================= - -This project includes Public Suffix List copied from - -licensed under the terms of the Mozilla Public License, v. 2.0 - -Full license text: - -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/httpcomponents-client-4.5.14-bin/NOTICE.txt b/httpcomponents-client-4.5.14-bin/NOTICE.txt deleted file mode 100755 index 3f3e4f5..0000000 --- a/httpcomponents-client-4.5.14-bin/NOTICE.txt +++ /dev/null @@ -1,6 +0,0 @@ -Apache HttpComponents Client -Copyright 1999-2021 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - diff --git a/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt b/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt deleted file mode 100755 index 27d5ac1..0000000 --- a/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt +++ /dev/null @@ -1,2613 +0,0 @@ -Release 4.5.14 -------------------- - -This is a maintenance release that fixes several minor bugs reported discovered since -the 4.5.13 release. - - -Changelog: -------------------- - -* HTTPCLIENT-2206: Corrected resource de-allocation by fluent response objects. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-2174: URIBuilder to return a new empty list instead of unmodifiable - Collections#emptyList. - Contributed by Oleg Kalnichevski - -* Don't retry requests in case of NoRouteToHostException. - Contributed by Jaikiran Pai - -* HTTPCLIENT-2144: RequestBuilder fails to correctly copy charset of requests with - form url-encoded body. - Contributed by Oleg Kalnichevski - -* PR #269: 4.5.x use array fill and more. - - Use Arrays.fill(). - - Remove redundant modifiers. - - Use Collections.addAll() and Collection.addAll() APIs instead of loops. - - Remove redundant returns. - - No need to explicitly declare an array when calling a vararg method. - - Remote extra semicolons (;). - - Use a 'L' instead of 'l' to make long literals more readable. - Contributed by Gary Gregory - -* PublicSuffixListParser.parseByType(Reader) allocates but does not use a 256 char - StringBuilder. - Contributed by Gary Gregory - - - -Release 4.5.13 -------------------- - -This is a maintenance release that fixes incorrect handling of malformed authority component -in request URIs. - - -Changelog: -------------------- - -* Incorrect handling of malformed authority component by URIUtils#extractHost. - Contributed by Oleg Kalnichevski - -* Avoid updating Content-Length header in a 304 response. - Contributed by Dirk Henselin - -* Bug fix: BasicExpiresHandler is annotated as immutable but is not (#239) - Contributed by Gary Gregory - -* HTTPCLIENT-2076: Fixed NPE in LaxExpiresHandler (#222). - Contributed by heejeongkim - - -Release 4.5.12 -------------------- - -This is a maintenance release that fixes a regression introduced by the previous release -that caused rejection of certificates with non-standard domains. - -Changelog: -------------------- - -* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (308) to DefaultRedirectStrategy - Contributed by Michael Osipov - -* HTTPCLIENT-2052: Fixed redirection of entity enclosing requests with non-repeatable entities - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-2047: Fixed regression in DefaultHostnameVerifier causing rejection of certificates - with non-standard domains. - Contributed by Oleg Kalnichevski - -* Bug fix: Fixed handling of private domains by PublicSuffixMatcher - Contributed by Oleg Kalnichevski - - -Release 4.5.11 -------------------- - -This is a maintenance release that fixes a number defects discovered since 4.5.10 -and upgrades HttpCore dependency to version 4.4.13. - - -Changelog: -------------------- - -* Improved domain name normalization by DefaultHostnameVerifier. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-2033: Connection managers to immediately shut down all leased connection upon shutdown. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-2020: DefaultBackoffStrategy to support TOO_MANY_REQUESTS (429). - Contributed by Michael Osipov - -* HTTPCLIENT-2030: Fixed PublicSuffixMatcher#getDomainRoot behavior with invalid hostnames. - Contributed by Niels Basjes - -* HTTPCLIENT-2029: URIBuilder to support parsing of non-UTF8 URIs. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-2026: Fixed URIBuilder#isOpaque() logic. - Contributed by Oleg Kalnichevski - -* Updated text in pool stats description - Contributed by chao chang - -* HTTPCLIENT-2023: Allow nested arrays and all primitive types in DefaultHttpCacheEntrySerializer. - Contributed by Olof Larsson - -* Fixed fallback PublicSuffixMatcher instance. - Contributed by Ryan Schmitt - -* Added family property #145. - Contributed by behrangsa - - -Release 4.5.10 -------------------- - -This is a maintenance release that fixes a number defects discovered since 4.5.9 -and upgrades HttpCore dependency to version 4.4.12. - - -Changelog: -------------------- - -* Refactor DefaultRedirectStrategy for subclassing. - Contributed by Gary Gregory - -* Improved handling of request cancellation. - Contributed by Oleg Kalnichevski - -* Fixed concurrent use of threading unsafe HttpUriRequest messages. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1997: Return the last domain segment instead of normalized domain name - from PublicSuffixMatcher#getDomainRoot in case there is no match. - Contributed by jeromedemangel - -* Preserve original encoding of the URI path component if the URI is valid. - Contributed by Oleg Kalnichevski - - -Release 4.5.9 -------------------- - -This is a maintenance release that fixes a number defects discovered since 4.5.8. - - -Changelog: -------------------- - -* HTTPCLIENT-1991: incorrect handling of non-standard DNS entries by PublicSuffixMatcher - Contributed by Oleg Kalnichevski - -* Fix bug in URIBuilder#isPathEmpty method to verify if encodedPath is an empty string - Contributed by Varun Nandi - -* HTTPCLIENT-1984: Add normalize URI to RequestConfig copy constructor - Contributed by Matt Nelson - -* HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer - Contributed by Artem Smotrakov - - - -Release 4.5.8 -------------------- - -This is a maintenance release that makes request URI normalization configurable on per request basis -and also ports several improvements in URI handling from HttpCore master. - - -Changelog: -------------------- - -* HTTPCLIENT-1969: Filter out weak cipher suites. - Contributed by Artem Smotrakov - -* HTTPCLIENT-1968: Preserve escaped PATHSAFE characters when normalizing URI path segments. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1968: URIBuilder to split path component into path segments when digesting a URI - (ported from HttpCore master). - Contributed by Oleg Kalnichevski - -* Improved cache key generation (ported from HttpCore master). - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1968: added utility methods to parse and format URI path segments (ported - from HttpCore master). - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1968: Make normalization of URI paths optional. - Contributed by Tamas Cservenak - -* Some well known proxies respond with Content-Length=0, when returning 304. For robustness, always use the - cached entity's content length, as modern browsers do. - Contributed by Author: Jayson Raymond - - - -Release 4.5.7 -------------------- - -This is a maintenance release that corrects Automatic-Module-Name definitions added in the previous -release and fixes a number of minor defects discovered since 4.5.6. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* Upgraded HttpCore to version 4.4.11 - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1960: URIBuilder incorrect handling of multiple leading slashes in path component - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1958: PoolingHttpClientConnectionManager to throw ExecutionException in case of a lease operation - cancellation instead of InterruptedException. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1952: Allow default User Agent to be disabled. - Contributed by Michael Osipov - -* HTTPCLIENT-1956: CONNECT overwrites the main request object in the HTTP context when requests are executed - via a proxy tunnel. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1940: deprecated SSLSocketFactory made to rethrow SocketTimeoutException as - ConnectTimeoutException for consistency with non-deprecated code. - Contributed by Oleg Kalnichevski - -* Fixed regression in BasicCookieStore serialization. - Contributed by Author: Mark Mielke - -* HTTPCLIENT-1929: Corrected Automatic-Module-Name entries for HttpClient Fluent, HttpClient Windows - and HttpClient Cache. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1927: URLEncodedUtils#parse breaks at double quotes when parsing unquoted values. - Contributed by Oleg Kalnichevski - -* HTTPCLIENT-1939: Update Apache Commons Codec from 1.10 to 1.11 - Contributed by Gary Gregory - - -Release 4.5.6 -------------------- - -This is a maintenance release that adds Automatic-Module-Name to the manifest for compatibility -with Java 9 Platform Module System and fixes a number of issues discovered since 4.5.5 - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* [HTTPCLIENT-1882=: reset authentication state on I/O or runtime error for connection based - authentication schemes (such as NTLM) - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1924]: HttpClient to shut down the connection manager if a fatal error occurs - in the course of a request execution. - Contributed by Oleg Kalnichevski - -* Add Automatic-Module-Name in manifest so Java9 modular applications can depend on this library - Contributed by Varun Nandi - -* [HTTPCLIENT-1923]: fixed incorrect connection close on shutdown + fixed corresponding test - Contributed by Aleksei Arsenev - -* [HTTPCLIENT-1906]: certificates containing alternative subject names other than DNS and IP - (such as RFC822) get rejected as invalid - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1904]: check cookie domain for null - Contributed by Hans-Peter Keck - -* [HTTPCLIENT-1900]: proxy protocol processor does not post-process CONNECT response messages - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1911]: Failing tests on Fedora 28 due to weak encryption algorithms in test - keystore. - Contributed by Gary Gregory and Michael Simacek - - -Release 4.5.5 -------------------- - -HttpClient 4.5.5 (GA) is a maintenance release that fixes a regression introduced -by the previous release causing a NPE in SystemDefaultCredentialsProvider. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* [HTTPCLIENT-1690] Avoid merging Content-Encoding headers coming with 304 status to cache entry. - Contributed by Sudheera Palihakkara - -* [HTTPCLIENT-1888] Regression in SystemDefaultCredentialsProvider#getCredentials causing NPE. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1886] Update HttpClient 4.5.x from HttpCore 4.4.7 to 4.4.9 - Contributed by Gary Gregory - -* [HTTPCLIENT-1889] org.apache.http.client.utils.URLEncodedUtils.parse() - should return a new ArrayList when there are no query parameters. - Contributed by Gary Gregory - - -Release 4.5.4 -------------------- - -HttpClient 4.5.4 (GA) is a maintenance release that fixes a number of defects found since 4.5.3. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* [HTTPCLIENT-1883] SystemDefaultCredentialsProvider to use https.proxy* system properties - for origins with port 443. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1881] Allow truncated NTLM packets to work with this client. - Contributed by Karl Wright - -* [HTTPCLIENT-1855] Disabled caching of DIGEST auth scheme instances due to unreliability of nonce counter - when the auth cache is shared by multiple sessions. - Contributed by Oleg Kalnichevski - -* BasicCookieStore uses a ReentrantReadWriteLock to avoid synchronization on #getCookies/#toString - while maintaining thread safety. - Contributed by Carter Kozak - -* [HTTPCLIENT-1865] DefaultServiceUnavailableRetryStrategy does not respect HttpEntity#isRepeatable. - Contributed by Tomas Celaya - -* [HTTPCLIENT-1859] Encode Content-Disposition name and filename elements appropriately. - Contributed by Karl Wright - -* Avoid fetching the cached entity twice on cache hit. - Contributed by Leandro Nunes - -* [HTTPCLIENT-1835] #evictExpiredConnections no longer causes the #evictIdleConnections behaviour - to be implicitly enabled. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1831= URIBuilder should not prepend a leading slash to relative URIs. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1833] Fix Windows Negotiate-NTLM handling of proxies. - Contributed by Roman Stoffel - -* [HTTPCLIENT-1817] Add a "Trust All" TrustStrategy implementation. - Contributed by Gary Gregory - -* [HTTPCLIENT-1816] Update Apache Commons Codec 1.9 to 1.10. - Contributed by Gary Gregory - -* [HTTPCLIENT-1836] DefaultHostnameVerifier#getSubjectAltNames(X509Certificate) throws java.lang.ClassCastException. - Contributed by Gary Gregory , Ilian Iliev - -* [HTTPCLIENT-1845]: Extract InputStreamFactory classes out of GzipDecompressingEntity and - DeflateDecompressingEntity for reuse and to create less garbage. - Contributed by Gary Gregory - -* [HTTPCLIENT-1847] Update Ehcache from 2.6.9 to 2.6.11. - Contributed by Gary Gregory - -* [HTTPCLIENT-1848] Update spymemcached from 2.11.4 to 2.12.3. - Contributed by Gary Gregory - -* [HTTPCLIENT-1849] Update JNA from 4.1.0 to 4.4.0. - Contributed by Gary Gregory - -* [HTTPCLIENT-1850] Update SLF4J from 1.7.6 to 1.7.25. - Contributed by Gary Gregory - - -Release 4.5.3 -------------------- - -HttpClient 4.5.3 (GA) is a maintenance release that fixes a number of defects found since 4.5.2. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* [HTTPCLIENT-1803] Improved handling of malformed paths by URIBuilder. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1802] Do not attempt to match SSL host to subject CN if subject alternative name of any type are given. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1788] RFC 6265 policy must not reject cookies with paths that are no prefix of the uri path. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1792] SSLConnectionSocketFactory to throw SSLPeerUnverifiedException with a better error message - when hostname verification fails. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1779] [OSGi] support NTLM proxy authentication. - Contributed by Julian Sedding - -* [HTTPCLIENT-1773] [OSGi] HttpProxyConfigurationActivator does not unregister HttpClientBuilderFactory. - Contributed by Julian Sedding - -* [HTTPCLIENT-1771] improve OSGi webconsole display for org.apache.http.proxyconfigurator. - Contributed by Julian Sedding - -* [HTTPCLIENT-1770] OSGi metatype for org.apache.http.proxyconfigurator missing factoryPid. - Contributed by Julian Sedding - -* [HTTPCLIENT-1767] Null pointer dereference in EofSensorInputStream and ResponseEntityProxy. - Contributed by Peter Ansell - -* Support changing system default ProxySelector. - Contributed by Robin Stevens - -* All services registered in the OSGi service registry provide the whole bundle header dictionary as vendor - property value. - Contributed by Christoph Fiehe - -* [HTTPCLIENT-1750] OSGi support for CachingHttpClientBuilder. - Contributed by Justin Edelson - -* [HTTPCLIENT-1749] OSGi client builder to use weak references to track HttpClient instances. - Contributed by Justin Edelson - -* [HTTPCLIENT-1747] apply RequestConfig defaults when using HttpParams values in backward compatibility mode. - Contributed by Oleg Kalnichevski - -* Override LaxRedirectStrategy's INSTANCE field. - Contributed by Eric Wu - -* [HTTPCLIENT-1736] do not request cred delegation by default when using Kerberos auth. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1744] normalize hostname and certificate CN when matching to CN. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1732] SystemDefaultCredentialsProvider to take http.proxyHost and http.proxyPort system - properties into account. - Contributed by Oleg Kalnichevski - -* Revert "HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating auth token". - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1727] AbstractHttpClient#createClientConnectionManager does not account for context class loader. - Contributed by Charles Allen - -* [HTTPCLIENT-1726:] Copy the SNI fix from SSLConnectionSocketFactory to the deprecated SSLSocketFactory class. - Contributed by David Black - - -Release 4.5.2 -------------------- - -HttpClient 4.5.2 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.1. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* [HTTPCLIENT-1710, HTTPCLIENT-1718, HTTPCLEINT-1719] OSGi container compatibility improvements. - Contributed by 212427891 - -* [HTTPCLIENT-1717] Make fluent API Content#Content(byte[], ContentType) public. - Contributed by Cash Costello - -* [HTTPCLIENT-1715] NTLMEngineImpl#Type1Message not thread safe but declared as a constant. - Contributed by Olivier Lafontaine , Gary Gregory - -* [HTTPCLIENT-1714] Add HttpClientBuilder#setDnsResolver(DnsResolver). - Contributed by Alexis Thaveau - -* [HTTPCLIENT-1712] SPNego schemes to take service scheme into account when generating auth token. - Contributed by Georg Romstorfer - -* [HTTPCLIENT-1700] Netscape draft, browser compatibility, RFC 2109, RFC 2965 and default cookie - specs to ignore cookies with empty name for consistency with RFC 6265 specs. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1704] IgnoreSpec#match to always return false. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1550] Fixed 'deflate' zlib header check. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1698] Fixed matching of IPv6 addresses by DefaultHostnameVerifier - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1695] RFC 6265 compliant cookie spec to ignore cookies with empty name / missing - value. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1216] Removed ThreadLocal subclass from DateUtils. - Contributed by Jochen Kemnade - -* [HTTPCLIENT-1685] PublicSuffixDomainFilter to ignore local hosts and local domains. - Contributed by Oleg Kalnichevski - - - -Release 4.5.1 -------------------- - -HttpClient 4.5.1 (GA) is a maintenance release that fixes a number of minor defects found since 4.5. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* [HTTPCLIENT-1680] redirect of a POST request causes ClientProtocolException. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1673] org.apache.http.entity.mime.content.* missing from OSGi exports. - Contributed by Benson Margulies - -* [HTTPCLIENT-1668] Fluent request incorrectly handles connect timeout setting. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1667] RequestBuilder does not take charset into account when creating - UrlEncodedFormEntity. - Contributed by Sergey Smith - -* [HTTPCLIENT-1655] HttpClient sends RST instead of FIN ACK sequence when using non-persistant - connections. - Contributed by Oleg Kalnichevski - - - -Release 4.5 -------------------- - -HttpClient 4.5 (GA) is a minor feature release that includes several incremental enhancements -to the exisitng functionality such as support for private domains in the Mozilla Public Suffix List. - -Changelog: -------------------- - -* Reduced default validate after inactivity setting from 5 sec to 2 sec - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1649] Fixed serialization of auth schemes - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1645]: Fluent requests to inherit config parameters of the executor. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1640]: RFC6265 lax cookie policy fails to parse 'max-age' attribute. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1633]: RFC6265CookieSpecProvider compatibility level setting has no effect. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1613]: Support for private domains in Mozilla Public Suffix List. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1651]: Add ability to disable content compression on a request basis - Contributed by Michael Osipov - -* [HTTPCLIENT-1654]: Deprecate/remove RequestConfig#decompressionEnabled in favor of #contentCompressionEnabled - Contributed by Michael Osipov - - - -Release 4.4.1 -------------------- - -HttpClient 4.4.1 (GA) is a maintenance release that fixes a number of defects in new functionality -introduced in version 4.4. - -Users of HttpClient 4.4 are encouraged to upgrade. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Changelog: -------------------- - -* Marked RFC 2109, RFC 2965, Netscape draft cookie specs as obsolete - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1633] RFC6265CookieSpecProvider compatibility level setting has no effect. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1628]: Auth cache can fail when domain name contains uppercase characters. - Contributed by Dennis Ju - -* [HTTPCLIENT-1609] Stale connection check in PoolingHttpClientConnectionManager has no effect. - Internal connection pool does not correctly implement connection validation. - Contributed by Charles Lip - - - -Release 4.4 Final -------------------- - -This is the first stable (GA) release of HttpClient 4.4. Notable features and enhancements included -in 4.4 series are: - -* Support for the latest HTTP state management specification (RFC 6265). Please note that the old -cookie policy is still used by default for compatibility reasons. RFC 6265 compliant cookie -policies need to be explicitly configured by the user. Please also note that as of next feature -release support for Netscape draft, RFC 2109 and RFC 2965 cookie policies will be deprecated -and disabled by default. It is recommended to use RFC 6265 compliant policies for new applications -unless compatibility with RFC 2109 and RFC 2965 is required and to migrate existing applications -to the default cookie policy. - -* Enhanced, redesigned and rewritten default SSL hostname verifier with improved RFC 2818 -compliance - -* Default SSL hostname verifier and default cookie policy now validate certificate identity -and cookie domain of origin against the public suffix list maintained by Mozilla.org - - -* More efficient stale connection checking: indiscriminate connection checking which results -in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional -connection state validation (persistent connections are to be re-validated only if a specified -period inactivity has elapsed) - -* Authentication cache thread-safety: authentication cache used by HttpClient is now thread-safe -and can be shared by multiple threads in order to re-use authentication state for subsequent -requests - -* Native Windows Negotiate and NTLM via SSPI through JNA: when running on Windows OS HttpClient -configured to use native NTLM or SPNEGO authentication schemes can make use of platform specific -functionality via JNA and current user credentials. This functionality is still considered -experimental, known to have compatibility issues and subject to change without prior notice. -Use at your discretion. - -This release also includes all fixes from the stable 4.3.x release branch. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - - -Changelog: -------------------- - -* Support for the latest HTTP state management specification (RFC 6265). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1515] Caching of responses to HEAD requests - Contributed by Tyrone Cutajar and - Francois-Xavier Bonnet - -* [HTTPCLIENT-1560] Native Windows auth improvements - Contributed by Michael Osipov - -* Update Apache Commons Logging version from 1.1.3 to 1.2. - Contributed by Gary Gregory - -* Update Apache Commons Codec version from 1.6 to 1.9. - Contributed by Gary Gregory - -* Update Ehcache version from 2.2.0 to 2.6.9. - Contributed by Gary Gregory - -* Update Ehcache version from 2.2.0 to 2.6.9. - Contributed by Gary Gregory - -* Update Spymemcached version from 2.6 to 2.11.4. - Contributed by Gary Gregory - -* Update SLF4J version from 1.5.11 to 1.7.7. - Contributed by Gary Gregory - - - - - -Release 4.4 BETA1 -------------------- - -This is the first BETA release of HttpClient 4.4. Notable features and enhancements included -in 4.4 series are: - -* Enhanced redesigned and rewritten default SSL hostname verifier with improved RFC 2818 -compliance - -* Default SSL hostname verifier and default cookie policy now validate certificate identity -and cookie domain of origin against the public suffix list maintained by Mozilla.org - - -* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use -native NTLM or SPNEGO authentication schemes can make use of platform specific functionality -via JNA and current user system credentials - -* More efficient stale connection checking: indiscriminate connection checking which results -in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional -connection state validation (persistent connections are to be re-validated only if a specified -period inactivity has elapsed) - -* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe -and can be shared by multiple threads in order to re-use authentication state for subsequent -requests - -This release also includes all fixes from the stable 4.3.x release branch. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - - -Changelog: -------------------- - -* [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming". - Contributed by Willem Jiang - -* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native - Negotiate/NTLM auth schemes. - Contributed by Ka-Lok Fung - -* Improved compliance with RFC 2818: default hostname verifier to ignore the common name of the - certificate subject if alternative subject names (dNSName or iPAddress) are present. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1540] Support delegated credentials (ISC_REQ_DELEGATE) by Native windows - native Negotiate/NTLM auth schemes. - Contributed by Ka-Lok Fung - - - -Release 4.4 ALPHA1 -------------------- - -This is the first ALPHA release of HttpClient 4.4. Notable features and enhancements included -in the 4.4 branch are: - -* More efficient stale connection checking: indiscriminate connection checking which results -in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional -connection state validation (persistent connections are to be re-validated only if a specified -period inactivity has elapsed) - -* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use -native NTLM or SPNEGO authentication schemes can make use of platform specific functionality -via JNA and current user system credentials - -* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe -and can be shared by multiple threads in order to re-use authentication state for subsequent -requests - -This release also includes all fixes from the stable 4.3.x release branch. - -Please note that as of 4.4, HttpClient requires Java 1.6 or newer. - -Please note that new features included in this release are still considered experimental and -their API may change in the future 4.4 alpha and beta releases. - - -Changelog: -------------------- - -* [HTTPCLIENT-1493] Indiscriminate connection checking has been deprecated in favor of conditional - connection state validation. Persistent connections are to be re-validated only after a defined - period inactivity prior to being leased to the consumer. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1519] Use the original HttpHost instance passed as a parameter to - HttpClient#execute when generating 'Host' request header. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1491] Enable provision of Service Principal Name in Windows native - auth scheme. - Contributed by Malcolm Smith - -* [HTTPCLIENT-1403] Pluggable content decoders. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1461] fixed performance degradation in gzip encoded content processing - introduced by HTTPCLIENT-1432. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by - SystemDefaultCredentialsProvider. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1454] Make connection operator APIs public. - Contributed by Tamas Cservenak - -* Update JUnit to version 4.11 from 4.9 - Contributed by Gary Gregory - - - -Release 4.3.4 -------------------- - -HttpClient 4.3.4 (GA) is a maintenance release that improves performance in high concurrency -scenarios. This version replaces dynamic proxies with custom proxy classes and eliminates thread -contention in java.reflect.Proxy.newInstance() when leasing connections from the connection pool -and processing response messages. - - -Changelog: -------------------- - -* Replaced dynamic proxies with custom proxy classes to reduce thread contention. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1484] GzipCompressingEntity should not close the underlying output stream - if the entity has not been fully written out due to an exception. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1474] Fixed broken entity enclosing requests in HC Fluent. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1470] CachingExec(ClientExecChain, HttpCache, CacheConfig, AsynchronousValidator) - throws NPE if config is null - - - - -Release 4.3.3 -------------------- - -HttpClient 4.3.3 (GA) is a bug fix release that fixes a regression introduced by the previous -release causing a significant performance degradation in compressed content processing. - -Users of HttpClient 4.3 are encouraged to upgrade. - -Changelog: -------------------- - -* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1453] Thread safety regression in PoolingHttpClientConnectionManager - #closeExpiredConnections that can lead to ConcurrentModificationException. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1461] fixed performance degradation in compressed content processing - introduced by HTTPCLIENT-1432. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by - SystemDefaultCredentialsProvider. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException. - Contributed by Oleg Kalnichevski - - -Release 4.3.2 -------------------- - -HttpClient 4.3.2 (GA) is a maintenance release that delivers a number of improvements -as well as bug fixes for issues reported since 4.3.1 release. SNI support for -Oracle JRE 1.7+ is being among the most notable improvements. - -Users of HttpClient 4.3 are encouraged to upgrade. - -Changelog: -------------------- - -* [HTTPCLIENT-1447] Clients created with HttpClients.createMinimal do not work with absolute URIs - Contributed by Joseph Walton - -* [HTTPCLIENT-1446] NTLM proxy + BASIC target auth fails with 'Unexpected state: - MSG_TYPE3_GENERATED'. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1443] HttpCache uses the physical host instead of the virtual host as a cache key. - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1442] Authentication header set by the user gets removed in case - of proxy authentication (affects plan HTTP requests only). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1441] Caching AsynchronousValidationRequest leaks connections. - Contributed by Dominic Tootell - -* [HTTPCLIENT-1440] 'file' scheme in redirect location URI causes NPE. - Contributed by James Leigh - -* [HTTPCLIENT-1437] Made Executor#execute thread safe. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1119] SNI support (Oracle Java 1.7+ only). - Contributed by Bruno Harbulot - -* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1432] Lazy decompressing of HttpEntity#getContent() to avoid EOFException - in case of an empty response with 'Content-Encoding: gzip' header. - Contributed by Yihua Huang - -* [HTTPCLIENT-1431] (Regression) deprecated connection manager cannot be used with - a custom LayeredSchemeSocketFactory. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1425] Fixed socket closed exception thrown by caching HttpClient when the origin - server sends a long chunked response. - Contributed by James Leigh - -* [HTTPCLIENT-1417] Fixed NPE in BrowserCompatSpec#formatCookies caused by version 1 - cookies with null cookie value. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1416] Fixed NPE in CachingHttpClientBuilder#build(). - Contributed by Oleg Kalnichevski - - - -Release 4.3.1 -------------------- - -HttpClient 4.3.1 (GA) is a bug fix release that addresses a number of issues reported since -release 4.3. - -Users of HttpClient 4.3 are strongly encouraged to upgrade. - -Changelog -------------------- - -* [HTTPCLIENT-1410] Browser compatible hostname verifier no longer rejects - *.co., *.gov., *.info., etc as invalid. - Contributed by Oleg Kalnichevski - -* Ensure X509HostnameVerifier is never null. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1405] CONNECT HTTP/1.1 requests lack mandatory 'Host' header. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1402] Cache default User-Agent value. - Contributed by yuexiaojun - -* [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle plugin metadata. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1399] Fixed NPE in RequestBuilder. - Contributed by Oleg Kalnichevski - - - - -Release 4.3 Final -------------------- - -This is the first stable (GA) release of HttpClient 4.3. The most notable enhancements included -in this release are: - -* Support for Java 7 try-with-resources for resource management (connection release.) - -* Added fluent Builder classes for HttpEntity, HttpRequest, HttpClient and SSLContext instances. - -* Deprecation of preference and configuration API based on HttpParams interface in favor of -constructor injection and plain configuration objects. - -* Reliance on object immutability instead of access synchronization for thread safety. -Several old classes whose instances can be shared by multiple request exchanges have -been replaced by immutable equivalents. - -* DefaultHttpClient, DecompressingHttpClient, CachingHttpClient and similar classes are -deprecated in favor of builder classes that produce immutable HttpClient instances. - -* HttpClient builders now dynamically construct a request execution pipeline tailored -specifically to the user configuration by physically excluding unnecessary protocol components. - -* There is now an option to construct a minimal HttpClient implementation that can only execute -basic HTTP message exchanges without redirects, authentication, state management or proxy support. -This feature might be of particular use in web crawler development. - -* There is now option to avoid strict URI syntax for request URIs by executing HTTP requests -with an explicitly specified target host. HttpClient will no longer attempt to parse the request -URI if it does not need to extract the target host from it. - -This release also includes all fixes from the stable 4.2.x release branch. - - -Changelog -------------------- -* [HTTPCLIENT-1371] Weak ETag Validation is Useful On PUT With If-Match - Contributed by James Leigh - -* [HTTPCLIENT-1394] Support for Native windows Negotiate/NTLM via JNA - Contributed by Ryan McKinley - -* [HTTPCLIENT-1384] Expose CacheInvalidator interface. - Contributed by Nicolas Richeton - -* [HTTPCLIENT-1385] Fixed path normalization in CacheKeyGenerator - Contributed by James Leigh - -* [HTTPCLIENT-1370] Response to non-GET requests should never be cached with the default - ResponseCachingPolicy - Contributed by James Leigh - -* [HTTPCLIENT-1373] OPTIONS and TRACE should not invalidate cache - Contributed by James Leigh - -* [HTTPCLIENT-1383] HttpClient enters an infinite loop during NTLM authentication if the opposite - endpoint keeps responding with a type 2 NTLM response after type 3 MTLM message has already been - sent by the client. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1372] Refactor HttpMultipart, and add RFC6532 mode, so that headers in post - are no longer constrained to ASCII values. - Contributed by Karl Wright - -* [HTTPCLIENT-1377] User principal for non-NTLM authentication is incorrectly generated when using - user credentials are specified as NTCredentials - Contributed by Gary Gregory - - - -Release 4.3 BETA2 -------------------- - -This is the second BETA release of HttpClient 4.3. The most notable features and improvements -in the 4.3 branch are: Support for Java 7 try-with-resources for resource management (connection -release); fluent Builder classes for HttpEntity, HttpRequest and HttpClient instances, deprecation -of preference and configuration API based on HttpParams interface in favor of constructor injection -and plain configuration objects, reliance on object immutability instead of access synchronization -for thread safety. - -This release also includes all fixes from the stable 4.2.x release branch. - -Changelog -------------------- - - -* [HTTPCLIENT-1366] org.apache.http.client.utils.URLEncodedUtils should parse the semicolon as a query parameter separator. - Contributed by Gary Gregory - -* [HTTPCLIENT-1365] NPE when ManagedHttpClientConnectionFactory.create(ConnectionConfig) is called with null. - Contributed by Gary Gregory - -* [HTTPCLIENT-1362] Better error messages for connect timed out and connection refused - exceptions. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1360] separate out DeflateInputStream as an independent class, - so it can be used by others. - Contributed by Karl Wright - -* [HTTPCLIENT-1359] repeated requests using the same context fail if they redirect. - Contributed by James Leigh - -* [HTTPCLIENT-1354] do not quote algorithm parameter in DIGEST auth response. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1351] Added utility method to resolve final location from original request, - target host and a list of redirects. - Contributed by James Leigh - -* [HTTPCLIENT-1344] Userinfo credentials in URI should not default to preemptive BASIC - authentication. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1345] Useinfo credentials ignored in redirect location header. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1294] HttpClient to rewrite host name of the redirect location URI in order - to avoid circular redirect exception due to host name case mismatch. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1264] Add support for multiple levels of browser compatibility - to BrowserCompatSpec and BrowserCompatSpecFactory. Include constructor - argument for IE medium-security compatibility. - Contributed by Karl Wright (kwright at apache.org) - -* [HTTPCLIENT-1349] SSLSocketFactory incorrectly identifies key passed with keystore as - the keystore password. - Contributed by David Graff - -* [HTTPCLIENT-1346] Ensure propagation of SSL handshake exceptions. - Contributed by Pasi Eronen - -* [HTTPCLIENT-1343] SSLSocketFactory optional parameters for supported SSL protocols and cipher - suites. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1238] Contribute Bundle Activator And Central Proxy Configuration. - Contributed by Simone Tripodi - -* [HTTPCLIENT-1299] (regression) cache incorrectly disposes of the underlying cache resource - when storing variant entry. - Contributed by James Leigh - -* [HTTPCLIENT-1342] Redirects with underscore character in the location hostname cause - "java.lang.IllegalArgumentException: Host name may not be null". - Contributed by Oleg Kalnichevski - - - -Release 4.3 BETA1 -------------------- - -This is the first BETA release of HttpClient 4.3. The 4.3 branch enhances HttpClient in several -key areas and includes several notable features and improvements: Support for Java 7 -try-with-resources for resource management (connection release); fluent Builder classes for -HttpEntity, HttpRequest and HttpClient instances, deprecation of preference and configuration API -based on HttpParams interface in favor of constructor injection and plain configuration objects, -reliance on object immutability instead of access synchronization for thread safety. - -This release also includes all fixes from the stable 4.2.x release branch. - - -Changelog -------------------- - -* [HTTPCLIENT-1317] InetAddressUtils should handle IPv6 Addresses with Embedded IPv4 Addresses - Contributed Sebastian Bazley . - -* [HTTPCLIENT-1320] Leverage javax.net.ssl.SSLSocketFactory#getDefault() to initialize SSL context - based on system defaults instead of using an internal custom routine. - Contributed by Abe Backus and Oleg Kalnichevski - -* [HTTPCLIENT-1316] Certificate verification rejects IPv6 addresses which are not String-equal. - Contributed Sebastian Bazley . - -* [HTTPCLIENT-1307] Future based asynchronous request execution. - Contributed by Jilles van Gurp - -* [HTTPCLIENT-1313] Fixed IllegalStateException in deprecated ThreadSafeClientConnManager. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1298] Add AsynchronousValidator in HttpClientBuilder's list of closeable objects. - Contributed by Martin Meinhold - - - -Release 4.3 ALPHA1 -------------------- - -This is the first ALPHA release of HttpClient 4.3. The 4.3 branch enhances HttpClient in several -key areas and includes several notable features and improvements: Support for Java 7 -try-with-resources for resource management (connection release); fluent Builder classes for -HttpEntity, HttpRequest and HttpClient instances, deprecation of preference and configuration API -based on HttpParams interface in favor of constructor injection and plain configuration objects, -reliance on object immutability instead of access synchronization for thread safety. - -We are kindly asking all upstream projects to review API changes and help us improve -the APIs by providing feedback and sharing ideas on dev@hc.apache.org. - -This release also includes all fixes from the stable 4.2.x release branch. - -Please note that new features included in this release are still considered experimental and -their API may change in the future 4.3 alpha and beta releases. - - -Changelog -------------------- - -* [HTTPCLIENT-1250] Allow query string to be ignored when determining cacheability for - HTTP 1.0 responses. - Contributed by Don Brown - -* [HTTPCLIENT-1261] Make SystemDefaultHttpClient honor http.agent system property. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-900] Don't enforce URI syntax for messages with an explicit target host. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1190] HttpClient cache does not support "Vary: Cookie" - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1259] Calling #abort() on requests executed with DecompressingHttpClient has no - effect. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1253] URIBuilder setParameter() method could exceed the HTTP header size. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1216] Added method to force clean thread-local used by DateUtils. - Contributed by Oleg Kalnichevski - - -Release 4.2.3 -------------------- - -HttpClient 4.2.3 (GA) is a bug fix release that addresses a number of issues reported since -release 4.2.2. This release also includes a thoroughly reworked NTLM authentication engine -which should result in a better compatibility with the newest Microsoft products. - -Users of HttpClient 4.x are advised to upgrade. - -Changelog -------------------- - -* [HTTPCLIENT-1296] NPE gets thrown if you combine a default host with a virtual host - that has a -1 value for the port. - Contributed by Karl Wright - -* [HTTPCLIENT-1290] 304 cached response never reused with If-modified-since conditional - requests. - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1291] Absolute request URIs without an explicitly specified path are rewritten - to have "/" path). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1286] Request URI rewriting is inconsistent - URI fragments are not removed - from absolute request URIs. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1284] HttpClient incorrectly generates Host header when physical connection - route differs from the host name specified in the request URI. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1293] Kerberos and SPNego auth schemes use incorrect authorization header name - when authenticating with a proxy. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1283] NTLM needs to use Locale-independent form of - toUpperCase(). - Contributed by Karl Wright - -* [HTTPCLIENT-1279] Target host responding with status 407 (proxy authentication required) - causes an NPE. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1281] GzipDecompressingEntity does not release InputStream when an IOException - occurs while reading the Gzip header - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1277] Caching client sends a 304 to an unconditional request. - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1278] Update NTLM documentation. - Contributed by Karl Wright - -* SystemDefaultHttpClient misinterprets 'http.keepAlive' default value and disables - connection persistence if the system property is not set. This causes connection - based authentication schemes such as NTLM to fail. - -* [HTTPCLIENT-1276] cache update on a 304 response causes NPE. - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1273] DecompressingHttpClient does not automatically consume response - content in case of an i/o, HTTP or runtime exception thrown by the decompressing - protocol interceptor leading to a potential connection leak. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1268] NTLM engine refactor fix, to correct a buffer overrun, and get NTLMv2 - flags right. - Contributed by Karl Wright - -* [HTTPCLIENT-1266] NTLM engine refactoring and compatibility improvements. - Contributed by Karl Wright - -* [HTTPCLIENT-1263] BrowserCompatSpec: attribute values containing spaces or special characters - should be enclosed with quotes marks for version 1 cookies. - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1263] CachingHttpClient fails to release connections back to the connection - manager for some type of HTTP response messages when used together with DecompressingHttpClient. - Contributed by Francois-Xavier Bonnet - -* [HTTPCLIENT-1258] Fixed NullPointerException in NTLMEngineImpl caused by null NT domain - attribute. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1254] Redirect with underscore in hostname causes ProtocolException. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1255] AbstractVerifier incorrectly parses certificate CN containing wildcard. - Contributed by Oleg Kalnichevski - - - -Release 4.2.2 -------------------- - -HttpClient 4.2.2 (GA) is a bug fix release that addresses a number of issues reported since -release 4.2.1. - -Users of HttpClient 4.2 are advised to upgrade. - -Changelog -------------------- - -* [HTTPCLIENT-1248] Default and lax redirect strategies should not convert requests redirected - with 307 status to GET method. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1215] BasicAuthCache does not take default ports into consideration when - looking up cached authentication details by HttpHost key. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1241] (regression) Preemptive BASIC authentication failure should be considered - final and no further attempts to re-authenticate using the same credentials should be made. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1229] Fixed NPE in BasicClientConnectionManager that can be triggered by releasing - connection after the connection manager has already been shut down. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1227] Date parsing in DateUtils made more efficient. - Contributed by Patrick Linskey - -* [HTTPCLIENT-1224] (regression) NTLM auth not retried after a redirect over a non-persistent - connection. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1223] Cache could be more aggressive on cache invalidations - from Content-Location. Contributed by Jon Moore . - Contributed by Jon Moore - -* [HTTPCLIENT-1217] AutoRetryHttpClient does not release connection used by the previous response - when request is retried - Contributed by Oleg Kalnichevski - - - -Release 4.2.1 -------------------- - -HttpClient 4.2.1 (GA) is a bug fix release that addresses a number of issues reported since -release 4.2. - -Users of HttpClient 4.2 are advised to upgrade. - -Changelog -------------------- - -* [HTTPCLIENT-1209] Redirect URIs are now normalized. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1202] ResponseCachingPolicy should honor explicit cache-control - directives for other status codes - Contributed by Jon Moore - -* [HTTPCLIENT-1199] DecompressingHttpClient strips content from entity enclosing requests - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1198] HttpHost is not set in HttpContext in CachingHttpClient. - Contributed by Jon Moore - -* [HTTPCLIENT-1200] DecompressingHttpClient fails to generate correct HttpHost context attribute. - Contributed by Guillaume Castagnino - -* [HTTPCLIENT-1192] URIBuilder encodes query parameters twice. - Contributed by Oleg Kalnichevski and Sebastian Bazley . - -* [HTTPCLIENT-1196] Fixed NPE in UrlEncodedFormEntity constructor thrown if charset is null. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1193] Fixed regression in the route tracking logic of the default connection manager - causing cross-site redirect failures. - Contributed by Oleg Kalnichevski - -Release 4.2 -------------------- - -This is the first stable (GA) release of HttpClient 4.2. The most notable enhancements included -in this release are: - -* New facade API for HttpClient based on the concept of a fluent interface. The fluent API exposes - only the most fundamental functions of HttpClient and is intended for relatively simple use cases - that do not require the full flexibility of HttpClient. However, the fluent API almost fully - relieves the users from having to deal with connection management and resource deallocation. - -* Redesigned and rewritten connection management code. - -* Enhanced HTTP authentication API that enables HttpClient to handle more complex authentication - scenarios. HttpClient 4.2 is now capable of making use of multiple authentication challenges - and retry authentication with a fall-back scheme in case the primary one fails. This can be - important for compatibility with Microsoft products that are often configured to use - SPNEGO/Kerberos as the preferred authentication scheme. - - -Changelog -------------------- - -* [HTTPCLIENT-1187] If a revalidation response is deemed too old CachingHttpClient fails to - consume its content resulting in a connection leak. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1186] State of newly created connections in the connection pool is not always - correctly updated potentially allowing those connections to be leased to users with a different - security context. - Contributed by Ralf Poehlmann - -* [HTTPCLIENT-1179] Upgraded Commons Codec dependency to version 1.6 - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1177] always remove fragments from request URIs - Contributed by Oleg Kalnichevski - -Incompatible changes --------------------- -[Compared to release version 4.1.3] - -The following fields have been deprecated for some time now and have been deleted: - -org.apache.http.client.params.ClientPNames#CONNECTION_MANAGER_FACTORY -org.apache.http.impl.cookie.BrowserCompatSpec#DATE_PATTERNS - -The following methods have been deprecated for some time now and have been deleted: - -org.apache.http.client.params.ClientParamBean#setConnectionManagerFactory(org.apache.http.conn.ClientConnectionManagerFactory) -org.apache.http.client.protocol.ClientContextConfigurer#setAuthSchemePref(java.util.List) -org.apache.http.entity.mime.content.FileBody#writeTo(java.io.OutputStream, int) -org.apache.http.entity.mime.content.InputStreamBody#writeTo(java.io.OutputStream, int) -org.apache.http.entity.mime.content.StringBody#writeTo(java.io.OutputStream, int) - -The following classes have been deprecated for some while now and have been deleted: - -org.apache.http.impl.conn.tsccm.RefQueueHandler -org.apache.http.impl.conn.tsccm.AbstractConnPool no longer implements interface org.apache.http.impl.conn.tsccm.RefQueueHandler -org.apache.http.impl.conn.tsccm.ConnPoolByRoute no longer implements interface org.apache.http.impl.conn.tsccm.RefQueueHandler -org.apache.http.impl.conn.tsccm.RefQueueWorker - - - -Release 4.2 BETA1 -------------------- - -This is the first BETA release of HttpClient 4.2. This release completes development of several -notable enhancements in HttpClient: - -* New facade API for HttpClient based on the concept of a fluent interface. The fluent API exposes - only the most fundamental functions of HttpClient and is intended for relatively simple use cases - that do not require the full flexibility of HttpClient. However, the fluent API almost fully - relieves the users from having to deal with connection management and resource deallocation. - -* Redesigned and rewritten connection management code. As of release 4.2 HttpClient will be using - pooling connection manager per default. - -* Enhanced HTTP authentication API that enables HttpClient to handle more complex authentication - scenarios. HttpClient 4.2 is now capable of making use of multiple authentication challenges - and retry authentication with a fall-back scheme in case the primary one fails. This can be - important for compatibility with Microsoft products that are often configured to use - SPNEGO/Kerberos as the preferred authentication scheme. - - -Changelog -------------------- - -* [HTTPCLIENT-1164] Compressed entities are not being cached properly. - Contributed by Jon Moore . - -* [HTTPCLIENT-1154] MemcachedHttpCacheStorage should allow client to - specify custom prefix string for keys. - Contributed by Jon Moore . - -* [HTTPCLIENT-1153] MemcachedHttpCacheStorage uses URL as cache key; - shouldn't due to fixed maximum-length memcached keys. - Contributed by Jon Moore . - -* [HTTPCLIENT-1157] MemcachedHttpCacheStroage should throw IOExceptions - instead of RuntimeExceptions. - Contributed by James Miller . - -* [HTTPCLIENT-1152] MemcachedHttpCacheStorage should verify class of - returned object before casting. - Contributed by Rajika Kumarasiri . - -* [HTTPCLIENT-1155] CachingHttpClient fails to ensure that the response content gets fully consumed - when using a ResponseHandler, which can potentially lead to connection leaks. - Contributed by James Miller - -* [HTTPCLIENT-1147] When HttpClient-Cache cannot open cache file, should act like miss. - Contributed by Joe Campbell - -* [HTTPCLIENT-1137] Values for the Via header are cached and reused by httpclient-cache. - Contributed by Alin Vasile - -* [HTTPCLIENT-1142] Infinite loop on NTLM authentication failure. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1143] CachingHttpClient leaks connections with stale-if-error. - Contributed by James Miller - -Release 4.2 ALPHA1 -------------------- - -This is the first ALPHA release of HttpClient 4.2. The 4.2 branch enhances HttpClient in several -key areas and includes several notable features and improvements: - -* New facade API for HttpClient based on the concept of a fluent interface. The fluent API exposes - only the most fundamental functions of HttpClient and is intended for relatively simple use cases - that do not require the full flexibility of HttpClient. However, the fluent API almost fully - relieves the users from having to deal with connection management and resource deallocation. - -* Redesigned and rewritten connection management code. As of release 4.2 HttpClient will be using - pooling connection manager per default. - -* Enhanced HTTP authentication API that enables HttpClient to handle more complex authentication - scenarios. HttpClient 4.2 is now capable of making use of multiple authentication challenges - and retry authentication with a fall-back scheme in case the primary one fails. This can be - important for compatibility with Microsoft products that are often configured to use - SPNEGO/Kerberos as the preferred authentication scheme. - -Please note that new features included in this release are still considered experimental and -their API may change in the future ALPHA releases. - -Changelog -------------------- - -* [HTTPCLIENT-1128] SystemDefaultHttpClient (HttpClient implementation initialized using system - properties). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1135] RandomAccessFile mode 'w' used by HttpClientCache is not valid. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1131] HttpClient to authenticate preemptively using BASIC scheme if a userinfo - attribute is specified in the request URI. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1134] make BasicResponseHandler consume response content in case of an unsuccessful - result (status code >= 300). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1132] ProxyClient implementation. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1127] fixed dead-lock between SingleClientConnManager and AbstractPooledConnAdapter. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1107] Auth framework redesign. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1116] ResponseCachingPolicy uses integers for sizes - Contributed by Greg Bowyer - -* [HTTPCLIENT-1123] Support for pluggable DNS resolvers. - Contributed by Alin Vasile - -* [HTTPCLIENT-1120] DefaultHttpRequestRetryHandler#retryRequest should not retry aborted requests. - Contributed by Alin Vasile - -* Support for auth-int qop (quality of protection) option in Digest auth scheme. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1076] Fluent facade API (Google summer of code 2011 project). - Contributed by Xu Lilu - -* UriBuilder implementation. - Contributed by Xu Lilu - -* Redesign of connection management classes based on new pooling components from HttpCore. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1111] Added #prepareSocket method to SSLSocketFactory. - Contributed by Pasi Eronen - -* Added #reset() and #releaseConnection() methods to HttpRequestBase. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1105] AutoRetryHttpClient: built-in way to do auto-retry for certain status codes. - Contributed by Dan Checkoway - -* [HTTPCLIENT-1094] Digest auth scheme refactoring. - Contributed by Oleg Kalnichevski - -* Lax implementation of RedirectStrategy. - Contributed by Bartosz Firyn - -* [HTTPCLIENT-1044] HttpRequestRetryHandler implementation compliant with the definition of - idempotent methods given in the RFC 2616. - Contributed by Oleg Kalnichevski - - -Release 4.1.2 -------------------- - -The HttpClient 4.1.2 is a bug fix release that addresses a number of non-critical issues reported -since release 4.1.1. - -* [HTTPCLIENT-1100] Missing Content-Length header makes cached entry invalid - Contributed by Bart Robeyns - -* [HTTPCLIENT-1098] Avoid expensive reverse DNS lookup on connect timeout exception. - Contributed by Thomas Boettcher - -* [HTTPCLIENT-1097] BrowserCompatHostnameVerifier and StrictHostnameVerifier should handle - wildcards in SSL certificates better. - Contributed by Sebastian Bazley - -* [HTTPCLIENT-1092] If ClientPNames.VIRTUAL_HOST does not provide the port, derive it from the - current request. - Contributed by Sebastian Bazley - -* [HTTPCLIENT-1087] NTLM proxy authentication fails on retry if the underlying connection is closed - as a result of a target authentication failure. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1079] Fixed Kerberos cross-realm support - Contributed by Michael Osipov <1983-01-06 at gmx.net> - -* [HTTPCLIENT-1078] Decompressing entities (DeflateDecompressingEntity, GzipDecompressingEntity) - do not close content stream in #writeTo() method. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1075] Decompressing entities (DeflateDecompressingEntity, GzipDecompressingEntity) - do not correctly handle content streaming. - Contributed by James Abley - -* [HTTPCLIENT-1051] Avoid reverse DNS lookups when opening SSL connections by IP address. - Contributed by Oleg Kalnichevski - - -Release 4.1.1 -------------------- - -HttpClient v4.1.1 is a bug fix release that addresses a number of issues reported since -release 4.1, including one critical security issue (HTTPCLIENT-1061). All users of HttpClient 4.0.x -and 4.1 are strongly encouraged to upgrade. - -* [HTTPCLIENT-1069] HttpHostConnectException not correctly retried for direct and non-tunnelled - proxy connections. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1066] Changed the way URIUtils#rewriteURI handles multiple consecutive slashes in the - URI path component: multiple leading slashes will be replaced by one slash in order to avoid - confusion with the authority component. The remaining content of the path will not be modified. - (also see HTTPCLIENT-929). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1061] Fixed critical bug causing Proxy-Authorization header to be sent to the target - host when tunneling requests through a proxy server that requires authentication. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1056] Fixed bug causing the RequestAuthCache protocol interceptor to generate - an invalid AuthScope instance when looking up user credentials for preemptive authentication. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1053] Fixed the way DigestScheme generates nonce-count values. - Contributed by Oleg Kalnichevski - - -Release 4.1 -------------------- - -The HttpClient 4.1 release builds upon the stable foundation laid by HttpClient 4.0 and adds several -functional improvements and popular features. - -* Response caching conditionally compliant with HTTP/1.1 specification (full compliance with - MUST requirements, partial compliance with SHOULD requirements) - -* Full support for NTLMv1, NTLMv2, and NTLM2 Session authentication. The NTLM protocol code - was kindly contributed by the Lucene Connector Framework project. - -* Support for SPNEGO/Kerberos authentication. - -* Persistence of authentication data between request executions within the same execution context. - -* Support for preemptive authentication for BASIC and DIGEST schemes. - -* Support for transparent content encoding. Please note transparent content encoding is not - enabled per default in order to avoid conflicts with already existing custom content encoding - solutions. - -* Mechanism to bypass the standard certificate trust verification (useful when dealing with - self-signed certificates). - -* Simplified configuration for connection managers. - -* Transparent support for host multihoming. - -IMPORTANT: please note that the HttpClient 3.x branch is now officially END OF LIFE and is no longer -maintained and supported by the Apache HttpComponents project. - -Changelog -------------------- -* The public API for the caching module had a minor change between 4.1-beta and 4.1-GA to the - HttpCacheEntry class - the deprecated public Set getVariantURIs() method and constructor - public HttpCacheEntry(Date requestDate, Date responseDate, - StatusLine statusLine, Header[] responseHeaders, - Resource resource, Set variants) - were both removed. This will not affect you unless you are implementing new storage backends - that use the deprecated code and/or are implementing custom serializers for cache entries. - -* Changed Browser-Compatibility and Best-Match cookie policies to emulate the behaviour of FireFox - more closely when parsing Netscape style cookies. Comma will no longer be treated as a header - element separator if Set-Cookie does not contain a Version attribute mandated by the - RFC2109 / RFC 2965 cookie specifications. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1036] StringBody has incorrect default for characterset. (Default changed - to US-ASCII) - Contributed by Sebastian Bazley - -* [HTTPCLIENT-975] Support stale-if-error and stale-while-revalidate extension directive (RFC5861). - Contributed by Mohammed Azeem Uddin , - Michajlo Matijkiw , and - Matthew Hawthorne . - -* [HTTPCLIENT-1033] HttpRoute.equals(Object o) is quite inefficient, as it does not take full - advantage of shortcut logic. - Contributed by Sebastian Bazley - -* [HTTPCLIENT-1030] Implement "ignoreCookies" CookieSpec - Contributed by Sebastian Bazley - -Release 4.1 BETA1 -------------------- - -HttpClient 4.1 BETA1 finalizes the 4.1 API and brings a number of major improvements to the HTTP -caching module. This release also adds full support for NTLMv1, NTLMv2, and NTLM2 Session -authentication. The NTLM protocol code was kindly contributed by the Lucene Connector Framework -project. - -Changelog -------------------- -* [HTTPCLIENT-1015] Support only-if-cached directive. - Contributed by Michajlo Matijkiw - -* [HTTPCLIENT-990] Allow heuristic freshness caching. - Contributed by Michajlo Matijkiw - -* [HTTPCLIENT-919] Support for NTLMv1, NTLMv2, and NTLM2 Session authentication. - Contributed by Karl Wright - -* [HTTPCLIENT-1008] Send all variants' ETags on "variant miss". - Contributed by Michajlo Matijkiw and - Mohammed Azeem Uddin - -* [HTTPCLIENT-1011] Handling of IOExceptions thrown by cache components. - Contributed by Jonathan Moore - -* [HTTPCLIENT-1003] Handle conditional requests in cache. - Contributed by Michajlo Matijkiw and - Mohammed Azeem Uddin - -* [HTTPCLIENT-1002] Stale connection check fails if wire logging is on. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-1000] Maximum connection lifetimes settings for ThreadSafeClientConnManager. - Contributed by Michajlo Matijkiw - -* [HTTPCLIENT-960] HttpMultipart doesn't generate Content-Type header for binary parts in - BROWSER_COMPATIBLE mode. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-998] Cache should use both Last-Modified and ETag for validations when available. - Contributed by Jonathan Moore - -* [HTTPCLIENT-997] Cache module should handle out-of-order validations properly and unconditionally - refresh. - Contributed by Jonathan Moore - -* [HTTPCLIENT-994] Cache does not allow client to override origin-specified freshness using - max-stale. - Contributed by Jonathan Moore - -* [HTTPCLIENT-995] Cache returns cached responses even if validators not consistent with all - conditional headers. - Contributed by Jonathan Moore - -* [HTTPCLIENT-977] Memcached implementation for HttpCache. - Contributed by Mohammed Azeem Uddin - -* [HTTPCLIENT-992] cache should not generate stale responses to requests explicitly requesting - first-hand or fresh ones. - Contributed by Jonathan Moore - -* [HTTPCLIENT-991] cache module produces improperly formatted Warning header when revalidation - fails. - Contributed by Jonathan Moore - -* [HTTPCLIENT-989] DefaultHttpRequestRetryHandler no longer retries non-idempotent http methods - if NoHttpResponseException is thrown. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-988] Cache module should strip 'Content-Encoding: identity' from responses - Contributed by Jonathan Moore - -* [HTTPCLIENT-987] cache module does not recognize equivalent URIs. - Contributed by Jonathan Moore - -* [HTTPCLIENT-986] cache module does not completely handle upstream Warning headers correctly - Contributed by Jonathan Moore - -* [HTTPCLIENT-985] cache module should populate Via header to capture upstream and downstream protocols - Contributed by Jonathan Moore - -* [HTTPCLIENT-984] Additional conditional compliance tests for the caching module for - Content-Encoding, Content-Location, Date, Expires, Server, Transfer-Encoding, and Vary headers. - Contributed by Jonathan Moore - -* [HTTPCLIENT-978] HTTP cache update exception handling - Contributed by Michajlo Matijkiw - -* [HTTPCLIENT-981] CachingHttpClient returns a 411 respones when executing a POST (HttpPost) - request. - Contributed by Joe Campbell - -* [HTTPCLIENT-980] CachingHttpClient returns a 503 response when the backend HttpClient produces - an IOException. - Contributed by Jonathan Moore - -* [HTTPCLIENT-978] Ehcache based HTTP cache implementation - Contributed by Michajlo Matijkiw - -* [HTTPCLIENT-967] support for non-shared (private) caches - Contributed by Jonathan Moore - -* [HTTPCLIENT-969] BasicCookieStore#getCookies() to return a copy of Cookie list - Contributed by David Smiley - -* [HTTPCLIENT-965] Fixed problem with cache not honoring must-revalidate or - proxy-revalidate Cache-Control directives. - Contributed by Jonathan Moore - -* [HTTPCLIENT-964] 'no-cache' directives with field names are no longer transmitted - downstream. - Contributed by Jonathan Moore - -* [HTTPCLIENT-963] Fixed handling of 'Cache-Control: no-store' on requests. - Contributed by Jonathan Moore - -* [HTTPCLIENT-962] Fixed handling of Authorization headers in shared cache mode. - Contributed by Jonathan Moore - -* [HTTPCLIENT-961] Not all applicable URIs are invalidated on PUT/POST/DELETEs - that pass through client cache. - Contributed by Jonathan Moore - -* [HTTPCLIENT-958] Client cache no longer allows incomplete responses to be - passed on to the client. - Contributed by Jonathan Moore - -* [HTTPCLIENT-951] Non-repeatable entity enclosing requests are not correctly - retried when 'expect-continue' handshake is active. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-948] In rare circumstances the idle connection handling code - can leave closed connections in a inconsistent state. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-953] IllegalStateException thrown by RouteSpecificPool. - Contributed by Guillaume - -* [HTTPCLIENT-952] Trust store parameter is ignored by SSLSocketFactory - (affects version 4.1-alpha2 only) - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-937] CacheEntry made immutable; now uses immutable HttpEntity - to store cached content. - Contributed by David Mays and - Oleg Kalnichevski - -Release 4.1 ALPHA2 -------------------- - -HttpClient 4.1 ALPHA2 fixes a number of non-severe bugs discovered since -the last release and introduces support for two frequently requested features: - -* HTTP/1.1 response caching - -* transparent support for host multihoming - -* a mechanism to bypass the standard certificate trust verification -(useful when dealing with self-signed certificates) - -Compatibility notes -------------------- -(1) Please note the HTTP caching module is still considered experimental and -its API may change significantly in the future releases. - -(2) This release eliminates Mime4J as a dependency for the HttpMime module. -HttpMime is no longer binary compatible with the previous releases. -Full API and binary compatibility between minor versions of HttpMime will be -maintained as of 4.1 GA release. - -Changelog -------------------- - -* [HTTPCLIENT-936] Fixed bug causing NPE or an infinite loop in - the authentication code in case of a SPNEGO authentication failure. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-427] HTTP caching support - Contributed by Joe Campbell, David Cleaver, David Mays, Jon Moore, Brad Spenla - -* Dropped dependency on Mime4j for HttpMime. - Contributed by Oleg Kalnichevski - -* Extended SSLSocketFactory with a mechanism to bypass the standard certificate - trust verification (primarily to simplify dealing with self-signed - certificates) - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-898] Improved support for host multihoming - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-916] UsernamePasswordCredentials, NTUserPrincipal, - BasicClientCookie, BasicClientCookie2 and BasicCookieStore made Serializable. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-914] Upgraded Commons Codec dependency to version 1.4 - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-903] Use ConcurrentHashMap instead of [Linked]HashMap for - thread-safety. Improve performance of AuthSchemeRegistry, CookieSpecRegistry - and SchemeRegistry classes. - Contributed by Sebastian Bazley - -* [HTTPCLIENT-902] HttpRequestRetryHandler not called on I/O exceptions - thrown when opening a new connection. - Contributed by Olivier Lamy and - Oleg Kalnichevski - -Release 4.1 ALPHA1 -------------------- - -HttpClient 4.1 ALPHA1 builds on the stable 4.0 release and adds several -functionality improvements and new features. - -* Simplified configuration of connection managers. - -* Persistence of authentication data between request executions within - the same execution context. - -* Support for SPNEGO/Kerberos authentication scheme - -* Support for transparent content encoding. Please note transparent content - encoding is not enabled per default in order to avoid conflicts with - already existing custom content encoding solutions. - -* 5 to 10% performance increase due to elimination of unnecessary Log object - lookups by short-lived components. - -Please note all methods and classes added in this release and marked as -4.1 are API unstable and can change in the future 4.1 ALPHA releases. - -Changelog -------------------- - -* [HTTPCLIENT-889] 'expect: continue' handshake disabled per default. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-862] Extended client's redirect handling interface to allow - control of the content of the redirect. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-872] HttpClient can now persist authentication data between request - executions as long as they share the same execution context. It has also become - much easier to make HttpClient authenticate preemptively by pre-populating - authentication data cache. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-883] SO_TIMEOUT is not reset on persistent (re-used) connections. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-832] Distinguish cookie format errors from violations of - restrictions imposed by a cookie specification. In the latter case - CookieRestrictionViolationException will be thrown. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-523] Support for SPNEGO authentication scheme. - Contributed by Matthew Stevenson - -* Simplified configuration of connection managers. Total connection maximum - and maximum connection per route limits can be set using methods of - the class instead of HTTP parameters. - Contributed by Oleg Kalnichevski - -* Added parameters to define the order of preference for supported auth - schemes for target host and proxy authentication. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-875] DefaultClientConnectionOperator#openConnection doesn't - update the connection state if the connection socket changed after - the call to SocketFactory#connectSocket(). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-834] Transparent content encoding support. - Contributed by James Abley - -Release 4.0.1 -------------------- - -This is a bug fix release that addresses a number of issues discovered since -the previous stable release. None of the fixed bugs is considered critical. -Most notably this release eliminates eliminates dependency on JCIP annotations. - -This release is also expected to improve performance by 5 to 10% due to -elimination of unnecessary Log object lookups by short-lived components. - -Changelog -------------------- - -* [HTTPCLIENT-895] Eliminated Log lookups in short lived objects impairing - performance. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-885] URLEncodedUtils now correctly parses form-url-encoded - entities that specify a charset. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-884] UrlEncodedFormEntity now sets charset on the Content-Type - header. - Contributed by Jared Jacobs - -* [HTTPCLIENT-883] SO_TIMEOUT is not reset on persistent (re-used) connections. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-882] Auth state is now correctly updated if a successful NTLM - authentication results in a redirect. This is a minor bug as HttpClient - manages to recover from the problem automatically. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-881] Fixed race condition in AbstractClientConnAdapter that makes - it possible for an aborted connection to be returned to the pool. - Contributed by Tim Boemker and - Oleg Kalnichevski - -* [HTTPCLIENT-866] Removed dependency on jcip-annotations.jar. - Contributed by Oleg Kalnichevski - and Sebastian Bazley - - -Release 4.0 -------------------- - -HttpClient 4.0 represents a complete, ground-up redesign and almost a complete -rewrite of the HttpClient 3.x codeline. This release finally addresses several -design flaws that existed since the 1.0 release and could not be fixed without -a major code overhaul and breaking API compatibility. - - -Architectural changes ---------------------- - -* Redesign of the HttpClient internals addressing all known major - architectural shortcomings of the 3.x codeline. - -* Cleaner, more flexible and expressive API. - -* More modular structure. - -* Better performance and smaller memory footprint due to a more efficient HTTP - transport based on HttpCore. - -* Implementation of cross-cutting HTTP protocol aspects through protocol - interceptors. - -* Improved connection management, better handling of persistent connections, - support for stateful connections - -* Pluggable redirect and authentication handlers. - -* Improved support for sending requests via a proxy or a chain of proxies - -* More flexible SSL context customization - -* Reduced intermediate garbage in the process of generating HTTP requests - and parsing HTTP responses - - -Important notes -------------------- - -* Future releases of HttpMime module may be binary incompatible with this - release due to possible API changes in Apache Mime4J. Apache Mime4J is - still being actively developed and its API is considered unstable. - -* HttpClient 4.0 is not fully binary compatible with 4.0 BETA1 release. - Some protected variables in connection management class have been - made final in order to help ensure their thread safety: - - org.apache.http.conn.BasicEofSensorWatcher#attemptReuse - org.apache.http.conn.BasicEofSensorWatcher#managedConn - org.apache.http.impl.conn.DefaultClientConnectionOperator#schemeRegistry - org.apache.http.impl.conn.DefaultHttpRoutePlanner#schemeRegistry - org.apache.http.impl.conn.ProxySelectorRoutePlanner#schemeRegistry - org.apache.http.impl.conn.SingleClientConnManager#alwaysShutDown - org.apache.http.impl.conn.SingleClientConnManager#connOperator - org.apache.http.impl.conn.SingleClientConnManager#schemeRegistry - org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager#connOperator - org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager#schemeRegistry - - -Bug fixes since 4.0 BETA2 release -------------------- - -* [HTTPCLIENT-861] URIUtils#resolve is now compatible with all examples given - in RFC 3986. - Contributed by Johannes Koch - -* [HTTPCLIENT-860] HttpClient no longer converts redirects of PUT/POST to GET - for status codes 301, 302, 307, as required by the HTTP spec. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-859] CookieIdentityComparator now takes path attribute into - consideration when comparing cookies. - Contributed by Oleg Kalnichevski - -* HttpClient will no longer send expired cookies back to the origin server. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-856] Proxy NTLM authentication no longer fails on a redirect to - a different host. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-841] Removed automatic connection release using garbage collection - due to a memory leak. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-853] Fixed bug causing invalid cookie origin port to be selected - when the target is accessed on the default port and the connection is - established via a proxy. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-852] Fixed bug causing automatically retried redirects fail with - CircularRedirectException. - Contributed by Oleg Kalnichevski - -* Fixed problem with the default HTTP response parser failing to handle garbage - preceding a valid HTTP response. - Contributed by Oleg Kalnichevski - -* NonRepeatableRequestExceptions now include the cause that the original - request failed. - Contributed by Sam Berlin - -* [HTTPCLIENT-837] Fixed problem with the wire log skipping zero byte values - if read one byte at a time. - Contributed by Kirill Safonov - -* [HTTPCLIENT-823] 'http.conn-manager.max-total' parameter can be adjusted - dynamically. However, the size of existing connection pools per route, - once allocated, will not be adjusted. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-822] Default socket factories to rethrow SocketTimeoutException - as ConnectTimeoutException in case of connect failure due to a time out. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-813] Fixed default port resolution. Invalid ports no longer - get replaced with the default port value. - Contributed by Oleg Kalnichevski - -Release 4.0 beta 2 -------------------- - -BETA2 is a maintenance release, which addresses a number of issues -discovered since the previous release. - -The only significant new feature is an addition of an OSGi compliant -bundle combining HttpClient and HttpMime jars. - -All upstream projects are strongly encouraged to upgrade. - -* Fixed NPE in DefaultRequestDirector thrown when retrying a failed - request over a proxied connection. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-803] Fixed bug in SSL host verifier implementations - causing the SSL certificate to be rejected as invalid if the connection - is established using an IP address. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-806] DefaultHttpMethodRetryHandler will no longer retry - on ConnectExceptions. - Contributed by Oleg Kalnichevski - -* DigestScheme can use an arbitrary digest algorithm requested by the - target server (such as SHA) as long as this algorithm is supported by - the Java runtime. - Contributed by Oleg Kalnichevski - -* Fixed parsing and validation of RFC2109 compliant Set-Cookie headers - by the Best-Match cookie spec. - Contributed by Oleg Kalnichevski - -* Fixed bug that can cause a managed connection to be returned from the - pool in an inconsistent state. - Contributed by Oleg Kalnichevski - - -4.0 Beta 1 -------------------- - -BETA1 release brings yet another round of API enhancements and -improvements in the area of connection management. Among the most notable -ones is the capability to handle stateful connections such as persistent -NTLM connections and private key authenticated SSL connections. - -This is the first API stable release of HttpClient 4.0. All further -releases in the 4.0 code line will maintain API compatibility with this -release. - -There has been a number of important bug fixes since ALPHA4. All upstream -projects are encouraged to upgrade to the latest release. - -Please note HttpClient currently provides only limited support for NTLM -authentication. For details please see NTLM_SUPPORT.txt. - -------------------- - -Changelog: -------------------- - -* [HTTPCLIENT-790] Protocol interceptors are now correctly invoked when - executing CONNECT methods. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-668] Do not use static loggers. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-781] Respect Keep-Alive header's timeout value. - Contributed by Sam Berlin - -* [HTTPCLIENT-779] Top-level classes (HttpClient, and HttpGet, HttpPut - and similar HttpMethods) throw fewer checked exceptions. - Contributed by Sam Berlin - -* HttpClient will throw an exception if an attempt is made to retry - a request with a non-repeatable request entity. - Contributed by Oleg Kalnichevski - -* Fixed request re-generation logic when retrying a failed request. - Auto-generated headers will no accumulate. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-424] Preemptive authentication no longer limited to BASIC - scheme only. HttpClient can be customized to authenticate preemptively - with DIGEST scheme. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-670] Pluggable hostname resolver. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-719] Clone support for HTTP request and cookie objects. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-776] Fixed concurrency issues with AbstractPoolEntry. - Contributed by Sam Berlin - -* Resolved a long standing problem with HttpClient not taking into account - the user context when pooling / re-using connections. HttpClient now - correctly handles stateful / user specific connections such as persistent - NTLM connections and SSL connections with client side authentication. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-773] Improved handling of the 'expires' attribute by the - 'Best Match' cookie spec. - Contributed by Oleg Kalnichevski - -* Partial NTLM support (requires an external NTLM engine). For details see - NTLM_SUPPORT.txt - Contributed by Oleg Kalnichevski - -* Redesigned local execution context management. - Contributed by Oleg Kalnichevski - --------------------------------------- - -Release 4.0 Alpha 4 -------------------- - -ALPHA4 marks the completion of the overhaul of the connection management -code in HttpClient. All known shortcomings of the old HttpClient 3.x -connection management API have been addressed. - -NTLM authentication remains the only missing major feature in the new -codeline that prevents us from moving awards the API freeze. - -There has been a number of important bug fixes since ALPHA3. All upstream -projects are encouraged to upgrade to the latest release. - -------------------- - -HttpClient 3.x features that have NOT yet been ported: -------------------- - -* NTLM authentication scheme - -------------------- - -Changelog: -------------------- - -* [HTTPCLIENT-765] String.toLowerCase() / toUpperCase() should specify - Locale.ENGLISH - Contributed by Sebastian Bazley - -* [HTTPCLIENT-769] Do not pool connection marked non-reusable. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-763] Fixed problem with AbstractClientConnAdapter#abortConnection() - not releasing the connection if called from the main execution thread while - there is no blocking I/O operation. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-652] Added optional state attribute to managed client connections. - This enables connection managers to correctly handle stateful connections. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-673] Revised max connections per route configuration - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-753] Class Scheme and related classes moved to a separate package - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-757] Improved request wrapping in the DefaultClientRequestDirector. - This also fixed the problem with the default proxy set at the client level - having no effect. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-734] Request abort will unblock the thread waiting for a connection - Contributed by Sam Berlin - -* [HTTPCLIENT-759] Ensure release of connections back to the connection manager - on exceptions. - Contributed by Sam Berlin - -* [HTTPCLIENT-758] Fixed the use of generics in AbstractHttpClient - #removeRequestInterceptorByClass and #removeResponseInterceptorByClass - Contributed by Johannes Koch - -* [HTTPCLIENT-749] HttpParams beans - Contributed by Stojce Dimski - -* [HTTPCLIENT-755] Workaround for known bugs in java.net.URI.resolve() - Bug ID: 4708535 - Contributed by Johannes Koch - --------------------------------------- - -Release 4.0 Alpha 3 -------------------- - -ALPHA3 release brings another round of API refinements and improvements in -functionality. As of this release HttpClient requires Java 5 compatible -runtime environment and takes full advantage of generics and new concurrency -primitives. - -This release also introduces new default cookie policy that selects a cookie -specification depending on the format of cookies sent by the target host. -It is no longer necessary to know beforehand what kind of HTTP cookie support -the target host provides. HttpClient is now able to pick up either a lenient -or a strict cookie policy depending on the compliance level of the target host. - -Another notable improvement is a completely reworked support for multipart -entities based on Apache mime4j library. - -------------------- - -HttpClient 3.x features that have NOT yet been ported: -------------------- - -* NTLM authentication scheme - -------------------- - -Changelog: -------------------- - -* [HTTPCLIENT-742] common interface for HttpRoute and RouteTracker - Contributed by Roland Weber - -* [HTTPCLIENT-741] Fixed concurrency issues in AbstractClientConnAdapter. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-726] testcase for spurious wakeups in ThreadSafeClientConnManager - Contributed by Roland Weber - -* [HTTPCLIENT-643] Automatic connect fail-over for multi-home remote servers. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-735] unsetting of DEFAULT_PROXY and FORCED_ROUTE in hierarchies - Contributed by Roland Weber - -* [HTTPCLIENT-723] route planner based on java.net.ProxySelector - Contributed by Roland Weber - -* [HTTPCLIENT-740] don't start connection GC thread in pool constructor - Contributed by Roland Weber - -* [HTTPCLIENT-736] route planners use SchemeRegistry instead of ConnManager - Contributed by Roland Weber - -* [HTTPCLIENT-730] Fixed rewriting of URIs containing escaped characters - Contributed by Sam Berlin and - Oleg Kalnichevski - -* [HTTPCLIENT-667] Added 'Meta' cookie policy that selects a cookie - specification depending on the format of the cookie(s). - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-729] Move HttpRoute and related classes to routing package. - Contributed by Roland Weber - -* [HTTPCLIENT-725] Use TimeUnit arguments for timeouts in connection manager. - Contributed by Roland Weber - -* [HTTPCLIENT-677] Connection manager no longer uses Thread.interrupt(). - Contributed by Roland Weber - -* [HTTPCLIENT-716] Allow application-defined routes. - Contributed by Roland Weber - -* [HTTPCLIENT-712] Improve HttpRoute API - Contributed by Roland Weber - -* [HTTPCLIENT-711] Bad route computed for redirected requests - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-715] Remove RoutedRequest from API - Contributed by Roland Weber - -* [HTTPCLIENT-705] Fixed incorrect handling of URIs with null path component. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-688] HttpOptions#getAllowedMethods can now handle multiple - Allow headers. - Contributed by Andrea Selva - --------------------------------------- - -Release 4.0 Alpha 2 -------------------- - -ALPHA2 release is another milestone in the redesign of HttpClient. It includes -a number of improvements since ALPHA1, among which are improved connection -pooling, support for proxy chains, redesigned HTTP state and authentication -credentials management API, improved RFC 2965 cookie specification. - -------------------- - -HttpClient 3.x features that have NOT yet been ported -------------------- -* NTLM authentication scheme - -* Support for multipart MIME coded entities - -------------------- - -Changelog -------------------- - -* [HTTPCLIENT-698] Resolve non-absolute redirect URIs relative to - the request URI - Contributed by Johannes Koch - -* [HTTPCLIENT-697] Throw a more intelligible exception when connection - to a remote host cannot be established. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-689] Caching of SimpleDateFormat in DateUtils - Contributed by Daniel Müller - -* [HTTPCLIENT-689] stackable parameters in AbstractHttpClient - Contributed by Roland Weber - -* [HTTPCLIENT-477] Use distinct instances of the authentication handler - interface for authentication with target and proxy hosts - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-690] ManagedClientConnection provides access to SSLSession - Contributed by Roland Weber - -* [HTTPCLIENT-692] ClientConnectionManager throws InterruptedException - Contributed by Roland Weber - -* [HTTPCORE-116] moved parameter names to interfaces - Contributed by Roland Weber - -* [HTTPCLIENT-649] support for proxy chains in HttpConn - Contributed by Roland Weber - -* [HTTPCLIENT-636] refactor ThreadSafeClientConnManager in separate package - Contributed by Roland Weber - -* [HTTPCLIENT-669] new HttpRoutePlanner interface and implementation - Contributed by Andrea Selva - -* [HTTPCLIENT-653] detached connection wrapper no longer prevents - garbage collection of ThreadSafeClientConnManager - Contributed by Roland Weber - -* [HTTPCLIENT-674] use org.apache.http.util.VersionInfo instead of a local one - Contributed by Roland Weber - -* [HTTPCLIENT-666] Replaced HttpState with CredentialsProvier and CookieStore interfaces - Contributed by Oleg Kalnichevski - -* [HTTPCORE-100] revised HttpContext hierarchy - Contributed by Roland Weber - -* [HTTPCLIENT-618] eliminate class HostConfiguration - Contributed by Roland Weber - -* [HTTPCLIENT-672] re-sync with API changes in core alpha6-SNAPSHOT - Contributed by Roland Weber - --------------------------------------- - -Release 4.0 Alpha 1 -------------------- - -HttpClient 4.0 represents a complete, ground-up redesign and almost a complete -rewrite of the HttpClient 3.x codeline. This release finally addresses several -design flaws that existed since the 1.0 release and could not be fixed without -a major code overhaul and breaking API compatibility. - -The HttpClient 4.0 API is still very experimental and is bound to change -during the course of the ALPHA development phase. Several important features -have not yet been ported to the new API. - -Architectural changes ---------------------- - -* Redesign of the HttpClient internals addressing all known - major architectural shortcomings of the 3.x codeline - -* Cleaner, more flexible and expressive API - -* Better performance and smaller memory footprint due to a more - efficient HTTP transport based on HttpCore. HttpClient 4.0 is - expected to be 10% to 25% faster than HttpClient 3.x codeline - -* More modular structure - -* Pluggable redirect and authentication handlers - -* Support for protocol incerceptors - -* Improved connection management - -* Improved support for sending requests via a proxy or a chain of - proxies - -* Improved handling redirects of entity enclosing requests - -* More flexible SSL context customization - -* Reduced intermediate garbage in the process of - generating HTTP requests and parsing HTTP responses - -------------------- - -HttpClient 3.x features that have NOT yet been ported -------------------- -* NTLM authentication scheme - -* RFC2965 cookie policy (Cookie2) - -* Support for multipart MIME coded entities - -------------------- - -Changelog -------------------- - -The following is a list of contributions tracked in JIRA. -Note that this is not a complete list of contributions or changes. -Since the API was redesigned completely, tracking everything outside -of the source code repository would have been too burdensome. - -* [HTTPCLIENT-655] User-Agent string no longer violates RFC - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-541] Virtual host API redesign - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-614] Allow for different strategies when checking - CN of x509 certificates - Contributed by Julius Davies - -* [HTTPCLIENT-136] Fixed inadequate proxy support - Long standing architectural problem. Issue opened on 19/Dec/2002. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-63] Support for pluggable redirect and authentication handlers - Long standing architectural problem. Issue opened on 15/Jul/2002. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-245] Fixed redirect handling. HttpClient can now automatically - handle redirects of entity enclosing requests. - Long standing architectural problem. Issue opened on 14/Jul/2003. - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-613] HTTPS connections now verify CN of x509 certificates - Contributed by Julius Davies - -* [HTTPCLIENT-497] Wire/header logger names consistent with class loggers - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-484] AuthSSLProtocolSocketFactory in the main distribution - Contributed by Oleg Kalnichevski - -* [HTTPCLIENT-589] Do not consume the remaining response content if - the connection is to be closed - Contributed by Roland Weber - -* [HTTPCLIENT-475] Support for unconnected sockets. HTTP requests can now be - aborted while network socket is still being connected. - Contributed by Roland Weber - diff --git a/httpcomponents-client-4.5.14-bin/demo/.gitignore b/httpcomponents-client-4.5.14-bin/demo/.gitignore deleted file mode 100755 index 8a56759..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -node_modules -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/httpcomponents-client-4.5.14-bin/demo/mvnw b/httpcomponents-client-4.5.14-bin/demo/mvnw deleted file mode 100755 index 8a8fb22..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/mvnw +++ /dev/null @@ -1,316 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`\\unset -f command; \\command -v java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/httpcomponents-client-4.5.14-bin/demo/mvnw.cmd b/httpcomponents-client-4.5.14-bin/demo/mvnw.cmd deleted file mode 100755 index 1d8ab01..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/mvnw.cmd +++ /dev/null @@ -1,188 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM https://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/httpcomponents-client-4.5.14-bin/demo/pom.xml b/httpcomponents-client-4.5.14-bin/demo/pom.xml deleted file mode 100755 index 5c02de5..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/pom.xml +++ /dev/null @@ -1,484 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.0.4 - - - com.example - demo - 0.0.1-SNAPSHOT - demo - demo - - 17 - 3.0.0 - 1.17.6 - 24.0.0 - - - - org.springframework.boot - spring-boot-starter-amqp - - - org.springframework.boot - spring-boot-starter-data-jdbc - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-data-r2dbc - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-starter-freemarker - - - org.springframework.boot - spring-boot-starter-graphql - - - org.springframework.boot - spring-boot-starter-groovy-templates - - - org.springframework.boot - spring-boot-starter-hateoas - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-jooq - - - org.springframework.boot - spring-boot-starter-mail - - - org.springframework.boot - spring-boot-starter-mustache - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-web-services - - - org.springframework.boot - spring-boot-starter-webflux - - - com.okta.spring - okta-spring-boot-starter - 3.0.3 - - - com.vaadin - vaadin-spring-boot-starter - - - org.apache.kafka - kafka-streams - - - org.flywaydb - flyway-core - - - org.flywaydb - flyway-mysql - - - org.flywaydb - flyway-sqlserver - - - org.liquibase - liquibase-core - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 3.0.0 - - - org.springframework.data - spring-data-rest-hal-explorer - - - org.springframework.integration - spring-integration-amqp - - - org.springframework.integration - spring-integration-http - - - org.springframework.integration - spring-integration-jdbc - - - org.springframework.integration - spring-integration-jpa - - - org.springframework.integration - spring-integration-kafka - - - org.springframework.integration - spring-integration-mail - - - org.springframework.integration - spring-integration-r2dbc - - - org.springframework.integration - spring-integration-security - - - org.springframework.integration - spring-integration-webflux - - - org.springframework.integration - spring-integration-ws - - - org.springframework.kafka - spring-kafka - - - org.springframework.session - spring-session-jdbc - - - org.springframework.shell - spring-shell-starter - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity6 - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - com.h2database - h2 - runtime - - - com.ibm.db2 - jcc - runtime - - - com.microsoft.sqlserver - mssql-jdbc - runtime - - - com.mysql - mysql-connector-j - runtime - - - io.r2dbc - r2dbc-h2 - runtime - - - io.r2dbc - r2dbc-mssql - 1.0.0.RELEASE - runtime - - - org.apache.derby - derby - runtime - - - org.hsqldb - hsqldb - runtime - - - org.mariadb - r2dbc-mariadb - 1.1.3 - runtime - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.postgresql - postgresql - runtime - - - org.postgresql - r2dbc-postgresql - runtime - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.amqp - spring-rabbit-test - test - - - org.springframework.graphql - spring-graphql-test - test - - - org.springframework.integration - spring-integration-test - test - - - org.springframework.kafka - spring-kafka-test - test - - - org.springframework.restdocs - spring-restdocs-mockmvc - test - - - org.springframework.security - spring-security-test - test - - - org.testcontainers - db2 - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - kafka - test - - - org.testcontainers - mariadb - test - - - org.testcontainers - mssqlserver - test - - - org.testcontainers - mysql - test - - - org.testcontainers - postgresql - test - - - org.testcontainers - r2dbc - test - - - org.testcontainers - rabbitmq - test - - - - - - org.springframework.shell - spring-shell-dependencies - ${spring-shell.version} - pom - import - - - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import - - - com.vaadin - vaadin-bom - ${vaadin.version} - pom - import - - - - - - - - org.hibernate.orm.tooling - hibernate-enhance-maven-plugin - ${hibernate.version} - - - enhance - - enhance - - - true - true - true - - - - - - org.graalvm.buildtools - native-maven-plugin - - - org.asciidoctor - asciidoctor-maven-plugin - 2.2.1 - - - generate-docs - prepare-package - - process-asciidoc - - - html - book - - - - - - org.springframework.restdocs - spring-restdocs-asciidoctor - ${spring-restdocs.version} - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - - - production - - - - com.vaadin - vaadin-maven-plugin - ${vaadin.version} - - - frontend - compile - - prepare-frontend - build-frontend - - - true - - - - - - - - - - diff --git a/httpcomponents-client-4.5.14-bin/demo/src/main/java/com/example/demo/DemoApplication.java b/httpcomponents-client-4.5.14-bin/demo/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100755 index 094d95b..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - -} diff --git a/httpcomponents-client-4.5.14-bin/demo/src/main/resources/application.properties b/httpcomponents-client-4.5.14-bin/demo/src/main/resources/application.properties deleted file mode 100755 index 8b13789..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/httpcomponents-client-4.5.14-bin/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/httpcomponents-client-4.5.14-bin/demo/src/test/java/com/example/demo/DemoApplicationTests.java deleted file mode 100755 index eaa9969..0000000 --- a/httpcomponents-client-4.5.14-bin/demo/src/test/java/com/example/demo/DemoApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class DemoApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar b/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar deleted file mode 100755 index 93a3b9f..0000000 Binary files a/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar and /dev/null differ diff --git a/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar b/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar deleted file mode 100755 index 270124f..0000000 Binary files a/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar and /dev/null differ diff --git a/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar b/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar deleted file mode 100755 index 66c75aa..0000000 Binary files a/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar and /dev/null differ diff --git a/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar b/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar deleted file mode 100755 index aed581e..0000000 Binary files a/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar and /dev/null differ diff --git a/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar b/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar deleted file mode 100755 index 78e2058..0000000 Binary files a/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar and /dev/null differ diff --git a/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar b/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar deleted file mode 100755 index aa34419..0000000 Binary files a/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar and /dev/null differ diff --git a/import-summary.txt b/import-summary.txt deleted file mode 100644 index cca4694..0000000 --- a/import-summary.txt +++ /dev/null @@ -1,91 +0,0 @@ -ECLIPSE ANDROID PROJECT IMPORT SUMMARY -====================================== - -Ignored Files: --------------- -The following files were *not* copied into the new Gradle project; you -should evaluate whether these are still needed in your project and if -so manually move them: - -* .gitignore -* .idea/ -* .idea/.gitignore -* .idea/misc.xml -* .idea/modules.xml -* .idea/workspace.xml -* NOTICE -* Notes-master.iml -* README -* httpcomponents-client-4.5.14-bin/ -* httpcomponents-client-4.5.14-bin/LICENSE.txt -* httpcomponents-client-4.5.14-bin/NOTICE.txt -* httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt -* httpcomponents-client-4.5.14-bin/demo/ -* httpcomponents-client-4.5.14-bin/demo/.gitignore -* httpcomponents-client-4.5.14-bin/demo/.idea/ -* httpcomponents-client-4.5.14-bin/demo/.idea/.gitignore -* httpcomponents-client-4.5.14-bin/demo/.idea/inspectionProfiles/ -* httpcomponents-client-4.5.14-bin/demo/.idea/inspectionProfiles/Project_Default.xml -* httpcomponents-client-4.5.14-bin/demo/.idea/misc.xml -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/issuestore/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/issuestore/1/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/issuestore/1/a/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/issuestore/1/a/1a273f73b7a477b0745593641bd708a6182c7ad5 -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/issuestore/index.pb -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/securityhotspotstore/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/securityhotspotstore/1/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/securityhotspotstore/1/a/ -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/securityhotspotstore/1/a/1a273f73b7a477b0745593641bd708a6182c7ad5 -* httpcomponents-client-4.5.14-bin/demo/.idea/sonarlint/securityhotspotstore/index.pb -* httpcomponents-client-4.5.14-bin/demo/.idea/workspace.xml -* httpcomponents-client-4.5.14-bin/demo/HELP.md -* httpcomponents-client-4.5.14-bin/demo/mvnw -* httpcomponents-client-4.5.14-bin/demo/mvnw.cmd -* httpcomponents-client-4.5.14-bin/demo/pom.xml -* httpcomponents-client-4.5.14-bin/demo/src/ -* httpcomponents-client-4.5.14-bin/demo/src/main/ -* httpcomponents-client-4.5.14-bin/demo/src/main/java/ -* httpcomponents-client-4.5.14-bin/demo/src/main/java/com/ -* httpcomponents-client-4.5.14-bin/demo/src/main/java/com/example/ -* httpcomponents-client-4.5.14-bin/demo/src/main/java/com/example/demo/ -* httpcomponents-client-4.5.14-bin/demo/src/main/java/com/example/demo/DemoApplication.java -* httpcomponents-client-4.5.14-bin/demo/src/main/resources/ -* httpcomponents-client-4.5.14-bin/demo/src/main/resources/application.properties -* httpcomponents-client-4.5.14-bin/demo/src/test/ -* httpcomponents-client-4.5.14-bin/demo/src/test/java/ -* httpcomponents-client-4.5.14-bin/demo/src/test/java/com/ -* httpcomponents-client-4.5.14-bin/demo/src/test/java/com/example/ -* httpcomponents-client-4.5.14-bin/demo/src/test/java/com/example/demo/ -* httpcomponents-client-4.5.14-bin/demo/src/test/java/com/example/demo/DemoApplicationTests.java -* httpcomponents-client-4.5.14-bin/lib/ -* httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar -* httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar -* httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar -* httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar -* httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar -* httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar - -Moved Files: ------------- -Android Gradle projects use a different directory structure than ADT -Eclipse projects. Here's how the projects were restructured: - -* AndroidManifest.xml => app/src/main/AndroidManifest.xml -* res/ => app/src/main/res/ -* src/ => app/src/main/java/ - -Next Steps: ------------ -You can now build the project. The Gradle project needs network -connectivity to download dependencies. - -Bugs: ------ -If for some reason your project does not build, and you determine that -it is due to a bug or limitation of the Eclipse to Gradle importer, -please file a bug at http://b.android.com with category -Component-Tools. - -(This import summary is for your information only, and can be deleted -after import once you are satisfied with the results.) diff --git a/local.properties b/local.properties deleted file mode 100644 index 41976b9..0000000 --- a/local.properties +++ /dev/null @@ -1,7 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# -#Tue Apr 04 09:59:49 CST 2023 -sdk.dir=/Users/ruhuitong/Library/Android/sdk diff --git a/other/总结.doc b/other/总结.doc new file mode 100644 index 0000000..8da7bf0 Binary files /dev/null and b/other/总结.doc differ diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/app/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 89% rename from app/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml index 2a3b768..e1cfc0f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ --> @@ -43,8 +42,7 @@ android:launchMode="singleTop" android:theme="@style/NoteTheme" android:uiOptions="splitActionBarWhenNarrow" - android:windowSoftInputMode="adjustPan" - android:exported="true" > + android:windowSoftInputMode="adjustPan" > @@ -56,11 +54,9 @@ android:name=".ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" - android:theme="@style/NoteTheme" - android:exported="true"> + android:theme="@style/NoteTheme" > - + @@ -87,13 +83,11 @@ + android:multiprocess="true" /> + android:label="@string/app_widget2x2" > @@ -106,8 +100,7 @@ + android:label="@string/app_widget4x4" > @@ -120,8 +113,7 @@ android:resource="@xml/widget_4x_info" /> - + diff --git a/app/src/main/java/net/micode/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java similarity index 81% rename from app/src/main/java/net/micode/notes/data/Contact.java rename to src/main/java/net/micode/notes/data/Contact.java index d97ac5d..58e0854 100644 --- a/app/src/main/java/net/micode/notes/data/Contact.java +++ b/src/main/java/net/micode/notes/data/Contact.java @@ -17,6 +17,7 @@ package net.micode.notes.data; import android.content.Context; + import android.database.Cursor; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; @@ -24,29 +25,35 @@ import android.telephony.PhoneNumberUtils; import android.util.Log; import java.util.HashMap; - -public class Contact { +//change +public class Contact { //联系人 private static HashMap sContactCache; private static final String TAG = "Contact"; - private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " + // 定义字符串CALLER_ID_SELECTION + private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + + + Phone.NUMBER + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + + " AND " + Data.RAW_CONTACT_ID + " IN " + "(SELECT raw_contact_id " + " FROM phone_lookup" + " WHERE min_match = '+')"; + // 获取联系人 public static String getContact(Context context, String phoneNumber) { if(sContactCache == null) { sContactCache = new HashMap(); } + // 查找HashMap中是否已有phoneNumber信息 if(sContactCache.containsKey(phoneNumber)) { return sContactCache.get(phoneNumber); } String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + // 查找数据库中phoneNumber的信息 Cursor cursor = context.getContentResolver().query( Data.CONTENT_URI, new String [] { Phone.DISPLAY_NAME }, @@ -54,20 +61,25 @@ public class Contact { new String[] { phoneNumber }, null); + // 判定查询结果 + // moveToFirst()返回第一条 if (cursor != null && cursor.moveToFirst()) { try { + // 找到相关信息 String name = cursor.getString(0); sContactCache.put(phoneNumber, name); return name; + // 异常 } catch (IndexOutOfBoundsException e) { Log.e(TAG, " Cursor get string error " + e.toString()); return null; } finally { cursor.close(); } + // 未找到相关信息 } else { Log.d(TAG, "No contact matched with number:" + phoneNumber); return null; } } -} +} \ No newline at end of file diff --git a/app/src/main/java/net/micode/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java similarity index 76% rename from app/src/main/java/net/micode/notes/data/Notes.java rename to src/main/java/net/micode/notes/data/Notes.java index f240604..a91a896 100644 --- a/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/main/java/net/micode/notes/data/Notes.java @@ -1,25 +1,13 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; +import android.content.ContentUris; import android.net.Uri; +// Notes 类中定义了很多常量，这些常量大多是int型和string型 public class Notes { public static final String AUTHORITY = "micode_notes"; public static final String TAG = "Notes"; + + //以下三个常量对NoteColumns.TYPE的值进行设置时会用到 public static final int TYPE_NOTE = 0; public static final int TYPE_FOLDER = 1; public static final int TYPE_SYSTEM = 2; @@ -35,12 +23,24 @@ public class Notes { public static final int ID_CALL_RECORD_FOLDER = -2; public static final int ID_TRASH_FOLER = -3; - public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; - public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; - public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; - public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; - public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; - public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; + public static final String INTENT_EXTRA_ALERT_DATE = + + "net.micode.notes.alert_date"; + public static final String INTENT_EXTRA_BACKGROUND_ID = + + "net.micode.notes.background_color_id"; + public static final String INTENT_EXTRA_WIDGET_ID = + + "net.micode.notes.widget_id"; + public static final String INTENT_EXTRA_WIDGET_TYPE = + + "net.micode.notes.widget_type"; + public static final String INTENT_EXTRA_FOLDER_ID = + + "net.micode.notes.folder_id"; + public static final String INTENT_EXTRA_CALL_DATE = + + "net.micode.notes.call_date"; public static final int TYPE_WIDGET_INVALIDE = -1; public static final int TYPE_WIDGET_2X = 0; @@ -54,13 +54,20 @@ public class Notes { /** * Uri to query all notes and folders */ - public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); + public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + + + AUTHORITY + "/note");//定义查询便签和文件夹的指针。 + +// public static final Uri my_URI = ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI , 10); /** * Uri to query data */ - public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); + public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + + + AUTHORITY + "/data");//定义查找数据的指针。 + // 定义NoteColumns的常量,用于后面创建数据库的表头 public interface NoteColumns { /** * The unique ID for a row @@ -140,7 +147,7 @@ public class Notes { * The last sync id *

Type: INTEGER (long)

*/ - public static final String SYNC_ID = "sync_id"; + public static final String SYNC_ID = "sync_id";//同步 /** * Sign to indicate local modified or not @@ -165,8 +172,9 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; - } + }//这些常量主要是定义便签的属性的。 + // 定义DataColumns的常量,用于后面创建数据库的表头 public interface DataColumns { /** * The unique ID for a row @@ -206,41 +214,45 @@ public class Notes { /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * Generic data column, the meaning is {@link #MIMETYPE} specific, + used for * integer data type *

Type: INTEGER

*/ public static final String DATA1 = "data1"; /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * Generic data column, the meaning is {@link #MIMETYPE} specific, + used for * integer data type *

Type: INTEGER

*/ public static final String DATA2 = "data2"; /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * Generic data column, the meaning is {@link #MIMETYPE} specific, + used for * TEXT data type *

Type: TEXT

*/ public static final String DATA3 = "data3"; /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * Generic data column, the meaning is {@link #MIMETYPE} specific, + used for * TEXT data type *

Type: TEXT

*/ public static final String DATA4 = "data4"; /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * Generic data column, the meaning is {@link #MIMETYPE} specific, + used for * TEXT data type *

Type: TEXT

*/ public static final String DATA5 = "data5"; - } - + }//主要是定义存储便签内容数据的 public static final class TextNote implements DataColumns { /** * Mode to indicate the text in check list mode or not @@ -250,12 +262,18 @@ public class Notes { public static final int MODE_CHECK_LIST = 1; - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; + public static final String CONTENT_TYPE = - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; + "vnd.android.cursor.dir/text_note"; - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } + public static final String CONTENT_ITEM_TYPE = + + "vnd.android.cursor.item/text_note"; + + public static final Uri CONTENT_URI = Uri.parse("content://" + + + AUTHORITY + "/text_note"); + }//文本内容的数据结构 public static final class CallNote implements DataColumns { /** @@ -270,10 +288,16 @@ public class Notes { */ public static final String PHONE_NUMBER = DATA3; - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; + public static final String CONTENT_TYPE = - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; + "vnd.android.cursor.dir/call_note"; - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); - } -} + public static final String CONTENT_ITEM_TYPE = + + "vnd.android.cursor.item/call_note"; + + public static final Uri CONTENT_URI = Uri.parse("content://" + + + AUTHORITY + "/call_note"); + }//电话内容的数据结构 +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java new file mode 100644 index 0000000..328198a --- /dev/null +++ b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -0,0 +1,349 @@ +package net.micode.notes.data; + +import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。 +import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚） +import android.database.sqlite.SQLiteDatabase;//主要提供了对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values +import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新 +import android.util.Log; + +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.DataConstants; +import net.micode.notes.data.Notes.NoteColumns; +//数据库操作，用SQLOpenhelper,对一些note和文件进行数据库的操作，比如删除文件后，将文件里的note也相应删除 + +public class NotesDatabaseHelper extends SQLiteOpenHelper { + private static final String DB_NAME = "note.db"; + + private static final int DB_VERSION = 4; + + public interface TABLE { //接口，分成note和data，在后面的程序里分别使用过 + public static final String NOTE = "note"; + + public static final String DATA = "data"; + } + + private static final String TAG = "NotesDatabaseHelper"; + + private static NotesDatabaseHelper mInstance; + + private static final String CREATE_NOTE_TABLE_SQL = + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," + + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")";//数据库中需要存储的项目的名称，就相当于创建一个表格的表头的内容。 + + private static final String CREATE_DATA_TABLE_SQL = + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," + + DataColumns.MIME_TYPE + " TEXT NOT NULL," + + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA1 + " INTEGER," + + DataColumns.DATA2 + " INTEGER," + + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + ")";//和上面的功能一样，主要是存储的项目不同 + + private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = + "CREATE INDEX IF NOT EXISTS note_id_index ON " + + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";//存储便签编号的一个数据表格 + + /** + * Increase folder's note count when move note to the folder + */ + private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = + "CREATE TRIGGER increase_folder_count_on_update "+ + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END";//在文件夹中移入一个Note之后需要更改的数据的表格。 + + /** + * Decrease folder's note count when move note from folder + */ + private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = + "CREATE TRIGGER decrease_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + + " END";//在文件夹中移出一个Note之后需要更改的数据的表格。 + + /** + * Increase folder's note count when insert new note to the folder + */ + private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = + "CREATE TRIGGER increase_folder_count_on_insert " + + " AFTER INSERT ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END";//在文件夹中插入一个Note之后需要更改的数据的表格。 + + /** + * Decrease folder's note count when delete note from the folder + */ + private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = + "CREATE TRIGGER decrease_folder_count_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0;" + + " END";//在文件夹中删除一个Note之后需要更改的数据的表格。 + + /** + * Update note's content when insert data with type {@link DataConstants#NOTE} + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = + "CREATE TRIGGER update_note_content_on_insert " + + " AFTER INSERT ON " + TABLE.DATA + + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END";//在文件夹中对一个Note导入新的数据之后需要更改的数据的表格。 + + /** + * Update note's content when data with {@link DataConstants#NOTE} type has changed + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = + "CREATE TRIGGER update_note_content_on_update " + + " AFTER UPDATE ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END";//Note数据被修改后需要更改的数据的表格。 + + /** + * Update note's content when data with {@link DataConstants#NOTE} type has deleted + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = + "CREATE TRIGGER update_note_content_on_delete " + + " AFTER delete ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=''" + + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + + " END";//Note数据被删除后需要更改的数据的表格。 + + /** + * Delete datas belong to note which has been deleted + */ + private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = + "CREATE TRIGGER delete_data_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.DATA + + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + + " END";//删除已删除的便签的数据后需要更改的数据的表格。 + + /** + * Delete notes belong to folder which has been deleted + */ + private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = + "CREATE TRIGGER folder_delete_notes_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END";//删除已删除的文件夹的便签后需要更改的数据的表格。 + + /** + * Move notes belong to folder which has been moved to trash folder + */ + private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = + "CREATE TRIGGER folder_move_notes_on_trash " + + " AFTER UPDATE ON " + TABLE.NOTE + + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END";//还原垃圾桶中便签后需要更改的数据的表格。 + + public NotesDatabaseHelper(Context context) { + super(context, DB_NAME, null, DB_VERSION); + }//构造函数，传入数据库的名称和版本 + + public void createNoteTable(SQLiteDatabase db) { + db.execSQL(CREATE_NOTE_TABLE_SQL); + reCreateNoteTableTriggers(db); + createSystemFolder(db); + Log.d(TAG, "note table has been created"); + }//创建表格（用来存储标签属性） + + private void reCreateNoteTableTriggers(SQLiteDatabase db) { + db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); + db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); + db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); + db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); + + db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); + db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); + db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER); + db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER); + db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); + db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); + db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); + }//execSQL是数据库操作的API，主要是更改行为的SQL语句。 + //在这里主要是用来重新创建上述定义的表格用的，先删除原来有的数据库的触发器再重新创建新的数据库 + + private void createSystemFolder(SQLiteDatabase db) { + ContentValues values = new ContentValues(); + + /** + * call record foler for call notes + */ + values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + + /** + * root folder which is default folder + */ + values.clear(); + values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + + /** + * temporary folder which is used for moving note + */ + values.clear(); + values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + + /** + * create trash folder + */ + values.clear(); + values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + }//创建几个系统文件夹 + + public void createDataTable(SQLiteDatabase db) { + db.execSQL(CREATE_DATA_TABLE_SQL); + reCreateDataTableTriggers(db); + db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); + Log.d(TAG, "data table has been created"); + }//创建表格（用来存储标签内容） + + private void reCreateDataTableTriggers(SQLiteDatabase db) { + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); + + db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); + db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); + db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); + }//同上面的execSQL + + static synchronized NotesDatabaseHelper getInstance(Context context) { + if (mInstance == null) { + mInstance = new NotesDatabaseHelper(context); + } + return mInstance; + }//上网查是为解决同一时刻只能有一个线程执行. + //在写程序库代码时，有时有一个类需要被所有的其它类使用， + //但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例 + + @Override + public void onCreate(SQLiteDatabase db) { + createNoteTable(db); + createDataTable(db); + }//实现两个表格（上面创建的两个表格） + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + boolean reCreateTriggers = false; + boolean skipV2 = false; + + if (oldVersion == 1) { + upgradeToV2(db); + skipV2 = true; // this upgrade including the upgrade from v2 to v3 + oldVersion++; + } + + if (oldVersion == 2 && !skipV2) { + upgradeToV3(db); + reCreateTriggers = true; + oldVersion++; + } + + if (oldVersion == 3) { + upgradeToV4(db); + oldVersion++; + } + + if (reCreateTriggers) { + reCreateNoteTableTriggers(db); + reCreateDataTableTriggers(db); + } + + if (oldVersion != newVersion) { + throw new IllegalStateException("Upgrade notes database to version " + newVersion + + "fails"); + } + }//数据库版本的更新（数据库内容的更改） + + private void upgradeToV2(SQLiteDatabase db) { + db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); + db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); + createNoteTable(db); + createDataTable(db); + }//v2 + + private void upgradeToV3(SQLiteDatabase db) { + // drop unused triggers + db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); + db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); + // add a column for gtask id + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID + + " TEXT NOT NULL DEFAULT ''"); + // add a trash system folder + ContentValues values = new ContentValues(); + values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + }//更新到V3版本 + + private void upgradeToV4(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + + " INTEGER NOT NULL DEFAULT 0"); + }//更新到V4版本 +} \ No newline at end of file diff --git a/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 81% rename from app/src/main/java/net/micode/notes/data/NotesProvider.java rename to src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..2a24bce 100644 --- a/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/main/java/net/micode/notes/data/NotesProvider.java @@ -16,7 +16,6 @@ package net.micode.notes.data; - import android.app.SearchManager; import android.content.ContentProvider; import android.content.ContentUris; @@ -33,9 +32,15 @@ import net.micode.notes.R; import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; - - +//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据 +//ContentProvider提供的方法 +//query：查询 +//insert：插入 +//update：更新 +//delete：删除 +//getType：得到数据类型 public class NotesProvider extends ContentProvider { + // UriMatcher用于匹配Uri private static final UriMatcher mMatcher; private NotesDatabaseHelper mHelper; @@ -51,7 +56,9 @@ public class NotesProvider extends ContentProvider { private static final int URI_SEARCH_SUGGEST = 6; static { + // 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码 mMatcher = new UriMatcher(UriMatcher.NO_MATCH); + // 把需要匹配Uri路径全部给注册上 mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); @@ -65,33 +72,40 @@ public class NotesProvider extends ContentProvider { * x'0A' represents the '\n' character in sqlite. For title and content in the search result, * we will trim '\n' and white space in order to show more information. */ + // 声明 NOTES_SEARCH_PROJECTION private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," - + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," - + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," - + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," - + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - + + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," + + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; + // 声明NOTES_SNIPPET_SEARCH_QUERY private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; + + " FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; @Override + // Context只有在onCreate()中才被初始化 + // 对mHelper进行实例化 public boolean onCreate() { mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } @Override + // 查询uri在数据库中对应的位置 public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, - String sortOrder) { + String sortOrder) { Cursor c = null; + // 获取可读数据库 SQLiteDatabase db = mHelper.getReadableDatabase(); String id = null; + // 匹配查找uri switch (mMatcher.match(uri)) { + // 对于不同的匹配值，在数据库中查找相应的条目 case URI_NOTE: c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); @@ -113,6 +127,7 @@ public class NotesProvider extends ContentProvider { case URI_SEARCH: case URI_SEARCH_SUGGEST: if (sortOrder != null || projection != null) { + // 不合法的参数异常 throw new IllegalArgumentException( "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); } @@ -120,6 +135,8 @@ public class NotesProvider extends ContentProvider { String searchString = null; if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { if (uri.getPathSegments().size() > 1) { + // getPathSegments()方法得到一个String的List， + // 在uri.getPathSegments().get(1)为第2个元素 searchString = uri.getPathSegments().get(1); } } else { @@ -139,6 +156,7 @@ public class NotesProvider extends ContentProvider { } break; default: + // 抛出异常 throw new IllegalArgumentException("Unknown URI " + uri); } if (c != null) { @@ -148,13 +166,17 @@ public class NotesProvider extends ContentProvider { } @Override + // 插入一个uri public Uri insert(Uri uri, ContentValues values) { + // 获得可写的数据库 SQLiteDatabase db = mHelper.getWritableDatabase(); long dataId = 0, noteId = 0, insertedId = 0; switch (mMatcher.match(uri)) { + // 新增一个条目 case URI_NOTE: insertedId = noteId = db.insert(TABLE.NOTE, null, values); break; + // 如果存在，查找NOTE_ID case URI_DATA: if (values.containsKey(DataColumns.NOTE_ID)) { noteId = values.getAsLong(DataColumns.NOTE_ID); @@ -167,6 +189,7 @@ public class NotesProvider extends ContentProvider { throw new IllegalArgumentException("Unknown URI " + uri); } // Notify the note uri + // notifyChange获得一个ContextResolver对象并且更新里面的内容 if (noteId > 0) { getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); @@ -178,13 +201,17 @@ public class NotesProvider extends ContentProvider { ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); } + // 返回插入的uri的路径 return ContentUris.withAppendedId(uri, insertedId); } @Override + // 删除一个uri public int delete(Uri uri, String selection, String[] selectionArgs) { + //Uri代表要操作的数据，Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示。 int count = 0; String id = null; + // 获得可写的数据库 SQLiteDatabase db = mHelper.getWritableDatabase(); boolean deleteData = false; switch (mMatcher.match(uri)) { @@ -228,6 +255,7 @@ public class NotesProvider extends ContentProvider { } @Override + // 更新一个uri public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { int count = 0; String id = null; @@ -267,10 +295,12 @@ public class NotesProvider extends ContentProvider { return count; } + // 将字符串解析成规定格式 private String parseSelection(String selection) { return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } + //增加一个noteVersion private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); @@ -293,6 +323,7 @@ public class NotesProvider extends ContentProvider { sql.append(selectString); } + // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句 mHelper.getWritableDatabase().execSQL(sql.toString()); } @@ -302,4 +333,4 @@ public class NotesProvider extends ContentProvider { return null; } -} +} \ No newline at end of file diff --git a/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 82% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index 2cdaf17..a0b3fad 100644 --- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -62,6 +62,26 @@ public class GTaskASyncTask extends AsyncTask { message }); } + +// private void showNotification(int tickerId, String content) { +// Notification notification = new Notification(R.drawable.notification, mContext +// .getString(tickerId), System.currentTimeMillis()); +// notification.defaults = Notification.DEFAULT_LIGHTS; +// notification.flags = Notification.FLAG_AUTO_CANCEL; +// PendingIntent pendingIntent; +// if (tickerId != R.string.ticker_success) { +// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, +// NotesPreferenceActivity.class), 0); +// +// } else { +// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, +// NotesListActivity.class), 0); +// } +// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, +// pendingIntent); +// mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); +// } + private void showNotification(int tickerId, String content) { PendingIntent pendingIntent; if (tickerId != R.string.ticker_success) { @@ -72,6 +92,8 @@ public class GTaskASyncTask extends AsyncTask { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } + + Notification.Builder builder = new Notification.Builder(mContext) .setAutoCancel(true) .setContentTitle(mContext.getString(R.string.app_name)) @@ -82,9 +104,6 @@ public class GTaskASyncTask extends AsyncTask { Notification notification=builder.getNotification(); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } - - - @Override protected Integer doInBackground(Void... unused) { publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/app/src/main/java/net/micode/notes/model/Note.java b/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from app/src/main/java/net/micode/notes/model/Note.java rename to src/main/java/net/micode/notes/model/Note.java diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from app/src/main/java/net/micode/notes/model/WorkingNote.java rename to src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/app/src/main/res/color/primary_text_dark.xml b/src/main/res/color/primary_text_dark.xml similarity index 100% rename from app/src/main/res/color/primary_text_dark.xml rename to src/main/res/color/primary_text_dark.xml diff --git a/app/src/main/res/color/secondary_text_dark.xml b/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from app/src/main/res/color/secondary_text_dark.xml rename to src/main/res/color/secondary_text_dark.xml diff --git a/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/app/src/main/res/drawable-hdpi/call_record.png b/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from app/src/main/res/drawable-hdpi/call_record.png rename to src/main/res/drawable-hdpi/call_record.png diff --git a/app/src/main/res/drawable-hdpi/clock.png b/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from app/src/main/res/drawable-hdpi/clock.png rename to src/main/res/drawable-hdpi/clock.png diff --git a/app/src/main/res/drawable-hdpi/delete.png b/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from app/src/main/res/drawable-hdpi/delete.png rename to src/main/res/drawable-hdpi/delete.png diff --git a/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/main/res/drawable-hdpi/edit_green.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/main/res/drawable-hdpi/edit_red.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/main/res/drawable-hdpi/edit_white.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/app/src/main/res/drawable-hdpi/font_large.png b/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_large.png rename to src/main/res/drawable-hdpi/font_large.png diff --git a/app/src/main/res/drawable-hdpi/font_normal.png b/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_normal.png rename to src/main/res/drawable-hdpi/font_normal.png diff --git a/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/font_small.png b/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_small.png rename to src/main/res/drawable-hdpi/font_small.png diff --git a/app/src/main/res/drawable-hdpi/font_super.png b/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_super.png rename to src/main/res/drawable-hdpi/font_super.png diff --git a/app/src/main/res/drawable-hdpi/icon_app.png b/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_app.png rename to src/main/res/drawable-hdpi/icon_app.png diff --git a/app/src/main/res/drawable-hdpi/list_background.png b/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_background.png rename to src/main/res/drawable-hdpi/list_background.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/main/res/drawable-hdpi/list_folder.9.png diff --git a/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/app/src/main/res/drawable-hdpi/menu_delete.png b/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from app/src/main/res/drawable-hdpi/menu_delete.png rename to src/main/res/drawable-hdpi/menu_delete.png diff --git a/app/src/main/res/drawable-hdpi/menu_move.png b/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from app/src/main/res/drawable-hdpi/menu_move.png rename to src/main/res/drawable-hdpi/menu_move.png diff --git a/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/main/res/drawable-hdpi/new_note_normal.png diff --git a/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/app/src/main/res/drawable-hdpi/notification.png b/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi/notification.png rename to src/main/res/drawable-hdpi/notification.png diff --git a/app/src/main/res/drawable-hdpi/search_result.png b/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from app/src/main/res/drawable-hdpi/search_result.png rename to src/main/res/drawable-hdpi/search_result.png diff --git a/app/src/main/res/drawable-hdpi/selected.png b/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from app/src/main/res/drawable-hdpi/selected.png rename to src/main/res/drawable-hdpi/selected.png diff --git a/app/src/main/res/drawable-hdpi/title_alert.png b/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from app/src/main/res/drawable-hdpi/title_alert.png rename to src/main/res/drawable-hdpi/title_alert.png diff --git a/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/app/src/main/res/drawable/new_note.xml b/src/main/res/drawable/new_note.xml similarity index 100% rename from app/src/main/res/drawable/new_note.xml rename to src/main/res/drawable/new_note.xml diff --git a/app/src/main/res/layout/account_dialog_title.xml b/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from app/src/main/res/layout/account_dialog_title.xml rename to src/main/res/layout/account_dialog_title.xml diff --git a/app/src/main/res/layout/add_account_text.xml b/src/main/res/layout/add_account_text.xml similarity index 100% rename from app/src/main/res/layout/add_account_text.xml rename to src/main/res/layout/add_account_text.xml diff --git a/app/src/main/res/layout/datetime_picker.xml b/src/main/res/layout/datetime_picker.xml similarity index 100% rename from app/src/main/res/layout/datetime_picker.xml rename to src/main/res/layout/datetime_picker.xml diff --git a/app/src/main/res/layout/dialog_edit_text.xml b/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from app/src/main/res/layout/dialog_edit_text.xml rename to src/main/res/layout/dialog_edit_text.xml diff --git a/app/src/main/res/layout/folder_list_item.xml b/src/main/res/layout/folder_list_item.xml similarity index 100% rename from app/src/main/res/layout/folder_list_item.xml rename to src/main/res/layout/folder_list_item.xml diff --git a/app/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml similarity index 100% rename from app/src/main/res/layout/note_edit.xml rename to src/main/res/layout/note_edit.xml diff --git a/app/src/main/res/layout/note_edit_list_item.xml b/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from app/src/main/res/layout/note_edit_list_item.xml rename to src/main/res/layout/note_edit_list_item.xml diff --git a/app/src/main/res/layout/note_item.xml b/src/main/res/layout/note_item.xml similarity index 100% rename from app/src/main/res/layout/note_item.xml rename to src/main/res/layout/note_item.xml diff --git a/app/src/main/res/layout/note_list.xml b/src/main/res/layout/note_list.xml similarity index 100% rename from app/src/main/res/layout/note_list.xml rename to src/main/res/layout/note_list.xml diff --git a/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from app/src/main/res/layout/note_list_dropdown_menu.xml rename to src/main/res/layout/note_list_dropdown_menu.xml diff --git a/app/src/main/res/layout/note_list_footer.xml b/src/main/res/layout/note_list_footer.xml similarity index 100% rename from app/src/main/res/layout/note_list_footer.xml rename to src/main/res/layout/note_list_footer.xml diff --git a/app/src/main/res/layout/settings_header.xml b/src/main/res/layout/settings_header.xml similarity index 100% rename from app/src/main/res/layout/settings_header.xml rename to src/main/res/layout/settings_header.xml diff --git a/app/src/main/res/layout/widget_2x.xml b/src/main/res/layout/widget_2x.xml similarity index 100% rename from app/src/main/res/layout/widget_2x.xml rename to src/main/res/layout/widget_2x.xml diff --git a/app/src/main/res/layout/widget_4x.xml b/src/main/res/layout/widget_4x.xml similarity index 100% rename from app/src/main/res/layout/widget_4x.xml rename to src/main/res/layout/widget_4x.xml diff --git a/app/src/main/res/menu/call_note_edit.xml b/src/main/res/menu/call_note_edit.xml similarity index 100% rename from app/src/main/res/menu/call_note_edit.xml rename to src/main/res/menu/call_note_edit.xml diff --git a/app/src/main/res/menu/call_record_folder.xml b/src/main/res/menu/call_record_folder.xml similarity index 100% rename from app/src/main/res/menu/call_record_folder.xml rename to src/main/res/menu/call_record_folder.xml diff --git a/app/src/main/res/menu/note_edit.xml b/src/main/res/menu/note_edit.xml similarity index 100% rename from app/src/main/res/menu/note_edit.xml rename to src/main/res/menu/note_edit.xml diff --git a/app/src/main/res/menu/note_list.xml b/src/main/res/menu/note_list.xml similarity index 100% rename from app/src/main/res/menu/note_list.xml rename to src/main/res/menu/note_list.xml diff --git a/app/src/main/res/menu/note_list_dropdown.xml b/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from app/src/main/res/menu/note_list_dropdown.xml rename to src/main/res/menu/note_list_dropdown.xml diff --git a/app/src/main/res/menu/note_list_options.xml b/src/main/res/menu/note_list_options.xml similarity index 100% rename from app/src/main/res/menu/note_list_options.xml rename to src/main/res/menu/note_list_options.xml diff --git a/app/src/main/res/menu/sub_folder.xml b/src/main/res/menu/sub_folder.xml similarity index 100% rename from app/src/main/res/menu/sub_folder.xml rename to src/main/res/menu/sub_folder.xml diff --git a/app/src/main/res/raw-zh-rCN/introduction b/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from app/src/main/res/raw-zh-rCN/introduction rename to src/main/res/raw-zh-rCN/introduction diff --git a/app/src/main/res/raw/introduction b/src/main/res/raw/introduction similarity index 100% rename from app/src/main/res/raw/introduction rename to src/main/res/raw/introduction diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/arrays.xml rename to src/main/res/values-zh-rCN/arrays.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/arrays.xml rename to src/main/res/values-zh-rTW/arrays.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/strings.xml rename to src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml similarity index 100% rename from app/src/main/res/values/arrays.xml rename to src/main/res/values/arrays.xml diff --git a/app/src/main/res/values/colors.xml b/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to src/main/res/values/colors.xml diff --git a/app/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to src/main/res/values/dimens.xml diff --git a/app/src/main/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to src/main/res/values/styles.xml diff --git a/app/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml similarity index 100% rename from app/src/main/res/xml/preferences.xml rename to src/main/res/xml/preferences.xml diff --git a/app/src/main/res/xml/searchable.xml b/src/main/res/xml/searchable.xml similarity index 100% rename from app/src/main/res/xml/searchable.xml rename to src/main/res/xml/searchable.xml diff --git a/app/src/main/res/xml/widget_2x_info.xml b/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from app/src/main/res/xml/widget_2x_info.xml rename to src/main/res/xml/widget_2x_info.xml diff --git a/app/src/main/res/xml/widget_4x_info.xml b/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from app/src/main/res/xml/widget_4x_info.xml rename to src/main/res/xml/widget_4x_info.xml diff --git a/小米便签精读报告.zip b/小米便签精读报告.zip deleted file mode 100644 index ec9875d..0000000 Binary files a/小米便签精读报告.zip and /dev/null differ