From cab25814766cef43e54a3c81809521f96c7e4439 Mon Sep 17 00:00:00 2001 From: Koen Date: Mon, 30 Oct 2023 09:22:25 +0100 Subject: [PATCH] Added more logging related to backfill and made backfill properly throw. --- .../activities/PolycentricCreateProfileActivity.kt | 4 +++- .../platformplayer/activities/PolycentricProfileActivity.kt | 3 +++ .../java/com/futo/platformplayer/dialogs/CommentDialog.kt | 3 +++ .../fragment/mainactivity/main/PostDetailFragment.kt | 2 ++ .../fragment/mainactivity/main/VideoDetailView.kt | 2 ++ .../futo/platformplayer/views/adapters/CommentViewHolder.kt | 2 ++ dep/polycentricandroid | 2 +- 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt index f2adef70..540922ea 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt @@ -75,9 +75,11 @@ class PolycentricCreateProfileActivity : AppCompatActivity() { } try { + Logger.i(TAG, "Started backfill"); processHandle.fullyBackfillServers(); + Logger.i(TAG, "Finished backfill"); } catch (e: Throwable) { - Logger.e(TAG, getString(R.string.failed_to_fully_backfill_servers)); + Logger.e(TAG, getString(R.string.failed_to_fully_backfill_servers), e); } withContext(Dispatchers.Main) { diff --git a/app/src/main/java/com/futo/platformplayer/activities/PolycentricProfileActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/PolycentricProfileActivity.kt index 266e51bf..db3cd0b9 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/PolycentricProfileActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/PolycentricProfileActivity.kt @@ -16,6 +16,7 @@ import androidx.lifecycle.lifecycleScope import com.bumptech.glide.Glide import com.futo.platformplayer.R import com.futo.platformplayer.UIDialogs +import com.futo.platformplayer.dialogs.CommentDialog import com.futo.platformplayer.dp import com.futo.platformplayer.images.GlideHelper.Companion.crossfade import com.futo.platformplayer.logging.Logger @@ -186,7 +187,9 @@ class PolycentricProfileActivity : AppCompatActivity() { if (hasChanges) { try { + Logger.i(TAG, "Started backfill"); processHandle.fullyBackfillServers(); + Logger.i(TAG, "Finished backfill"); withContext(Dispatchers.Main) { UIDialogs.toast(this@PolycentricProfileActivity, getString(R.string.changes_have_been_saved)); } diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt index 8f724191..5e5d3207 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/CommentDialog.kt @@ -6,6 +6,7 @@ import android.graphics.Color import android.os.Bundle import android.text.Editable import android.text.TextWatcher +import android.util.Log import android.view.LayoutInflater import android.view.WindowManager import android.view.inputmethod.InputMethodManager @@ -90,7 +91,9 @@ class CommentDialog(context: Context?, val contextUrl: String, val ref: Protocol StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { try { + Logger.i(TAG, "Started backfill"); processHandle.fullyBackfillServers() + Logger.i(TAG, "Finished backfill"); } catch (e: Throwable) { Logger.e(TAG, "Failed to backfill servers.", e); } diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt index 7f7e6109..84d97a15 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt @@ -357,7 +357,9 @@ class PostDetailFragment : MainFragment { StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { try { + Logger.i(TAG, "Started backfill"); args.processHandle.fullyBackfillServers(); + Logger.i(TAG, "Finished backfill"); } catch (e: Throwable) { Logger.e(TAG, "Failed to backfill servers", e) } diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index 1bb98f2e..164580b4 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -1065,7 +1065,9 @@ class VideoDetailView : ConstraintLayout { fragment.lifecycleScope.launch(Dispatchers.IO) { try { + Logger.i(TAG, "Started backfill"); args.processHandle.fullyBackfillServers(); + Logger.i(TAG, "Finished backfill"); } catch (e: Throwable) { Logger.e(TAG, "Failed to backfill servers", e) } diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt index e3e7eff2..65aa180e 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt @@ -74,7 +74,9 @@ class CommentViewHolder : ViewHolder { StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) { try { + Logger.i(TAG, "Started backfill"); args.processHandle.fullyBackfillServers(); + Logger.i(TAG, "Finished backfill"); } catch (e: Throwable) { Logger.e(TAG, "Failed to backfill servers.", e) } diff --git a/dep/polycentricandroid b/dep/polycentricandroid index 1079dd39..b7db7bfa 160000 --- a/dep/polycentricandroid +++ b/dep/polycentricandroid @@ -1 +1 @@ -Subproject commit 1079dd394f71921a968509bc16292ac1e80e3f9c +Subproject commit b7db7bfac22e67d9af1adbde66c76149258368ec