私密便签不可删除

src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Dec 24 11:05:05 CST 2024
+#Tue Dec 24 19:20:31 CST 2024
 path.4=15/classes.dex
 path.3=13/classes.dex
 path.2=12/classes.dex

src/Notes/app/src/main/java/net/micode/notes/data/NotesProvider.java

@@ -15,6 +15,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
+import android.widget.Toast;
 
 import net.micode.notes.R;
 import net.micode.notes.data.Notes.DataColumns;
@@ -25,7 +26,7 @@ import net.micode.notes.data.NotesDatabaseHelper.TABLE;
 public class NotesProvider extends ContentProvider {
     private static final UriMatcher mMatcher;
 
-    private NotesDatabaseHelper mHelper;
+    private static NotesDatabaseHelper mHelper;
 
     private static final String TAG = "NotesProvider";
 
@@ -355,4 +356,21 @@ public class NotesProvider extends ContentProvider {
         return null;
     }
 
+    public static boolean isPrivateNote(long id){
+        SQLiteDatabase db;
+        db=mHelper.getReadableDatabase();
+        Cursor cursor = db.query("note", new String[]{NoteColumns.ID,NoteColumns.PASSWORD},//对数据库查询的光标
+                "_id = ?",new String[]{String.valueOf(id)},null,null,null);
+        cursor.moveToFirst();//防止遗漏，先把光标移到最上面
+        //Log.d(TAG, "WithoutPassword: "+cursor.getColumnIndex("_id"));
+        //Log.d(TAG, "WithoutPassword: "+cursor.getColumnIndex("note_password"));
+        String p = cursor.getString(cursor.getColumnIndex("password"));//找对应的密码
+        if(!p.equals("")&&!p.equals("0"))
+        {
+            cursor.close();
+            return true;
+        }
+        cursor.close();
+        return false;
+    }
 }

src/Notes/app/src/main/java/net/micode/notes/tool/DataUtils.java

@@ -25,10 +25,12 @@ import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.os.RemoteException;
 import android.util.Log;
+import android.widget.Toast;
 
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.CallNote;
 import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.NotesProvider;
 import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
 
 import java.util.ArrayList;
@@ -62,6 +64,10 @@ public class DataUtils {
                 Log.e(TAG, "Don't delete system folder root");
                 continue;
             }
+            if(NotesProvider.isPrivateNote(id)){
+                Log.e(TAG, "Don't delete private note.");
+                continue;
+            }
             ContentProviderOperation.Builder builder = ContentProviderOperation
                     .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
             operationList.add(builder.build());

src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -741,9 +741,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 builder.setPositiveButton(android.R.string.ok,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
+                                if(mWorkingNote.getCheckListMode()==TextNote.MODE_PRIVATE_TYPE){
+                                    Toast.makeText(getApplicationContext(),"私密便签不可删除",Toast.LENGTH_SHORT).show();
+                                }
                                 // 确认删除当前笔记并结束当前活动
-                                deleteCurrentNote();
+                                else
-                                finish();
+                                {
+                                    deleteCurrentNote();
+                                    finish();
+                                }
                             }
                         });
                 builder.setNegativeButton(android.R.string.cancel, null);