Fixing sychronization and concurrency issues

app/src/androidTest/java/it/niedermann/owncloud/notes/model/NoteTest.java

@@ -11,7 +11,7 @@
 public class NoteTest extends TestCase {
 
     public void testMarkDownStrip() {
-        Note note = new Note(0, Calendar.getInstance(), "#Title", "");
+        OwnCloudNote note = new OwnCloudNote(0, Calendar.getInstance(), "#Title", "");
         assertTrue("Title".equals(note.getTitle()));
         note.setTitle("* Aufzählung");
         assertTrue("Aufzählung".equals(note.getTitle()));

app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java

@@ -6,6 +6,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.MenuItem;
 import android.widget.EditText;
 
@@ -16,28 +17,32 @@
 import java.util.concurrent.TimeUnit;
 
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.model.Note;
+import it.niedermann.owncloud.notes.model.DBNote;
 import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
 import it.niedermann.owncloud.notes.util.ICallback;
 import it.niedermann.owncloud.notes.util.NoteUtil;
 
 public class EditNoteActivity extends AppCompatActivity {
-    private final long DELAY = 1000; // in ms
+    private static final String LOG_TAG = "EditNote/SAVE";
+    private final long DELAY = 2000; // in ms
+    private final long DELAY_AFTER_SYNC = 5000; // in ms
     private EditText content = null;
-    private Note note = null;
-    private Timer timer = new Timer();
+    private DBNote note = null;
+    private Timer timer, timerNextSync;
+    private boolean saveActive = false;
     private ActionBar actionBar;
+    private NoteSQLiteOpenHelper db;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_edit);
-        note = (Note) getIntent().getSerializableExtra(
+        note = (DBNote) getIntent().getSerializableExtra(
                 NoteActivity.EDIT_NOTE);
         content = (EditText) findViewById(R.id.editContent);
-        content.setEnabled(false);
         content.setText(note.getContent());
         content.setEnabled(true);
+        db = new NoteSQLiteOpenHelper(this);
         actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setTitle(note.getTitle());
@@ -53,86 +58,130 @@ public void beforeTextChanged(CharSequence s, int start, int count,
             @Override
             public void onTextChanged(final CharSequence s, int start, int before,
                                       int count) {
-                if (timer != null)
+                if (timer != null) {
                     timer.cancel();
+                    timer = null;
+                }
             }
 
             @Override
             public void afterTextChanged(final Editable s) {
-                timer = new Timer();
-                timer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        runOnUiThread(new Runnable() {
+                if(db.getNoteServerSyncHelper().isSyncPossible()) {
+                    if(timer != null) {
+                        timer.cancel();
+                    }
+                    if(!saveActive) {
+                        timer = new Timer();
+                        timer.schedule(new TimerTask() {
                             @Override
                             public void run() {
-                                saveData();
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        autoSave();
+                                    }
+                                });
                             }
-                        });
+                        }, DELAY);
                     }
-                }, DELAY);
+                }
             }
         });
     }
 
     @Override
     public void onBackPressed() {
-        content.setEnabled(false);
-        saveData();
-        Intent data = new Intent();
-        data.setAction(Intent.ACTION_VIEW);
-        data.putExtra(NoteActivity.EDIT_NOTE, note);
-        setResult(RESULT_OK, data);
-        finish();
+        saveAndClose();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                content.setEnabled(false);
-                saveData();
-                Intent data = new Intent();
-                data.setAction(Intent.ACTION_VIEW);
-                data.putExtra(NoteActivity.EDIT_NOTE, note);
-                setResult(RESULT_OK, data);
-                finish();
+                saveAndClose();
                 return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    private void saveData() {
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setSubtitle(getResources().getString(R.string.action_edit_saving));
+    /**
+     * Saves all changes and closes the Activity
+     */
+    private void saveAndClose() {
+        content.setEnabled(false);
+        if(timer!=null) {
+            timer.cancel();
+            timer = null;
+        }
+        if(timerNextSync!=null) {
+            timerNextSync.cancel();
+            timerNextSync = null;
+        }
+        saveData(null);
+        Intent data = new Intent();
+        data.setAction(Intent.ACTION_VIEW);
+        data.putExtra(NoteActivity.EDIT_NOTE, note);
+        setResult(RESULT_OK, data);
+        finish();
+    }
+
+    /**
+     * Gets the current content of the EditText field in the UI.
+     * @return String of the current content.
+     */
+    private String getContent() {
+        return ((EditText) findViewById(R.id.editContent)).getText().toString();
+    }
+
+    /**
+     * Saves the current changes and show the status in the ActionBar
+     */
+    private void autoSave() {
+        Log.d(LOG_TAG, "START save+sync");
+        saveActive = true;
+        if (actionBar != null) {
+            actionBar.setSubtitle(getString(R.string.action_edit_saving));
         }
-        // #74
-        note.setModified(Calendar.getInstance());
-        note.setContent(((EditText) findViewById(R.id.editContent)).getText().toString());
-        // #80
-        note.setTitle(NoteUtil.generateNoteTitle(note.getContent()));
-        NoteSQLiteOpenHelper db = new NoteSQLiteOpenHelper(this);
-        db.getNoteServerSyncHelper().addCallback(new ICallback() {
+        final String content = getContent();
+        saveData(new ICallback() {
             @Override
             public void onFinish() {
-                runOnUiThread(new Runnable() {
+                // AFTER SYNCHRONIZATION
+                Log.d(LOG_TAG, "...sync finished");
+                actionBar.setTitle(note.getTitle());
+                actionBar.setSubtitle(getResources().getString(R.string.action_edit_saved));
+                Executors.newSingleThreadScheduledExecutor().schedule(new Runnable() {
                     @Override
                     public void run() {
-                        getSupportActionBar().setSubtitle(getResources().getString(R.string.action_edit_saved));
-                        Executors.newSingleThreadScheduledExecutor().schedule(new Runnable() {
+                        runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        getSupportActionBar().setSubtitle(null);
-                                    }
-                                });
+                                // AFTER 1 SECOND: set ActionBar to default title
+                                actionBar.setSubtitle(getString(R.string.action_edit_editing));
                             }
-                        }, 1, TimeUnit.SECONDS);
+                        });
+                    }
+                }, 1, TimeUnit.SECONDS);
+
+                timerNextSync = new Timer();
+                timerNextSync.schedule(new TimerTask() {
+                    @Override
+                    public void run() {
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                // AFTER "DELAY_AFTER_SYNC" SECONDS: allow next auto-save or start it directly
+                                if(getContent().equals(content)) {
+                                    saveActive = false;
+                                    Log.d(LOG_TAG, "FINISH, no new changes");
+                                } else {
+                                    Log.d(LOG_TAG, "content has changed meanwhile -> restart save");
+                                    autoSave();
+                                }
+                            }
+                        });
                     }
-                });
+                }, DELAY_AFTER_SYNC);
 
                 /* TODO Notify widgets
 
@@ -143,6 +192,13 @@ public void run() {
                 }*/
             }
         });
-        db.updateNoteAndSync(note);
+    }
+
+    /**
+     * Save the current state in the database and schedule synchronization if needed.
+     * @param callback
+     */
+    private void saveData(ICallback callback) {
+        note = db.updateNoteAndSync(note, getContent(), callback);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NoteActivity.java

@@ -12,13 +12,13 @@
 import android.widget.TextView;
 
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.model.Note;
+import it.niedermann.owncloud.notes.model.DBNote;
 import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
 
 public class NoteActivity extends AppCompatActivity implements View.OnClickListener {
     public final static String EDIT_NOTE = "it.niedermann.owncloud.notes.edit_note_id";
     public final static int EDIT_NOTE_CMD = 1;
-    private Note note = null;
+    private DBNote note = null;
     private int notePosition = 0;
     private TextView noteContent = null;
     private ActionBar actionBar = null;
@@ -27,10 +27,10 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_single_note);
-        note = (Note) getIntent().getSerializableExtra(
+        note = (DBNote) getIntent().getSerializableExtra(
                 NotesListViewActivity.SELECTED_NOTE);
         if (savedInstanceState != null) {
-            note = (Note) savedInstanceState.getSerializable("note");
+            note = (DBNote) savedInstanceState.getSerializable("note");
         }
         notePosition = getIntent().getIntExtra(
                 NotesListViewActivity.SELECTED_NOTE_POSITION, 0);
@@ -114,7 +114,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == EDIT_NOTE_CMD) {
             // Make sure the request was successful
             if (resultCode == RESULT_OK) {
-                Note editedNote = (Note) data.getExtras().getSerializable(
+                DBNote editedNote = (DBNote) data.getExtras().getSerializable(
                         EDIT_NOTE);
                 if (editedNote != null) {
                     note = editedNote;