卫俊钢 提交代码标注

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

@@ -1,4 +1,4 @@
-#Thu Jun 08 08:00:27 CST 2023
+#Thu Jun 08 16:27:50 CST 2023
 base.0=C\:\\Users\\Admin\\Desktop\\gitProject1\\gitProject1\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/Notes/app/src/main/java/net/micode/notes/model/WorkingNote.java

@@ -203,12 +203,8 @@ public class WorkingNote {
     }
 
     private boolean isWorthSaving() {
-        if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
+        return !mIsDeleted && (existInDatabase() || !TextUtils.isEmpty(mContent))
-                || (existInDatabase() && !mNote.isLocalModified())) {
+                && (!existInDatabase() || mNote.isLocalModified());
-            return false;
-        } else {
-            return true;
-        }
     }
 
     public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {

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

@@ -50,7 +50,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         Intent intent = getIntent();
 
         try {
-            mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
+            mNoteId = Long.parseLong(intent.getData().getPathSegments().get(1));
             mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
             mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
                     SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
@@ -93,17 +93,8 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
             mPlayer.prepare();
             mPlayer.setLooping(true);
             mPlayer.start();
-        } catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException | SecurityException | IllegalStateException |
-            // TODO Auto-generated catch block
+                 IOException e) {
-            e.printStackTrace();
-        } catch (SecurityException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IllegalStateException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }