Merge branch '1243-remove-pii-from-prod-logcat' (1df88065) · Commits · e / os / Notes

app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import java.util.Collections;
		import java.util.List;
		import java.util.stream.Collectors;

		import it.niedermann.owncloud.notes.BuildConfig;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.branding.BrandingUtil;
		import it.niedermann.owncloud.notes.exception.IntendedOfflineException;
		@@ -216,7 +217,7 @@ public class MainViewModel extends AndroidViewModel {
		} else {
		Log.v(TAG, "[getNotesListLiveData] - selectedCategory: " + selectedCategory);
		return switchMap(getSearchTerm(), searchTerm -> {
		Log.v(TAG, "[getNotesListLiveData] - searchTerm: " + searchTerm);
		Log.v(TAG, "[getNotesListLiveData] - searchTerm: " + (BuildConfig.DEBUG ? "******" : searchTerm));
		return switchMap(getCategorySortingMethodOfSelectedCategory(), sortingMethod -> {
		final long accountId = currentAccount.getId();
		final String searchQueryOrWildcard = searchTerm == null ? "%" : "%" + searchTerm.trim() + "%";
		@@ -490,7 +491,7 @@ public class MainViewModel extends AndroidViewModel {

		public LiveData<Note> moveNoteToAnotherAccount(Account account, long noteId) {
		return switchMap(repo.getNoteById$(noteId), (note) -> {
		Log.v(TAG, "[moveNoteToAnotherAccount] - note: " + note);
		Log.v(TAG, "[moveNoteToAnotherAccount] - note: " + (BuildConfig.DEBUG ? note : note.getTitle()));
		return repo.moveNoteToAnotherAccount(account, note);
		});
		}

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import java.util.concurrent.ExecutorService;
		import java.util.concurrent.Executors;

		import it.niedermann.android.sharedpreferences.SharedPreferenceIntLiveData;
		import it.niedermann.owncloud.notes.BuildConfig;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.edit.EditNoteActivity;
		import it.niedermann.owncloud.notes.persistence.entity.Account;
		@@ -562,7 +563,7 @@ public class NotesRepository {
		.build());
		} else {
		// Prevent crash https://github.com/stefan-niedermann/nextcloud-notes/issues/613
		Log.e(TAG, "shortLabel cannot be empty " + note);
		Log.e(TAG, "shortLabel cannot be empty " + (BuildConfig.DEBUG ? note : note.getTitle()));
		}
		}
		Log.d(TAG, "Update dynamic shortcuts");

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import java.util.List;
		import java.util.Map;
		import java.util.Set;

		import it.niedermann.owncloud.notes.BuildConfig;
		import it.niedermann.owncloud.notes.persistence.entity.Account;
		import it.niedermann.owncloud.notes.persistence.entity.Note;
		import it.niedermann.owncloud.notes.persistence.sync.NotesAPI;
		@@ -113,7 +114,7 @@ abstract class NotesServerSyncTask extends Thread {
		boolean success = true;
		final List<Note> notes = repo.getLocalModifiedNotes(localAccount.getId());
		for (Note note : notes) {
		Log.d(TAG, " Process Local Note: " + note);
		Log.d(TAG, " Process Local Note: " + (BuildConfig.DEBUG ? note : note.getTitle()));
		try {
		Note remoteNote;
		switch (note.getStatus()) {
		@@ -220,7 +221,7 @@ abstract class NotesServerSyncTask extends Thread {
		final Set<Long> remoteIDs = new HashSet<>();
		// pull remote changes: update or create each remote note
		for (Note remoteNote : remoteNotes) {
		Log.v(TAG, " Process Remote Note: " + remoteNote);
		Log.v(TAG, " Process Remote Note: " + (BuildConfig.DEBUG ? remoteNote : remoteNote.getTitle()));
		remoteIDs.add(remoteNote.getRemoteId());
		if (remoteNote.getModified() == null) {
		Log.v(TAG, " ... unchanged");
		@@ -231,7 +232,7 @@ abstract class NotesServerSyncTask extends Thread {
		repo.updateIfNotModifiedLocallyAndAnyRemoteColumnHasChanged(
		localId, remoteNote.getModified().getTimeInMillis(), remoteNote.getTitle(), remoteNote.getFavorite(), remoteNote.getCategory(), remoteNote.getETag(), remoteNote.getContent(), generateNoteExcerpt(remoteNote.getContent(), remoteNote.getTitle()));
		} else {
		Log.e(TAG, "Tried to update note from server, but local id of note is null. " + remoteNote);
		Log.e(TAG, "Tried to update note from server, but local id of note is null. " + (BuildConfig.DEBUG ? remoteNote : remoteNote.getTitle()));
		}
		} else {
		Log.v(TAG, " ... create");

markdown/src/main/java/it/niedermann/android/markdown/markwon/plugins/ToggleableTaskListPlugin.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -71,10 +71,7 @@ public class ToggleableTaskListPlugin extends AbstractMarkwonPlugin {
		taskListSpan = null;
		}

		Log.i(TAG, visitor.builder().subSequence(length, visitor.builder().length()).toString());
		int content = TaskListContextVisitor.contentLength(node);
		Log.i(TAG, "content: " + content + ", '" + visitor.builder().subSequence(length, length + content) + "'");

		final int content = TaskListContextVisitor.contentLength(node);
		if (content > 0 && taskListSpan != null) {
		// maybe additionally identify this task list (for persistence)
		visitor.builder().setSpan(

markdown/src/main/java/it/niedermann/android/markdown/markwon/span/ToggleTaskListSpan.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ public class ToggleTaskListSpan extends ClickableSpan {
		if(enabled.get()) {
		span.setDone(!span.isDone());
		widget.invalidate();
		Log.v(TAG, "task-list click, isDone: " + span.isDone() + ", content: '" + content + "'");

		// it must be a TextView
		final TextView textView = (TextView) widget;