From ebf94f0e06bf616d1f30e732c903bb1b5985082f Mon Sep 17 00:00:00 2001
From: FanYiWe <1813770650@qq.com>
Date: Wed, 10 Nov 2021 10:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Notes-master1/.idea/workspace.xml | 94 +------------------
.../net/micode/notes/gtask/data/Task.java | 24 ++---
.../net/micode/notes/gtask/data/TaskList.java | 34 +++----
.../notes/gtask/remote/GTaskClient.java | 5 +-
.../net/micode/notes/tool/BackupUtils.java | 6 +-
.../micode/notes/ui/DateTimePickerDialog.java | 13 ++-
.../micode/notes/ui/NotesListActivity.java | 24 ++---
7 files changed, 55 insertions(+), 145 deletions(-)
diff --git a/src/Notes-master1/.idea/workspace.xml b/src/Notes-master1/.idea/workspace.xml
index d348179c..21ad8b52 100644
--- a/src/Notes-master1/.idea/workspace.xml
+++ b/src/Notes-master1/.idea/workspace.xml
@@ -12,49 +12,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -63,7 +21,7 @@
-
+
@@ -141,7 +99,7 @@
-
+
@@ -247,52 +205,6 @@
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 154
-
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 287
-
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 1086
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 929
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 293
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 369
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 666
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 729
-
-
-
-
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 0a49f6bd..922d6047 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,19 +182,21 @@ public class Task extends Node {
}
try {
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+ 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;
- }
+ 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;
+ }
}
}
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 f0732fd7..e2394f68 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());
@@ -205,7 +207,7 @@ public class TaskList extends Node {
return SYNC_ACTION_UPDATE_REMOTE;
} else {
// for folder conflicts, just apply local modification
- return SYNC_ACTION_UPDATE_REMOTE;
+ return SYNC_ACTION_UPDATE_LOCAL;
}
}
} catch (Exception e) {
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index 1ba21776..f58684b7 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -306,11 +306,8 @@ public class GTaskClient {
input = new InflaterInputStream(entity.getContent(), inflater);
}
- try {
- InputStreamReader isr = new InputStreamReader(input);
- BufferedReader br = new BufferedReader(isr);
+ try (InputStreamReader isr = new InputStreamReader(input); BufferedReader br = new BufferedReader(isr)){
StringBuilder sb = new StringBuilder();
-
while (true) {
String buff = br.readLine();
if (buff == null) {
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 9698e4ed..c5efb78e 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
@@ -328,7 +328,11 @@ public class BackupUtils {
filedir.mkdir();
}
if (!file.exists()) {
- file.createNewFile();
+ boolean bool = file.createNewFile();
+ if(bool == false)
+ Log.e(TAG,"generateFileMountedOnSDcard: createNewFile false");
+ else
+ Log.e(TAG,"generateFileMountedOnSDcard: createNewFile true");
}
return file;
} catch (SecurityException e) {
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 c7f5afbe..b04323e0 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
@@ -16,12 +16,6 @@
package net.micode.notes.ui;
-import java.util.Calendar;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.DateTimePicker;
-import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;
-
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -29,6 +23,11 @@ import android.content.DialogInterface.OnClickListener;
import android.text.format.DateFormat;
import android.text.format.DateUtils;
+import net.micode.notes.R;
+import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;
+
+import java.util.Calendar;
+
public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
private Calendar mDate = Calendar.getInstance();
@@ -77,7 +76,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/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index d6c4116d..5e78b597 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
@@ -79,7 +79,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashSet;
-public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
private int time_mode = 0;
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
@@ -175,20 +175,14 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
StringBuilder sb = new StringBuilder();
InputStream in = null;
- try {
+ try (InputStreamReader isr = new InputStreamReader(in);BufferedReader br = new BufferedReader(isr)){
in = getResources().openRawResource(R.raw.introduction);
- if (in != null) {
- InputStreamReader isr = new InputStreamReader(in);
- BufferedReader br = new BufferedReader(isr);
- char [] buf = new char[1024];
- int len = 0;
- while ((len = br.read(buf)) > 0) {
- sb.append(buf, 0, len);
+ char [] buf = new char[1024];
+ int len = 0;
+ while ((len = br.read(buf)) > 0) {
+ sb.append(buf, 0, len);
}
- } else {
- Log.e(TAG, "Read introduction file error");
- return;
- }
+
} catch (IOException e) {
e.printStackTrace();
return;
@@ -510,8 +504,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
return;
}
}
- new AsyncTask>() {
- protected HashSet doInBackground(Void... unused) {
+ new AsyncTask>() {
+ protected HashSet doInBackground(Params... unused) {
HashSet widgets = mNotesListAdapter.getSelectedWidget();
if (!isSyncMode()) {
if (mCurrentFolderId == Notes.ID_TRASH_FOLER){
--
2.34.1