Test Summary
+|
+
+
+
|
+
+
+
+-
+N/A + |
+
-
+
- +Classes + +
Classes
+| Class | +Tests | +Failures | +Skipped | +Duration | +Success rate | +
|---|
|
+
+
+
|
+
+
+
+-
+N/A + |
+
| Class | +Tests | +Failures | +Skipped | +Duration | +Success rate | +
|---|
Type: INTEGER (long)
@@ -167,7 +185,11 @@ public class Notes { public static final String VERSION = "version"; } - public interface DataColumns { + public final class DataColumns { + private DataColumns() + { + throw new IllegalStateException(UTILITY_CLASS); + } /** * The unique ID for a row *Type: INTEGER (long)
@@ -241,12 +263,16 @@ public class Notes { public static final String DATA5 = "data5"; } - public static final class TextNote implements DataColumns { + public static final class TextNote { + private TextNote() + { + throw new IllegalStateException(UTILITY_CLASS); + } /** * Mode to indicate the text in check list mode or not *Type: Integer 1:check list mode 0: normal mode
*/ - public static final String MODE = DATA1; + public static final String MODE = DataColumns.DATA1; public static final int MODE_CHECK_LIST = 1; @@ -254,26 +280,30 @@ public class Notes { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); + public static final Uri CONTENT_URI = Uri.parse(CONTENT + AUTHORITY + "/text_note"); } - public static final class CallNote implements DataColumns { + public static final class CallNote { + private CallNote() + { + throw new IllegalStateException(UTILITY_CLASS); + } /** * Call date for this record *Type: INTEGER (long)
*/ - public static final String CALL_DATE = DATA1; + public static final String CALL_DATE = DataColumns.DATA1; /** * Phone number for this record *Type: TEXT
*/ - public static final String PHONE_NUMBER = DATA3; + public static final String PHONE_NUMBER = DataColumns.DATA3; public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); + public static final Uri CONTENT_URI = Uri.parse(CONTENT + AUTHORITY + "/call_note"); } } diff --git a/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java rename to Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/Notes-master/src/net/micode/notes/data/NotesProvider.java b/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/NotesProvider.java rename to Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/MetaData.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/MetaData.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/Node.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/Node.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlData.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/SqlData.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/SqlNote.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/Task.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 99% rename from Notes-master/src/net/micode/notes/gtask/data/Task.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java index 6a19454..a314ef3 100644 --- a/Notes-master/src/net/micode/notes/gtask/data/Task.java +++ b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -299,9 +299,10 @@ public class Task extends Node { if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { // local modification only return SYNC_ACTION_UPDATE_REMOTE; - } else { - return SYNC_ACTION_UPDATE_CONFLICT; } + //else + return SYNC_ACTION_UPDATE_CONFLICT; + } } catch (Exception e) { Log.e(TAG, e.toString()); diff --git a/Notes-master/src/net/micode/notes/gtask/data/TaskList.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/TaskList.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 65% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e7..bc5e3ab 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -63,25 +63,47 @@ public class GTaskASyncTask extends AsyncTask