diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-06-01 11:20:13 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-06-01 11:20:13 +0300 |
commit | 07663224f185fc9b3c6c0abbbbee9d750c32ac47 (patch) | |
tree | 4e5528421248a963bdfd394eeca18a6c79421a3a /app/src/main/java/it/niedermann/owncloud | |
parent | 2534aefb776f2f6e69f59722f7ceb61f7926ca5e (diff) |
#1243 Remove content of notes and search terms from LogCat
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud')
3 files changed, 9 insertions, 6 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java index 55b45e73..9497d69f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java @@ -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); }); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java index e20b684f..f2b242d6 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java @@ -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"); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java index 7ddc4220..a7df68bd 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java @@ -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"); |