Merge branch 'master' into weblogin (b1260aca) · Commits · e / os / Notes

app/build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@ android {
		applicationId "it.niedermann.owncloud.notes"
		minSdkVersion 14
		targetSdkVersion 27
		versionCode 28
		versionName "0.16.1"
		versionCode 29
		versionName "0.17.0"
		}
		buildTypes {
		release {

+1 −5

Original line number	Diff line number	Diff line
		@@ -148,7 +148,6 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm

		@Override
		public void onBackPressed() {
		fragment.onPrepareClose();
		close();
		}

		@@ -162,15 +161,12 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case android.R.id.home:
		fragment.onPrepareClose();
		close();
		return true;
		case R.id.menu_preview:
		fragment.onPrepareClose();
		launchExistingNote(getNoteId(), false);
		return true;
		case R.id.menu_edit:
		fragment.onPrepareClose();
		launchExistingNote(getNoteId(), true);
		return true;
		default:
		@@ -193,7 +189,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		} else {
		preferences.edit().putString(prefKeyLastMode, getString(R.string.pref_value_mode_preview)).apply();
		}
		fragment.onFinalClose();
		fragment.onCloseNote();
		finish();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -558,7 +558,6 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
		db = NoteSQLiteOpenHelper.getInstance(this);
		if (db.getNoteServerSyncHelper().isSyncPossible()) {
		adapter.removeAll();
		swipeRefreshLayout.setRefreshing(true);
		synchronize();
		} else {
		Toast.makeText(getApplicationContext(), getString(R.string.error_sync, getString(NotesClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG).show();
		@@ -633,6 +632,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
		}

		private void synchronize() {
		swipeRefreshLayout.setRefreshing(true);
		db.getNoteServerSyncHelper().addCallbackPull(syncCallBack);
		db.getNoteServerSyncHelper().scheduleSync(false);
		}

+14 −7

Original line number	Diff line number	Diff line
		@@ -78,6 +78,12 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
		listener.onNoteUpdated(note);
		}

		@Override
		public void onPause() {
		super.onPause();
		saveNote(null);
		}

		@Override
		public void onDetach() {
		super.onDetach();
		@@ -155,11 +161,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
		}
		}

		public void onPrepareClose() {
		saveNote(null);
		}

		public void onFinalClose() {
		public void onCloseNote() {
		if (originalNote == null && getContent().isEmpty()) {
		db.deleteNoteAndSync(note.getId());
		}
		@@ -172,9 +174,14 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
		*/
		protected void saveNote(@Nullable ICallback callback) {
		Log.d(getClass().getSimpleName(), "saveData()");
		note = db.updateNoteAndSync(note, getContent(), callback);
		String newContent = getContent();
		if(note.getContent().equals(newContent)) {
		Log.v(getClass().getSimpleName(), "... not saving, since nothing has changed");
		} else {
		note = db.updateNoteAndSync(note, newContent, callback);
		listener.onNoteUpdated(note);
		}
		}

		protected abstract String getContent();

deleted100644 → 0

−1.28 KiB

Loading image diff...