diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38220a3dab60ef2e6effd0ec16341377359e172c..bfbbba567776381e98971839ef03bfd4f99cf4eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,14 +5,6 @@ stages: - build before_script: - - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew diff --git a/app/build.gradle b/app/build.gradle index 2d110a622434b979351028099f9dc00980018ee2..ed7d513e8d3ab40d2f5f9845c2bd319eadc6a574 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' // Nextcloud SSO - implementation 'foundation.e.lib:Android-SingleSignOn:1.0.2-alpha' + implementation 'foundation.e.lib:Android-SingleSignOn:1.0.3-alpha' implementation ('com.github.stefan-niedermann:android-commons:0.2.7') { exclude group: 'com.github.nextcloud', module: 'Android-SingleSignOn' } @@ -109,4 +109,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'foundation.e:elib:0.0.1-alpha11' + implementation 'co.trikita:log:1.1.5' } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java index 4f0fb28030e5a179d8a502b53a6f3e6f7cd4b47d..148fc126caa4c442099a7f4c0f7f198ef4773cc4 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java @@ -2,7 +2,7 @@ package it.niedermann.owncloud.notes; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; +import trikita.log.Log; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java index f5695a408c2d680b15807830fc938222329c45f7..879b5e2c1c77c7fa49487088f17482e71a86c94d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java @@ -4,7 +4,7 @@ import android.app.KeyguardManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.view.WindowManager; import androidx.annotation.Nullable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java index 0ef67609122a803c7f6a3b7139f5646aa0c7dc84..13c93783a75636a2708aabd2d432a468d6a40004 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java @@ -4,7 +4,7 @@ import android.app.Application; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; -import android.util.Log; +import trikita.log.Log; import androidx.appcompat.app.AppCompatDelegate; import androidx.preference.PreferenceManager; @@ -28,6 +28,8 @@ public class NotesApplication extends Application { final var prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); lockedPreference = prefs.getBoolean(getString(R.string.pref_key_lock), false); isGridViewEnabled = getDefaultSharedPreferences(this).getBoolean(getString(R.string.pref_key_gridview), false); + + setLogLevel(); super.onCreate(); } @@ -80,4 +82,10 @@ public class NotesApplication extends Application { public static void updateLastInteraction() { lastInteraction = System.currentTimeMillis(); } + + private void setLogLevel() { + if (!BuildConfig.DEBUG) { + Log.level(Log.E); + } + } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java index ba79fa0e6c5a6a8bfd42ac36495a09d142e57398..6b214cb09611d37fa7e4bf72baa131c065abcf54 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.drawable.LayerDrawable; -import android.util.Log; +import trikita.log.Log; import android.util.TypedValue; import android.view.MenuItem; import android.widget.EditText; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java index e7284a80ed11834c5a50297170fd020cbcef49a6..8334634b7ddecf4ba6043c25c63b7a20f1a12e41 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java @@ -12,7 +12,7 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java index 8cb12bad157b7558fd8ba127b8279cfe55dd3a65..3b0a88166e4d5f4bfbef8a15584af255253018ec 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java @@ -5,7 +5,7 @@ import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType. import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; +import trikita.log.Log; import android.view.Menu; import android.view.MenuItem; import android.view.WindowManager; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java index 081c60d8624f237799e54015ecd8283bf1fac4d4..c480a39de30652d33a56ce0b6823874650503c24 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java @@ -13,7 +13,7 @@ import android.text.Editable; import android.text.Layout; import android.text.TextUtils; import android.text.TextWatcher; -import android.util.Log; +import trikita.log.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java index 52db93a46764034146d0729402e3a53a4d02bf99..5439a1178c545ccc37d124df9d40e574dfc29a6f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java @@ -9,7 +9,7 @@ import android.graphics.Typeface; import android.os.Bundle; import android.text.Layout; import android.text.method.LinkMovementMethod; -import android.util.Log; +import trikita.log.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java index 794bfee71c82a68458400c14ab6b1f9684cac3e1..0fc3dcc96c94fc12414a7551e7834aaf7d06fa78 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java @@ -5,7 +5,7 @@ import android.os.Bundle; import android.os.Handler; import android.text.Layout; import android.text.TextUtils; -import android.util.Log; +import trikita.log.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryDialogFragment.java index c440f830246983f4be7182becbd447a86a3cc648..3210a19cf71ec8a0deee5fde8b8f8526645f3cf1 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryDialogFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryDialogFragment.java @@ -5,7 +5,7 @@ import android.content.Context; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; +import trikita.log.Log; import android.view.View; import android.view.WindowManager; import android.widget.EditText; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/title/EditTitleDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/title/EditTitleDialogFragment.java index e48ff63dc7d36bc0356659df749ef40b2cf42f0b..00714c7697a53594337aaa3b3f08a4b03fc51787 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/title/EditTitleDialogFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/title/EditTitleDialogFragment.java @@ -5,7 +5,7 @@ import static it.niedermann.owncloud.notes.branding.BrandingUtil.applyBrandToEdi import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionHandler.java b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionHandler.java index 7e90bd72469da88e05c0452b3b4ed140e9e0d522..950040feea9ba6274969b56a56dc4c2c7cfc3c54 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionHandler.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionHandler.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.exception; import android.app.Activity; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java index 05d06a784baae3066b51350e68db35d8156074bc..649d4b0c429de102c9f8a0f91db2ed22deb2f692 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java @@ -3,7 +3,7 @@ package it.niedermann.owncloud.notes.importaccount; import android.accounts.NetworkErrorException; import android.content.Intent; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.view.View; import androidx.annotation.NonNull; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index a42c836af4082199a729fc298866abc540e0ef68..00d54c48ff6341b339c25fe1c2f17eb15edce1e7 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -23,7 +23,7 @@ import android.graphics.PorterDuff; import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; -import android.util.Log; +import trikita.log.Log; import android.view.View; import androidx.annotation.NonNull; 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 15e3cb54d2dce734cdbf87bc6b34b2c1fe5ba49e..4b721e8984ec2e4e7739897c06c2f9ef8e0f64a4 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 @@ -20,7 +20,7 @@ import android.accounts.NetworkErrorException; import android.app.Application; import android.content.Context; import android.text.TextUtils; -import android.util.Log; +import trikita.log.Log; import android.util.Pair; import androidx.annotation.MainThread; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java index bb93b7b70473f47fce568b2219424df57cf93ea6..756fa8097b2792d8188a9efd29af6aec85d3e2cb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NotesListViewItemTouchHelper.java @@ -3,7 +3,7 @@ package it.niedermann.owncloud.notes.main.items.list; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Canvas; -import android.util.Log; +import trikita.log.Log; import android.view.View; import androidx.annotation.NonNull; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java index ce609607571894c73b2be990df3f4b47185e4c85..2caa3f8ff4a3d885adc6021570761d44ff5181f2 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java index bc53af45d704aeb9b1b523bb049ee878211c3833..8b8f79c413ea2f2a5673a36e6c3405e1b9ca50a5 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java index b593f86dacb0fe709f349cc7312fa4ec7acf1755..3d8700abd66d98c58cdd5fd9eddcc40d4af5c13b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesWorker.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.work.Constraints; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java index 5cc50641e7d9e3c4680d50ec9923d51232c8541b..ac9898c1e10254e3dab0c11151bd6e95600ec810 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.room.Database; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesImportTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesImportTask.java index 38172b94d14097c58c94b196cd16c41f81d45720..a33d99c4b7ababd76d4b70f20682ba86785d725c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesImportTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesImportTask.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; 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 fa3e2575b88c44e69682881aca91dbd8c1d668e4..9770197b931bb6b0191e3a06035cb57553d7b9a2 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 @@ -21,7 +21,7 @@ import android.content.pm.ShortcutManager; import android.graphics.drawable.Icon; import android.net.ConnectivityManager; import android.text.TextUtils; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.AnyThread; import androidx.annotation.ColorInt; 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 f50dd21ef09f6e9e10b0e9adedb9de361f00b158..b46c39f40309ee1cba592c473ca37d2183e230c6 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 @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java index 3816f6b8fec43203612c8941149c70f78fc86228..e10b80bfda14b0598b67802277cb22aa5c7bf144 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.work.Constraints; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java index 805204f69695d888ad3558305e692a4e1fe119e7..aa144eabdfe792a09272237b3faeac650fdfdf6f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java @@ -5,7 +5,7 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java index bda4d04624009fdb55841e130bff1eff013f4ff0..70c57294b454ba473eed04645e7aa2795e642546 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java @@ -3,7 +3,7 @@ package it.niedermann.owncloud.notes.persistence.migration; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.room.OnConflictStrategy; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java index 7be78511264a78e82de5c589e31220545d5f3808..df84f1de119f8d020e7a6d5e6fe7c5910fb51b18 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.database.Cursor; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_18_19.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_18_19.java index 576e2204a9f7103ce2e5a798239d526c8d6bbf74..f21b8dd6acffc0aaf7d09b7438e53dbe4d5bce93 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_18_19.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_18_19.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence.migration; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.room.migration.Migration; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI.java index 4f8bee926e1775d9cd9e83921be49baa9f971c71..4eaa81a1974802729063b91c8cb2ec8a528cfe4f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.persistence.sync; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java index 462d5884a4b92119ced2dd1eb75cf7997c30e318..ae8e8caa45ff12014e14f38493648b0899acaea4 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesFragment.java @@ -2,7 +2,7 @@ package it.niedermann.owncloud.notes.preferences; import android.app.Activity; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.ColorInt; import androidx.lifecycle.ViewModelProvider; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java b/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java index 362a407ed9fd7e09d8fa0a06a6b6ae25d075059f..480a7d1a7bd7ac42f3668b1b2f13da89ce4bed62 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/receiver/AccountRemoveReceiver.java @@ -20,7 +20,7 @@ import android.accounts.AccountManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/AccountSyncUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/AccountSyncUtil.java index 27c379e87c56b879c844a3119719f0a68c28f309..45cd0964611c6fe7d06b79b2f989d3aa27ce9fb3 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/AccountSyncUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/AccountSyncUtil.java @@ -19,7 +19,7 @@ package it.niedermann.owncloud.notes.shared.util; import android.accounts.AccountManager; import android.content.ContentResolver; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import it.niedermann.owncloud.notes.persistence.entity.Account; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/CustomAppGlideModule.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/CustomAppGlideModule.java index 35625119dd5e4309bb7d93f8692797340eeaae56..4ffd23426ca20016d72c4d0db0f7e77d80fd2f62 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/CustomAppGlideModule.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/CustomAppGlideModule.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.shared.util; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.UiThread; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java index d0a60fcf4d10185491539deb2a9759a06eb2f52a..72198003839b2fbb7cf5b397908406828789e68a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java @@ -2,7 +2,7 @@ package it.niedermann.owncloud.notes.shared.util; import android.app.KeyguardManager; import android.content.Context; -import android.util.Log; +import trikita.log.Log; /** * Utility class with methods for handling device credentials. diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SSOUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SSOUtil.java index 1e2542b07604910d449d35ca65de35dff297d987..115009aafcf2f26e2f872696ec47a5e7c3111563 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SSOUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SSOUtil.java @@ -2,7 +2,7 @@ package it.niedermann.owncloud.notes.shared.util; import android.app.Activity; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java index cd43ee8a0f93f7808c826c867b55a02dcd07f13a..8a8207b9b60ab1fab6cf6a2c20e3c328fa19d128 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java @@ -1,7 +1,7 @@ package it.niedermann.owncloud.notes.widget.notelist; import android.app.Application; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java index 7342b08c84d52ed207eadff2ec04895dc2be835b..b74fd9676992d4d5f2540dd001e7297dfd3cdcb4 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java @@ -9,7 +9,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.Log; +import trikita.log.Log; import android.widget.RemoteViews; import java.util.NoSuchElementException; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java index a488288dc54477133a8710798bfeb01b406c297e..2cf36e42191dd8f84c3151dcf80c03e88104e2d4 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetConfigurationActivity.java @@ -9,7 +9,7 @@ import android.app.Activity; import android.appwidget.AppWidgetManager; import android.content.Intent; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.widget.Toast; import androidx.annotation.Nullable; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java index 1a701ef16039dfdc1ff3ffda705b37b97978c6e9..a17124a8a2428cae858f2af7443d907e45e048ea 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.widget.RemoteViews; import android.widget.RemoteViewsService; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java index 77339e3ef8df83671e82990a43b404fe916dda75..52131ced8a9a795d5a1bdd4ca7b71abdefcd5be8 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java @@ -9,7 +9,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.Log; +import trikita.log.Log; import android.widget.RemoteViews; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java index 5369d3c7009c190beb2846e1fc104151258d191e..7a4d11a7de234f1e1693e428a7f19bb58f65d572 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java @@ -4,7 +4,7 @@ import android.appwidget.AppWidgetManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.widget.RemoteViews; import android.widget.RemoteViewsService; diff --git a/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java b/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java index cd06b063f965b4cabcc5fc9f985996517489f5bf..0b3a86a6784f9850835e9f333484e22d6fed8120 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java @@ -7,7 +7,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.arch.core.executor.testing.InstantTaskExecutorRule; import androidx.lifecycle.SavedStateHandle;