diff --git a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin index 4ecdfb2..ee49a9a 100644 Binary files a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock index 1af8eee..885e7bd 100644 Binary files a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin index 3576709..3d011a9 100644 Binary files a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock index 262329f..d8f23a3 100644 Binary files a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin index 39dabd2..3f0592d 100644 Binary files a/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index da8489e..f621232 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index bf610e6..e6c1663 100644 Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ diff --git a/src/Notes-master/.idea/deploymentTargetDropDown.xml b/src/Notes-master/.idea/deploymentTargetDropDown.xml index 16d3549..f1117d9 100644 --- a/src/Notes-master/.idea/deploymentTargetDropDown.xml +++ b/src/Notes-master/.idea/deploymentTargetDropDown.xml @@ -7,12 +7,12 @@ - + - + diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index 0cdc2df..7ad9aab 100644 Binary files a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes-master/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index a5f643f..3ae901e 100644 Binary files a/src/Notes-master/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes-master/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 0405156..c923c1f 100644 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index a56480c..2c65fd9 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Dec 21 01:12:32 CST 2023 +#Tue Dec 26 21:40:43 CST 2023 base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index bb8e976..6f2c77c 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index c7c17ff..1e18785 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index cef32c3..9a074c1 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index c895fb0..0ccf920 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index 119cccf..8fe6339 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 0443f8a..6c52a72 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 393fd0d..5eee589 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 98a180e..2628c15 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index e704303..6116b94 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 7205bbf..cadf411 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index bbfbe63..4da9226 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index b801f51..c8a1c3e 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId34 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId34 deleted file mode 100644 index 98353eb..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId34 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId27 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId27 deleted file mode 100644 index a1d202d..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId27 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId40 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId40 deleted file mode 100644 index 63e7f9c..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils$TextExport.class.uniqueId40 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId29 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId29 deleted file mode 100644 index 6a86737..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/BackupUtils.class.uniqueId29 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId58 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId58 deleted file mode 100644 index a7948fd..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId58 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DataUtils.class.uniqueId31 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DataUtils.class.uniqueId31 deleted file mode 100644 index 6af3200..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DataUtils.class.uniqueId31 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId22 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId22 deleted file mode 100644 index fad3442..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId22 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId33 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId33 deleted file mode 100644 index 023f716..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId33 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId67 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId67 deleted file mode 100644 index 6f45159..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId67 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId49 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId49 deleted file mode 100644 index f73069c..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId49 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId30 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId30 deleted file mode 100644 index b99539f..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId30 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId41 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId41 deleted file mode 100644 index ac1834c..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId41 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId14 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId14 deleted file mode 100644 index c40e945..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId14 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId1 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId1 deleted file mode 100644 index d2041cc..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId1 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 deleted file mode 100644 index 5416cd3..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId21 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId9 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId9 deleted file mode 100644 index bb9f786..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId9 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId64 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId64 deleted file mode 100644 index 961f2f4..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId64 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId3 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId3 deleted file mode 100644 index 8e1f0bf..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId3 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId52 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId52 deleted file mode 100644 index 7d0a456..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId52 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId60 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId60 deleted file mode 100644 index 771aa91..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId60 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId62 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId62 deleted file mode 100644 index a00281f..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId62 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_2x.class.uniqueId28 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_2x.class.uniqueId28 deleted file mode 100644 index 043e410..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_2x.class.uniqueId28 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_4x.class.uniqueId23 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_4x.class.uniqueId23 deleted file mode 100644 index ee3fd40..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider_4x.class.uniqueId23 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$CallNote.class.uniqueId5 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$CallNote.class.uniqueId5 deleted file mode 100644 index 42394b7..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$CallNote.class.uniqueId5 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataColumns.class.uniqueId17 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataColumns.class.uniqueId17 deleted file mode 100644 index 569dbdc..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataColumns.class.uniqueId17 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataConstants.class.uniqueId47 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataConstants.class.uniqueId47 deleted file mode 100644 index 76ef96e..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$DataConstants.class.uniqueId47 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$NoteColumns.class.uniqueId7 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$NoteColumns.class.uniqueId7 deleted file mode 100644 index 36c8d49..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$NoteColumns.class.uniqueId7 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$TextNote.class.uniqueId44 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$TextNote.class.uniqueId44 deleted file mode 100644 index 42461a2..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes$TextNote.class.uniqueId44 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes.class.uniqueId55 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes.class.uniqueId55 deleted file mode 100644 index 413745e..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Notes.class.uniqueId55 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId65 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3 similarity index 88% rename from src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId65 rename to src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3 index 0b075b4..dcbb848 100644 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId65 and b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3 differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId6 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId6 deleted file mode 100644 index f1ba220..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId6 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId57 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId57 deleted file mode 100644 index 76c0c9d..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId57 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId48 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId48 deleted file mode 100644 index 0fd6977..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId48 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId24 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId24 deleted file mode 100644 index 0468652..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId24 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId53 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId53 deleted file mode 100644 index 54fa572..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId53 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId35 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId35 deleted file mode 100644 index 062ecb5..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId35 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId18 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId18 deleted file mode 100644 index c217873..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId18 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId15 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId15 deleted file mode 100644 index d3dbb60..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId15 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId63 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId63 deleted file mode 100644 index 8f0a21b..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId63 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId36 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId36 deleted file mode 100644 index 127437f..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId36 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId32 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId32 deleted file mode 100644 index 2edab7b..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId32 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId42 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId42 deleted file mode 100644 index 3981f16..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId42 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId19 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId19 deleted file mode 100644 index 99e161f..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId19 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId16 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId16 deleted file mode 100644 index f249e33..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId16 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId38 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId38 deleted file mode 100644 index 81f06d3..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId38 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId50 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId50 deleted file mode 100644 index 3d4e8b1..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId50 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId61 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId61 deleted file mode 100644 index 83dc6c8..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId61 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter$AppWidgetAttribute.class.uniqueId46 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter$AppWidgetAttribute.class.uniqueId46 deleted file mode 100644 index 2bdb58b..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter$AppWidgetAttribute.class.uniqueId46 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter.class.uniqueId8 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter.class.uniqueId8 deleted file mode 100644 index 5e432e9..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListAdapter.class.uniqueId8 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId39 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId39 deleted file mode 100644 index 4596834..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListItem.class.uniqueId39 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId12 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId12 deleted file mode 100644 index 362fa05..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId12 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId66 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId66 deleted file mode 100644 index 8523228..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId66 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId20 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId20 deleted file mode 100644 index d91bc85..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId20 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId2 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId2 deleted file mode 100644 index 99c7a64..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId2 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId56 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId56 deleted file mode 100644 index 17e4d3b..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId56 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId43 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId43 deleted file mode 100644 index 7b80036..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId43 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId25 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId25 deleted file mode 100644 index d9abeb9..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId25 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId13 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId13 deleted file mode 100644 index 39e534a..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId13 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId26 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId26 deleted file mode 100644 index eb938cf..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId26 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId54 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId54 deleted file mode 100644 index 0937be2..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId54 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId45 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2 similarity index 84% rename from src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId45 rename to src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2 index 1d3de0e..aee77ab 100644 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId45 and b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2 differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId10 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1 similarity index 100% rename from src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId10 rename to src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1 diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlNote.class.uniqueId4 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlNote.class.uniqueId4 deleted file mode 100644 index 2783ae3..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlNote.class.uniqueId4 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId51 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId51 deleted file mode 100644 index 5aaf1d4..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId51 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId37 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId37 deleted file mode 100644 index 359609e..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId37 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId11 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId11 deleted file mode 100644 index 15f1f77..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId11 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId59 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId59 deleted file mode 100644 index df71afc..0000000 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId59 and /dev/null differ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 871f424..0b9565e 100644 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java index d202420..e35fb81 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java @@ -50,22 +50,28 @@ public class Contact {//联系人 sContactCache = new HashMap();// 初始化联系人缓存 } - /* 查找HashMap中是否已有phoneNumber信息 */ + /* + * 查找HashMap中是否已有phoneNumber信息 + */ if(sContactCache.containsKey(phoneNumber)) {// 如果在缓存中找到了电话号码对应的联系人信息 return sContactCache.get(phoneNumber);// 直接从缓存中返回联系人信息 } String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));//PhoneNumberUtils.toCallerIDMinMatch() 方法将电话号码转换为最小匹配模式，构建带有电话号码的查询条件 - - Cursor cursor = context.getContentResolver().query(// 查找数据库中phoneNumber的信息 + /* + * 查找数据库中phoneNumber的信息 + * */ + Cursor cursor = context.getContentResolver().query( Data.CONTENT_URI,// 联系人数据的URI new String [] { Phone.DISPLAY_NAME },// 要查询的字段，这里是联系人名字 selection,// 查询条件 new String[] { phoneNumber },// 查询条件中的占位符对应的值 null);// 不指定排序 - - if (cursor != null && cursor.moveToFirst()) {// 判定查询结果，如果查询结果不为空且移动到第一条记录，（moveToFirst()返回第一条记录） + /* + * 判定查询结果，如果查询结果不为空且移动到第一条记录，（moveToFirst()返回第一条记录） + * */ + if (cursor != null && cursor.moveToFirst()) { try {// 找到相关信息 String name = cursor.getString(0);// 获取联系人名字 sContactCache.put(phoneNumber, name);// 将联系人名字放入缓存 diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java index ab926af..ed1b48d 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java @@ -37,13 +37,17 @@ public class Notes { * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records */ - // 系统文件夹的标识符 + /* + * 系统文件夹的标识符 + * */ public static final int ID_ROOT_FOLDER = 0;// 默认文件夹 public static final int ID_TEMPARAY_FOLDER = -1;// 没有所属文件夹的便签 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";// 背景颜色ID public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";// Widget ID @@ -51,12 +55,16 @@ public class Notes { public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";// 文件夹ID public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; // 通话日期 - // 定义Widget类型常量 + /* + * 定义Widget类型常量 + * */ public static final int TYPE_WIDGET_INVALIDE = -1;// 无效的Widget类型 public static final int TYPE_WIDGET_2X = 0;// 2x2大小的Widget public static final int TYPE_WIDGET_4X = 1;// 4x4大小的Widget - // 定义便签数据类型常量 + /* + * 定义便签数据类型常量 + * */ public static class DataConstants { public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;// 文本便签数据类型 public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;// 电话便签数据类型 @@ -179,7 +187,7 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version";// 版本号 - }//定义便签的属性的常量 + } /* * 功能描述：定义DataColumns接口数据的常量，用于创建数据库表头 @@ -257,7 +265,6 @@ public class Notes { */ public static final String DATA5 = "data5";// 通用数据5 } - //定义存储便签内容数据 /* * 功能描述：定义了文本便签的数据结构 diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index d213ca8..373201a 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -27,67 +27,89 @@ 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也相应删除 +/* +* 功能描述：数据库操作，用SQLOpenhelper,对一些note和文件进行数据库的操作 +*/ public class NotesDatabaseHelper extends SQLiteOpenHelper { - private static final String DB_NAME = "note.db"; + private static final String DB_NAME = "note.db";// 数据库名 - private static final int DB_VERSION = 4; + private static final int DB_VERSION = 4;// 版本号 public interface TABLE { - //接口，分成note和data，在后面的程序里分别使用过 + /* + * 接口，分成note和data,用于表示数据库中两种表格 + * */ public static final String NOTE = "note"; public static final String DATA = "data"; } - private static final String TAG = "NotesDatabaseHelper"; + private static final String TAG = "NotesDatabaseHelper";// 日志标签，用于在日志中标识数据库操作的相关信息 + /* + * NotesDatabaseHelper 类的实例，用于单例模式的数据库操作，通过 getInstance() 方法获取 NotesDatabaseHelper 的唯一实例 + * 单例模式是一种设计模式，在数据库操作中使用单例模式可以确保只有一个数据库连接，避免了重复创建和关闭数据库连接可能导致的性能问题 + */ private static NotesDatabaseHelper mInstance; + /* + * 创建TABLE.NOTE表格，用于存储便签的相关信息 + */ 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" + - ")";//数据库中需要存储的项目的名称，就相当于创建一个表格的表头的内容 - + NoteColumns.ID + " INTEGER PRIMARY KEY," +// 便签ID + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 便签父级的ID + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +// 便签的提醒日期 + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + // 便签的背景颜色ID + 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," +// 便签的Widget ID + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +// 便签的Widget类型 + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +// 便签的同步ID + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +// 便签的本地修改标记 + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 原始父级便签的ID + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +// 便签在Google任务中的ID + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +// 便签的版本号 + ")"; + + /* + * 创建TABLE.DATA表格，用于存储便签中的数据 + */ 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 ''" + - ")";//数据库中需要存储的项目的名称，与上面存储的项目不同 - + DataColumns.ID + " INTEGER PRIMARY KEY," +// 数据ID + DataColumns.MIME_TYPE + " TEXT NOT NULL," +// 数据ID数据的MIME类型 + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +// 数据所属的便签的ID + 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," +// 数据的附加信息1 + DataColumns.DATA2 + " INTEGER," +// 数据的附加信息2 + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +// 数据的附加信息3 + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +// 数据的附加信息4 + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +// 数据的附加信息5 + ")"; + + /* + * 创建一个名为 note_id_index 的索引，在 TABLE.DATA 表格的 DataColumns.NOTE_ID 列上创建索引，以提高查询性能 + */ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";//存储便签编号的一个数据表格 + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** * Increase folder's note count when move note to the folder */ + + /* + * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，增加相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1 + */ 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 + @@ -96,11 +118,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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 */ + + /* + * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，减少相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1 + */ 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 + @@ -110,10 +136,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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 */ + + /* + * 在向 TABLE.NOTE 表格插入新便签时，增加相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1 + */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert " + " AFTER INSERT ON " + TABLE.NOTE + @@ -122,10 +153,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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 */ + + /* + * 在从 TABLE.NOTE 表格删除便签时，减少相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1 + */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete " + " AFTER DELETE ON " + TABLE.NOTE + @@ -135,10 +171,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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} */ + + /* + * 在向 TABLE.DATA 表格插入类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.SNIPPET 列，将其设置为新插入数据的内容 + */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert " + " AFTER INSERT ON " + TABLE.DATA + @@ -148,10 +189,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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 */ + + /* + * 在更新类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 + * 通过触发器在 TABLE.DATA 表格上创建，在数据被更新后将新的内容更新到对应的便签中 + */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update " + " AFTER UPDATE ON " + TABLE.DATA + @@ -161,10 +207,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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 */ + + /* + * 在删除类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 + * 通过触发器在 TABLE.DATA 表格上创建，在数据被删除后将对应的便签内容清空 + */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete " + " AFTER delete ON " + TABLE.DATA + @@ -174,10 +225,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " SET " + NoteColumns.SNIPPET + "=''" + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + " END"; - //Note数据被删除后需要更改的数据的表格 + /** * Delete datas belong to note which has been deleted */ + + /* + * 在删除便签时，同时删除该便签相关的数据 + * 通过触发器在 TABLE.NOTE 表格上创建，在便签被删除后将与该便签相关的数据一并删除 + */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " + " AFTER DELETE ON " + TABLE.NOTE + @@ -185,10 +241,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " DELETE FROM " + TABLE.DATA + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + " END"; - //删除已删除的便签的数据后需要更改的数据的表格 + /** * Delete notes belong to folder which has been deleted */ + + /* + * 在删除文件夹时，同时删除该文件夹下的所有便签 + * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被删除后将该文件夹下的所有便签一并删除。 + */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete " + " AFTER DELETE ON " + TABLE.NOTE + @@ -196,10 +257,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " DELETE FROM " + TABLE.NOTE + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + " END"; - //删除已删除的文件夹的便签后需要更改的数据的表格 + /** * Move notes belong to folder which has been moved to trash folder */ + + /* + * 在将文件夹移动到回收站时，同时将该文件夹下的所有便签一并移动到回收站 + * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被移动到回收站后将该文件夹下的所有便签的父文件夹ID更新为回收站的ID + */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " + " AFTER UPDATE ON " + TABLE.NOTE + @@ -209,22 +275,29 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " 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) { + // 通过执行SQL语句DROP TRIGGER IF EXISTS来删除已存在的触发器，以确保不会重复创建 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"); @@ -232,23 +305,28 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { 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);// 将笔记移动到垃圾箱的触发器 + } - 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语句。 - // 在这里主要是用来重新创建上述定义的表格用的，先删除原来有的数据库的触发器再重新创建新的数据库 - + /* + *用于创建系统文件夹，插入四个不同类型的文件夹记录到 NoteColumns 表中 + */ 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); @@ -256,6 +334,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * root folder which is default folder */ + /* + * 根目录，即默认文件夹 + */ values.clear(); values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); @@ -264,6 +345,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * 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); @@ -272,19 +356,28 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * 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); + db.execSQL(CREATE_DATA_TABLE_SQL);// 执行 CREATE_DATA_TABLE_SQL 的 SQL 语句来创建数据表 + reCreateDataTableTriggers(db);// 调用 reCreateDataTableTriggers() 方法重新创建数据表中的触发器 + db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);// 执行 CREATE_DATA_NOTE_ID_INDEX_SQL 的 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"); @@ -293,80 +386,121 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { 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; - + boolean skipV2 = false;// 是否进行V2升级 + /* + * 如果旧版本为1，则调用upgradeToV2方法 + */ if (oldVersion == 1) { upgradeToV2(db); skipV2 = true; // this upgrade including the upgrade from v2 to v3 oldVersion++; } - + /* + * 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法 + */ if (oldVersion == 2 && !skipV2) { upgradeToV3(db); reCreateTriggers = true; oldVersion++; } - + /* + * 如果旧版本为3，则调用upgradeToV4方法 + */ if (oldVersion == 3) { upgradeToV4(db); oldVersion++; } - + /* + * 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器 + */ if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); } - + /* + * 如果旧版本和新版本不匹配，则抛出异常 + */ if (oldVersion != newVersion) { throw new IllegalStateException("Upgrade notes database to version " + newVersion + "fails"); } - }//数据库版本的更新（数据库内容的更改） + } + /* + * 更新到V2版本 + * */ private void upgradeToV2(SQLiteDatabase db) { + /* + * 通过执行SQL语句DROP TABLE IF EXISTS来删除旧的NOTE和DATA表格 + * */ db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); - createNoteTable(db); - createDataTable(db); - }//更新到V2版本 + createNoteTable(db);// 调用createNoteTable和createDataTable方法来创建新的NOTE表格 + createDataTable(db);// 调用createNoteTable和createDataTable方法来创建新的DATA表格 + } + /* + * 更新到V3版本 + * */ private void upgradeToV3(SQLiteDatabase db) { + /* + * 执行SQL语句DROP TRIGGER IF EXISTS来移除不再使用的触发器 + * */ // 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"); + /* + * 执行ALTER TABLE语句向NOTE表格中添加一个新的列GTASK_ID，该列的类型是TEXT，并设置默认值为'' + * */ // add a column for gtask id db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''"); + /* + * 通过ContentValues对象向NOTE表格中插入一条记录，该记录代表垃圾箱系统文件夹 + * */ // 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版本 + } + /* + * 更新到V4版本 + * */ private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION - + " INTEGER NOT NULL DEFAULT 0"); - }//更新到V4版本 + + " INTEGER NOT NULL DEFAULT 0");// 通过执行ALTER TABLE语句向NOTE表格中添加一个新的列VERSION，该列的类型是INTEGER，并设置默认值为0 + } }