diff --git a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin index 49c5a24..66574e4 100644 Binary files a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock index f970cf5..d89aa31 100644 Binary files a/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin index 7841b99..c24716a 100644 Binary files a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock index bb0f8c5..b3cfcdc 100644 Binary files a/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index f35f108..a62cc78 100644 Binary files a/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index fbfd48f..fd4a57e 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe index 29bff0e..ce786bd 100644 Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf b/src/Notes-master1/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf deleted file mode 100644 index f7de570..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf +++ /dev/null @@ -1,20 +0,0 @@ - -> -java:S1604x"(Make this anonymous inner class a lambda(î -V java:S125""; it is deprecated.(܃ -M -java:S1874U"7Remove this use of "getNotification"; it is deprecated.( -e -java:S1874b"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ë -e -java:S1874j"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/f/0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1 b/src/Notes-master1/.idea/sonarlint/issuestore/0/f/0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1 deleted file mode 100644 index ec4f444..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/0/f/0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1 +++ /dev/null @@ -1,3 +0,0 @@ - -M -java:S1135"2Complete the task associated to this TODO comment.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 deleted file mode 100644 index 7aedf12..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 +++ /dev/null @@ -1,27 +0,0 @@ - -v -java:S11927"[Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 5 times.(޿ -c -java:S1192["HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( -a -java:S1192j"FDefine a constant instead of duplicating this literal "=old." 6 times.( -c -java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( -t -java:S11920"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 11 times.( -_ -java:S1192^"IDefine a constant instead of duplicating this literal " WHERE " 8 times.(랰 -\ -java:S1192^"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 -g -java:S1192"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(B -c -java:S1192]"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ -` -java:S1192\"JDefine a constant instead of duplicating this literal " UPDATE " 8 times.( - -java:S11923"yDefine a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," 4 times.( -M -java:S1135"2Complete the task associated to this TODO comment.(Ĵ -Y -java:S1214#"CMove constants defined in this interfaces to another class or enum.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/a/3aac5305cb73bfbdeb8078cd264d04323fa80e92 b/src/Notes-master1/.idea/sonarlint/issuestore/3/a/3aac5305cb73bfbdeb8078cd264d04323fa80e92 deleted file mode 100644 index 24fb08d..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/3/a/3aac5305cb73bfbdeb8078cd264d04323fa80e92 +++ /dev/null @@ -1,3 +0,0 @@ - -O -java:S59932"9Change the visibility of this constructor to "protected".( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 b/src/Notes-master1/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 deleted file mode 100644 index 38a06f1..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 +++ /dev/null @@ -1,29 +0,0 @@ - -g -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(۫ -X -java:S18747"=Remove this use of "FLAG_SHOW_WHEN_LOCKED"; it is deprecated.( -Q -java:S1874;";Remove this use of "FLAG_TURN_SCREEN_ON"; it is deprecated.( -Z -java:S1874="?Remove this use of "FLAG_LAYOUT_INSET_DECOR"; it is deprecated.( -H -java:S1874X"2Remove this use of "isScreenOn"; it is deprecated.( -O -java:S1874b":Remove this use of "setAudioStreamType"; it is deprecated.(0 -U -java:S1874d":Remove this use of "setAudioStreamType"; it is deprecated.(Ũ -` -java:S2147n"ECombine this catch with the one at line 107, which has the same body.( -[ -java:S2147q"ECombine this catch with the one at line 107, which has the same body.( -[ -java:S2147t"ECombine this catch with the one at line 107, which has the same body.(ﭣ -M -java:S1135l"2Complete the task associated to this TODO comment.(̐ -M -java:S1135o"2Complete the task associated to this TODO comment.(̐ -M -java:S1135r"2Complete the task associated to this TODO comment.(̐ -M -java:S1135u"2Complete the task associated to this TODO comment.(̐ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/f/5f6162ca79fcea353b280c5dc84973a9c37d2c74 b/src/Notes-master1/.idea/sonarlint/issuestore/5/f/5f6162ca79fcea353b280c5dc84973a9c37d2c74 deleted file mode 100644 index 86548ef..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/5/f/5f6162ca79fcea353b280c5dc84973a9c37d2c74 +++ /dev/null @@ -1,3 +0,0 @@ - -M -java:S1135"2Complete the task associated to this TODO comment.(؋ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 b/src/Notes-master1/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 deleted file mode 100644 index d107380..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 +++ /dev/null @@ -1,15 +0,0 @@ - -i -java:S1192"MDefine a constant instead of duplicating this literal "Unknown URI " 4 times.( -M -java:S1153"1Directly append the argument of String.valueOf().(ߦ - -java:S3008L"eRename this field "NOTES_SNIPPET_SEARCH_QUERY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -M -java:S1135%"2Complete the task associated to this TODO comment.(ߴ -_ -java:S1659"CDeclare "noteId" and all following declarations on a separate line.(ؘ -T -java:S2130"8Use "Long.parseLong" for this string-to-long conversion.( -N -java:S1135"2Complete the task associated to this TODO comment.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/9/3/934a4e2abf19d28a53f6aeb1dcd99248c44b6892 b/src/Notes-master1/.idea/sonarlint/issuestore/9/3/934a4e2abf19d28a53f6aeb1dcd99248c44b6892 deleted file mode 100644 index f6fc1de..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/9/3/934a4e2abf19d28a53f6aeb1dcd99248c44b6892 +++ /dev/null @@ -1,5 +0,0 @@ - -2 -java:S2386+"Make this member "protected".(X -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f b/src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f deleted file mode 100644 index 280a82e..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f +++ /dev/null @@ -1,11 +0,0 @@ - -t -java:S2293)"YReplace the type specification in this constructor call with the diamond operator ("<>").( -P -java:S1118":Add a private constructor to hide the implicit public one.( -q -java:S3252!"VUse static access with "android.provider.ContactsContract$DataColumns" for "MIMETYPE".( -r -java:S3252""\Use static access with "android.provider.ContactsContract$DataColumns" for "RAW_CONTACT_ID".( -t -java:S32524"^Use static access with "android.provider.ContactsContract$ContactsColumns" for "DISPLAY_NAME".( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af b/src/Notes-master1/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af deleted file mode 100644 index 6498931..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af +++ /dev/null @@ -1,17 +0,0 @@ - -e -java:S2095"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.( -k java:S116w"VRename this field "TEXT_FORMAT" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ћ -i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.( -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( -\ -java:S2147"ECombine this catch with the one at line 301, which has the same body.(ߝȴ -\ -java:S2147"ECombine this catch with the one at line 334, which has the same body.(ﭣ -] java:S899"BDo something with the "boolean" value returned by "createNewFile".(А -9 -java:S3398H"#Move this method into "TextExport".( -? -java:S3398"#Move this method into "TextExport".( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 b/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 deleted file mode 100644 index d18cbdd..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 +++ /dev/null @@ -1,17 +0,0 @@ - -f -java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.( -U -java:S11181":Add a private constructor to hide the implicit public one.(͓ -^ -java:S1214@"CMove constants defined in this interfaces to another class or enum.(⸫ -Z -java:S1214"CMove constants defined in this interfaces to another class or enum.( -I -java:S1135"2Complete the task associated to this TODO comment.(Ҍ -V -java:S1118":Add a private constructor to hide the implicit public one.( -I -java:S1135"2Complete the task associated to this TODO comment.( -Q -java:S1118":Add a private constructor to hide the implicit public one.(߀ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 deleted file mode 100644 index c7ec64b..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 +++ /dev/null @@ -1,102 +0,0 @@ - -p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 -> -java:S1604"(Make this anonymous inner class a lambda(̺V -? -java:S1604"(Make this anonymous inner class a lambda(ά -? -java:S1604"(Make this anonymous inner class a lambda(ܴ -D -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda(۱ -? -java:S1604"(Make this anonymous inner class a lambda(ά -g -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד -Z -java:S2583"CChange this condition so that it does not always evaluate to "true"( -n java:S116R"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -z -java:S1450R"XRemove the "time_mode" field and declare it as a local variable in the relevant methods.(8넾0 -7 -java:S1116b"Remove this empty statement.( -a -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( -2 -java:S3626"Remove this redundant jump.(݅ -2 -java:S3626"Remove this redundant jump.(݅ -2 -java:S3626"Remove this redundant jump.(݅ -P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ -Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ -N -java:S1135"2Complete the task associated to this TODO comment.(̐ -F -java:S2093"*Change this "try" to a try-with-resources.( -o -java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( -n -java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( -N -java:S1135"2Complete the task associated to this TODO comment.( -N -java:S1135"2Complete the task associated to this TODO comment.( -U -java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ -M -java:S1874"1Remove this use of "getHeight"; it is deprecated.( -8 -java:S1116"Remove this empty statement.( -i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.( -C -java:S1874".Remove this use of ""; it is deprecated.(? -? java:S108")Either remove or fill this block of code.(ʥ -K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 -S -java:S1874"7Remove this use of "toggleSoftInput"; it is deprecated.( -O -java:S1874"3Remove this use of "SHOW_FORCED"; it is deprecated.( -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(# -N -java:S1135"2Complete the task associated to this TODO comment.( -^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 -N -java:S1135"2Complete the task associated to this TODO comment.( -f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".( -Q -java:S1874"5Remove this use of "onBackPressed"; it is deprecated.( -^ java:S125""; it is deprecated.(Ч -f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች -K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b -< -java:S3398"%Move this method into "ModeCallback".( -A -java:S3398"%Move this method into "ModeCallback".( -K -java:S3398"/Move this method into "BackgroundQueryHandler".( -G -java:S3398"0Move this method into "OnListItemClickListener".( -H -java:S1068R"-Remove this unused "time_mode" private field.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88 b/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88 deleted file mode 100644 index 7bedb1a..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88 +++ /dev/null @@ -1,5 +0,0 @@ - -M -java:S1135"2Complete the task associated to this TODO comment.(铨 -[ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 b/src/Notes-master1/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 deleted file mode 100644 index 9a59a4b..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 +++ /dev/null @@ -1,95 +0,0 @@ - -P -java:S1118":Add a private constructor to hide the implicit public one.( -` -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(㘱 -[ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(ρ -` -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ɖ -[ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124!"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124#"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124%"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124'"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124)"EReorder the modifiers to comply with the Java Language Specification.(۲ -` -java:S1124+"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124-"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124/"EReorder the modifiers to comply with the Java Language Specification.(Ӎ -[ -java:S11241"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S11243"EReorder the modifiers to comply with the Java Language Specification.(̥ -[ -java:S11245"EReorder the modifiers to comply with the Java Language Specification.(Ƒ -Z -java:S11247"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S11249"EReorder the modifiers to comply with the Java Language Specification.( -Z -java:S1124;"EReorder the modifiers to comply with the Java Language Specification.(K -` -java:S1124="EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124?"EReorder the modifiers to comply with the Java Language Specification.(֫ -Z -java:S1124A"EReorder the modifiers to comply with the Java Language Specification.($ -[ -java:S1124C"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124E"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124G"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124I"EReorder the modifiers to comply with the Java Language Specification.(૵ -` -java:S1124K"EReorder the modifiers to comply with the Java Language Specification.(֐ -[ -java:S1124M"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124O"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124Q"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124S"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124U"EReorder the modifiers to comply with the Java Language Specification.(ʹ -` -java:S1124W"EReorder the modifiers to comply with the Java Language Specification.(ԣ -[ -java:S1124Y"EReorder the modifiers to comply with the Java Language Specification.(΢ -` -java:S1124["EReorder the modifiers to comply with the Java Language Specification.(Ō -` -java:S1124]"EReorder the modifiers to comply with the Java Language Specification.(Ȩ -[ -java:S1124_"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124a"EReorder the modifiers to comply with the Java Language Specification.(̀ -` -java:S1124c"EReorder the modifiers to comply with the Java Language Specification.(â -` -java:S1124e"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124g"EReorder the modifiers to comply with the Java Language Specification.(ƒ -` -java:S1124i"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124k"EReorder the modifiers to comply with the Java Language Specification.( -Z -java:S1124m"EReorder the modifiers to comply with the Java Language Specification.(†- -` -java:S1124o"EReorder the modifiers to comply with the Java Language Specification.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f b/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f deleted file mode 100644 index 4c37674..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f +++ /dev/null @@ -1,35 +0,0 @@ - -P -java:S1118":Add a private constructor to hide the implicit public one.(ڦ -P -java:S1118*":Add a private constructor to hide the implicit public one.( -[ -java:S1124+"EReorder the modifiers to comply with the Java Language Specification.(Ɠ -` -java:S11243"EReorder the modifiers to comply with the Java Language Specification.( -O -java:S1874E"9Remove this use of "PreferenceManager"; it is deprecated.( -Y -java:S1874E"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.( -D -java:S2140G")Use "java.util.Random.nextInt()" instead.( -U -java:S1118M":Add a private constructor to hide the implicit public one.(Ū -` -java:S1124N"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124V"EReorder the modifiers to comply with the Java Language Specification.( -` -java:S1124^"EReorder the modifiers to comply with the Java Language Specification.( -[ -java:S1124f"EReorder the modifiers to comply with the Java Language Specification.(ɜ -Q -java:S1118":Add a private constructor to hide the implicit public one.(ֹ -a -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( -a -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( -V -java:S1118":Add a private constructor to hide the implicit public one.( -\ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a b/src/Notes-master1/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a deleted file mode 100644 index f83d087..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a +++ /dev/null @@ -1,7 +0,0 @@ - -\ -java:S2259"@A "NullPointerException" could be thrown; "js" is nullable here.( -M -java:S1135""2Complete the task associated to this TODO comment.( -i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(ǎ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb b/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb deleted file mode 100644 index 5405687..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb +++ /dev/null @@ -1,15 +0,0 @@ - -u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(л -j -java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( -O -java:S2589"8Remove this expression which always evaluates to "false"( -\ -java:S1126}"AReplace this if-then-else statement by a single return statement.(Ʒ -i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( -U -java:S1155">Use isEmpty() to check whether the collection is empty or not.( -\ -java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc b/src/Notes-master1/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc deleted file mode 100644 index c973d3e..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc +++ /dev/null @@ -1,9 +0,0 @@ - -t -java:S2293*"YReplace the type specification in this constructor call with the diamond operator ("<>").(ʩ -\ -java:S2259"@A "NullPointerException" could be thrown; "js" is nullable here.( -H -java:S1135 "2Complete the task associated to this TODO comment.( -r -java:S3923"[Remove this conditional structure or edit its code blocks so that they're not all the same.(ԡ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 b/src/Notes-master1/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 deleted file mode 100644 index 7e6be89..0000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/f/1/f1226eeacd46c914d51f3d1a6d6f27377490d2a4 +++ /dev/null @@ -1,13 +0,0 @@ - -u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( -u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( -u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( -2 -java:S2386."Make this member "protected".(u -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 91 to the 15 allowed.( -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 32 to the 15 allowed.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb index a3ae317..9cf117e 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -13,54 +13,14 @@ B gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9 X (gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e -g -7app/src/main/java/net/micode/notes/gtask/data/Node.java,3\a\3aac5305cb73bfbdeb8078cd264d04323fa80e92 -j -:app/src/main/java/net/micode/notes/gtask/data/SqlData.java,9\3\934a4e2abf19d28a53f6aeb1dcd99248c44b6892 -j -:app/src/main/java/net/micode/notes/gtask/data/SqlNote.java,f\1\f1226eeacd46c914d51f3d1a6d6f27377490d2a4 -g -7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a -k -;app/src/main/java/net/micode/notes/gtask/data/TaskList.java,e\0\e094aec5c3e1b6f44539adff3114f5a1ad603ddc : .classpath,3\5\354079a72b91a4280407c16a36f47d1986fd85a5 -d -4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f -k -;app/src/main/java/net/micode/notes/gtask/data/MetaData.java,c\1\c182d0c9c237ea8a46a92ccaae9bb5c751923a88 -s -Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf -m -=app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710 -k -;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f -m -=app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7 f 6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 -h -8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af -~ -Napp/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java,5\f\5f6162ca79fcea353b280c5dc84973a9c37d2c74 - -Oapp/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java,0\f\0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1 < build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 P app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e @ -app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 -p -@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 -l - - - - 短信 - 邮件 - - - %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/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index ef354b7..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,109 +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/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 8f521ae..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,170 +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 - Set password - 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/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 1c6ac98..28ee4ff 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Oct 28 10:18:03 CST 2022 +#Sat Oct 29 09:01:41 CST 2022 path.4=15/classes.dex path.3=13/classes.dex path.2=12/classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 7dc2e07..6508a8e 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index d4e7deb..cc6e0cc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 69ac9b5..0b3c008 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index 0d94b05..e33d35b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index e5fa1af..0209f88 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index f99f059..ed3e3a8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index b7eacf4..ee0e570 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 81d6513..3394ead 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 1e563e2..e899f9f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index a3f2c62..48aaee1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 189b86c..25eb10e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class index 5f19dec..4f9df58 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class index e72d647..614be86 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class index defdfae..2c2a8d7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 9d851cd..fba27d5 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index e4e6265..6e73924 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 8c75fa4..b299cdf 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 2b3e9c3..560040c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index c702681..dd1c8cd 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index b24d0b2..78e7178 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 79933a1..95e03c1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index c76e72a..a320a7a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index c7112d3..65cd8e2 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 70a6c32..198039f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index b1e1063..278e52f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index c611459..615b421 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 249af2c..1a1774a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 77158e4..aa101ce 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 80d68f0..90ccbb8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 80eff38..079bde8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 43f1084..364f5ee 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index 6a684f9..241c574 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,30 +3,32 @@ 3 package="net.micode.notes.test" > 4 5 D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:5:5-74 -6 android:minSdkVersion="14" -6-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:5:15-41 -7 android:targetSdkVersion="14" /> -7-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:5:42-71 +5-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:5:5-74 +6 android:minSdkVersion="23" +6-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:5:15-41 +7 android:targetSdkVersion="23" /> +7-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:5:42-71 8 9 D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:11:5-15:66 +9-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:11:5-15:66 10 android:name="android.test.InstrumentationTestRunner" -10-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:11:22-75 +10-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:11:22-75 11 android:functionalTest="false" -11-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:14:22-52 +11-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:14:22-52 12 android:handleProfiling="false" -12-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:13:22-53 +12-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:13:22-53 13 android:label="Tests for net.micode.notes" -13-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:15:22-64 +13-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:15:22-64 14 android:targetPackage="net.micode.notes" /> -14-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:12:22-62 +14-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:12:22-62 15 -16 -16-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:7:5-9:19 -17 -17-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:8:9-60 -17-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest9375987709297009566.xml:8:23-57 -18 -19 -20 +16 D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:7:5-9:19 +17 android:debuggable="true" +18 android:extractNativeLibs="false" > +19 +19-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:8:9-60 +19-->D:\Android_new\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest8532400150894023689.xml:8:23-57 +20 +21 +22 diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index c3dc57a..35d3b57 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 32e5157..f9054a0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -159,14 +159,14 @@ "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" }, - { - "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" - }, { "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat", "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml" }, + { + "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", + "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" + }, { "merged": "D:\\Android_new\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat", "source": "D:\\Android_new\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml index edad39a..8a442a0 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml @@ -3,8 +3,8 @@ package="net.micode.notes.test" > + android:minSdkVersion="23" + android:targetSdkVersion="23" /> - + diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index f428c0a..2064682 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ index 74a7dbb..bf4cbf2 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/38c69848a13b28280e2dc814535c2513d3268ab15f12208da848bd744c1e558a_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/38c69848a13b28280e2dc814535c2513d3268ab15f12208da848bd744c1e558a_1.jar deleted file mode 100644 index 3f8ae75..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/38c69848a13b28280e2dc814535c2513d3268ab15f12208da848bd744c1e558a_1.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/83cf927c261f5fdfcb0da9128221f6d73b3a712b95bf36cba82738aab6072262_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/83cf927c261f5fdfcb0da9128221f6d73b3a712b95bf36cba82738aab6072262_1.jar deleted file mode 100644 index 6c918e9..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/83cf927c261f5fdfcb0da9128221f6d73b3a712b95bf36cba82738aab6072262_1.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/a7d3ed01f8c279c45552a3a2ecb3b0ecd38640288a7ea3b02b298e43082a74e5_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/a7d3ed01f8c279c45552a3a2ecb3b0ecd38640288a7ea3b02b298e43082a74e5_1.jar deleted file mode 100644 index ea9750f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/a7d3ed01f8c279c45552a3a2ecb3b0ecd38640288a7ea3b02b298e43082a74e5_1.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 8516f6f..a89f1dc 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index f48e613..b04d73d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index a25ee7c..24f7fa3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 037ab68..3f2c49e 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index c683825..0f744f0 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 868fa4c..83c535a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index fa095d2..3703b97 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index ced9beb..eb97d10 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 45e0196..3849709 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex index 95f9a24..d69951f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex index 83baf90..b523ace 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex index 43e9f83..2a4e612 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex index 3a54916..75fd8ce 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index aa30a11..25102fe 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index a7be333..e109261 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index d7f73c9..663e3b4 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 5cb5eb2..f525d3f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 7ba9abb..9a0c61c 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 9ec0a0e..058a473 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 6d844a0..e82d399 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index f0b2ffa..a302439 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 720352e..4e37786 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 8a900e1..4678153 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index eedc607..8178baa 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 3210309..8501594 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 69463d8..ccb0e6a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 4c0d63c..7091462 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index dcf65a9..497f919 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index d04a32f..fb3c662 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index c3dd774..6c2f4b5 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk index 55ff3b2..4a015ac 100644 Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index d34dd61..7d2d18f 100644 Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java index 38564c8..e2882ac 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java @@ -72,7 +72,7 @@ public class Notes { * The password for the note *

Type: STRING */ - public static final String PASSWORD = ""; + String PASSWORD = ""; /** * The parent's id for note or folder *

Type: INTEGER (long)

diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java index 944bcf4..31b6652 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -182,22 +182,22 @@ public class Task extends Node { } try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - - if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { - Log.e(TAG, "invalid type"); - return; - } + if (js != null){ + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { + Log.e(TAG, "invalid type"); + return; + } - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - setName(data.getString(DataColumns.CONTENT)); - break; + for (int i = 0; i < dataArray.length(); i++) { + JSONObject data = dataArray.getJSONObject(i); + if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { + setName(data.getString(DataColumns.CONTENT)); + break; + } } } - } catch (JSONException e) { Log.e(TAG, e.toString()); e.printStackTrace(); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java index 7120ea0..b81b56c 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java @@ -135,21 +135,23 @@ public class TaskList extends Node { } try { - JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - - if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - String name = folder.getString(NoteColumns.SNIPPET); - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); - } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); - else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE); - else - Log.e(TAG, "invalid system folder"); - } else { - Log.e(TAG, "error type"); + if(js != null){ + JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + + if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + String name = folder.getString(NoteColumns.SNIPPET); + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); + } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { + if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); + else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + + GTaskStringUtils.FOLDER_CALL_NOTE); + else + Log.e(TAG, "invalid system folder"); + } else { + Log.e(TAG, "error type"); + } } } catch (JSONException e) { Log.e(TAG, e.toString()); @@ -200,7 +202,7 @@ public class TaskList extends Node { Log.e(TAG, "gtask id doesn't match"); return SYNC_ACTION_ERROR; } - if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + else if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { // local modification only return SYNC_ACTION_UPDATE_REMOTE; } else { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java index a499a2a..fbee962 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java @@ -331,7 +331,9 @@ public class GTaskManager { while (iter.hasNext()) { Map.Entry entry = iter.next(); node = entry.getValue(); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); + if (node != null){ + doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); + } } // mCancelled can be set by another thread, so we neet to check one by diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java index 8deb26b..73a0eaa 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -62,12 +62,9 @@ public class WorkingNote { private NoteSettingChangedListener mNoteSettingStatusListener; - private String mPassword = ""; + public String mPassword = ""; + - public boolean hasmPassword(){ - if (mPassword == "") return false; - else return true; - } /** * 设置便签的访问密码 * @param password 新的访问密码 @@ -96,7 +93,7 @@ public class WorkingNote { NoteColumns.BG_COLOR_ID, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE + NoteColumns.MODIFIED_DATE, }; private static final int DATA_ID_COLUMN = 0; @@ -130,7 +127,7 @@ public class WorkingNote { mIsDeleted = false; mMode = 0; mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - + mPassword=""; } // Existing note construct diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 39f6ec4..42b88f1 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -295,8 +295,9 @@ public class BackupUtils { mFileName = file.getName(); mFileDirectory = mContext.getString(R.string.file_path); PrintStream ps = null; + FileOutputStream fos = null; try { - FileOutputStream fos = new FileOutputStream(file); + fos = new FileOutputStream(file); ps = new PrintStream(fos); } catch (FileNotFoundException e) { e.printStackTrace(); @@ -304,6 +305,18 @@ public class BackupUtils { } catch (NullPointerException e) { e.printStackTrace(); return null; + }finally { + if (ps != null){ + ps.close(); + } + if (fos != null){ + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } return ps; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index 2c47ba4..fde6666 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -77,7 +77,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_12HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 8deee36..a066a8f 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -316,7 +316,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void initNoteScreen() { - /*String mPassword = mWorkingNote.getmPassword();//读取数据库中的密码 + String mPassword = mWorkingNote.getmPassword();//读取数据库中的密码 if (mPassword!=null && mPassword.length() != 0) { //创建dialog，插入edittext，用户输入密码并做出检验。 final AlertDialog.Builder builder = new AlertDialog.Builder(this); @@ -350,7 +350,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, }); final Dialog dialog = builder.setView(view).show(); dialog.show(); - }*/ + } mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); @@ -624,13 +624,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } clearSettingState(); menu.clear(); - if (mWorkingNote.hasmPassword()){ - if (menu.findItem(R.id.menu_set_passcode) != null) - menu.findItem(R.id.menu_set_passcode).setVisible(false); - }else { - if (menu.findItem(R.id.menu_delete_passcode) != null) - menu.findItem(R.id.menu_delete_passcode).setVisible(false); - } if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_note_edit, menu); } else { @@ -692,7 +685,49 @@ public class NoteEditActivity extends Activity implements OnClickListener, case R.id.menu_alert: setReminder(); break; - + case R.id.menu_set_passcode: + final AlertDialog.Builder builder1 = new AlertDialog.Builder(this); + final View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text,null); + //编辑Text + final EditText etName = (EditText)view.findViewById(R.id.et_foler_name); + etName.setText(""); + etName.setHint("请输入密码"); + builder1.setTitle("为便签设置新密码"); + builder1.setPositiveButton("OK", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + //获取输入的字符串 + String password = etName.getText().toString(); + //设置密码 + mWorkingNote.setPassword(password); + saveNote(); + //设置密码成功提示 + Toast.makeText(NoteEditActivity.this, "密码设置成功", Toast.LENGTH_SHORT).show(); + Log.d(TAG, "onClick() returned: " + mWorkingNote.getmPassword()); + //关闭软键盘 + InputMethodManager inputMethodManager = (InputMethodManager) + getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0); + //关闭dialog + dialog.dismiss(); + } + }); + builder1.setNegativeButton("cancel", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + //关闭软键盘 + InputMethodManager inputMethodManager = (InputMethodManager) + getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0); + } + }); + final Dialog dialog = builder1.setView(view).show(); + dialog.show(); + break; + case R.id.menu_delete_passcode: + mWorkingNote.setPassword(""); + Toast.makeText(NoteEditActivity.this, "密码取消成功", Toast.LENGTH_SHORT).show(); + break; case R.id.menu_delete_remind: mWorkingNote.setAlertDate(0, false); break; diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 9303602..14d9e86 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -166,7 +166,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt StringBuilder sb = new StringBuilder(); InputStream in = null; try { - in = getResources().openRawResource(R.raw.introduction); + in = getResources().openRawResource(R.raw.introduction); if (in != null) { InputStreamReader isr = new InputStreamReader(in); BufferedReader br = new BufferedReader(isr); @@ -175,6 +175,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt while ((len = br.read(buf)) > 0) { sb.append(buf, 0, len); } + if (br != null){ + try{ + br.close(); + }catch(IOException e){ + e.printStackTrace(); + return; + } + } } else { Log.e(TAG, "Read introduction file error"); return; diff --git a/src/Notes-master1/app/src/main/res/menu/note_edit.xml b/src/Notes-master1/app/src/main/res/menu/note_edit.xml index b39f17d..256d73b 100644 --- a/src/Notes-master1/app/src/main/res/menu/note_edit.xml +++ b/src/Notes-master1/app/src/main/res/menu/note_edit.xml @@ -54,6 +54,12 @@ android:id="@+id/menu_delete_remind" android:title="@string/menu_remove_remind" /> + + \ No newline at end of file diff --git a/src/Notes-master1/build/sonar/report-task.txt b/src/Notes-master1/build/sonar/report-task.txt index 7a65a54..34c48d0 100644 --- a/src/Notes-master1/build/sonar/report-task.txt +++ b/src/Notes-master1/build/sonar/report-task.txt @@ -2,5 +2,5 @@ projectKey=xiaomi serverUrl=http://localhost:9000 serverVersion=9.6.1.59531 dashboardUrl=http://localhost:9000/dashboard?id=xiaomi -ceTaskId=AYN0iEUZrW3cQw_vkPEt -ceTaskUrl=http://localhost:9000/api/ce/task?id=AYN0iEUZrW3cQw_vkPEt +ceTaskId=AYQhLDnX9NYGhSCCrO7D +ceTaskUrl=http://localhost:9000/api/ce/task?id=AYQhLDnX9NYGhSCCrO7D