打开回收站

src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -473,7 +473,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
-                if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ // 只需要修改这里
+                if (mCurrentFolderId == Notes.ID_TRASH_FOLER){
                     // if in trash, really delete notes
                     if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds())) {
@@ -515,11 +515,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         ids.add(folderId);
         HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
                 folderId);
-        if (!isSyncMode()) {
-            // if not synced, delete folder directly
+        if (mCurrentFolderId == Notes.ID_TRASH_FOLER) {
+            // if in trash, delete folder directly
             DataUtils.batchDeleteNotes(mContentResolver, ids);
         } else {
-            // in sync mode, we'll move the deleted folder into the trash folder
+            //move the deleted folder into the trash folder
             DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
         }
         if (widgets != null) {

src/app/src/main/res/values-zh-rCN/strings.xml

@@ -110,6 +110,7 @@
     <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
     <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
     <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="menu_trash">回收站</string>
     <string name="button_delete">删除</string>
     <string name="call_record_folder_name">通话便签</string>
     <string name="hint_foler_name">请输入名称</string>

src/app/src/main/res/values/strings.xml

@@ -116,7 +116,7 @@
     <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
     <string name="preferences_bg_random_appear_title">New note background color random</string>
 
-    <string name="menu_trash">Recycle Bin</string>
+    <string name="menu_trash">Trash Folder</string>
 
     <string name="button_delete">Delete</string>
     <string name="call_record_folder_name">Call notes</string>