diff --git a/app/build.gradle b/app/build.gradle index 6a70dc5..a0bf388 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,12 +153,13 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.webkit:webkit:1.5.0' implementation 'com.google.android.material:material:1.6.1' - implementation "com.mikepenz:aboutlibraries:10.5.0" implementation "dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0" implementation "dev.rikka.rikkax.insets:insets:1.3.0" implementation 'com.github.Dimezis:BlurView:version-2.0.2' implementation 'com.github.KieronQuinn:MonetCompat:0.4.1' implementation 'com.github.Fox2Code:FoxCompat:0.1.5' + // Update the version code in the root build.gradle + implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}" // Utils implementation 'androidx.work:work-runtime:2.7.1' diff --git a/app/src/default/java/com/fox2code/mmm/sentry/SentryMain.java b/app/src/default/java/com/fox2code/mmm/sentry/SentryMain.java index a48becf..8cbb72e 100644 --- a/app/src/default/java/com/fox2code/mmm/sentry/SentryMain.java +++ b/app/src/default/java/com/fox2code/mmm/sentry/SentryMain.java @@ -1,19 +1,28 @@ package com.fox2code.mmm.sentry; +import android.net.Uri; import android.util.Log; import com.fox2code.mmm.BuildConfig; import com.fox2code.mmm.MainApplication; +import com.fox2code.mmm.androidacy.AndroidacyUtil; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.Writer; +import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.JsonObjectWriter; import io.sentry.NoOpLogger; import io.sentry.Sentry; +import io.sentry.SentryOptions; import io.sentry.TypeCheckHint; import io.sentry.android.core.SentryAndroid; import io.sentry.android.fragment.FragmentLifecycleIntegration; +import io.sentry.android.okhttp.SentryOkHttpInterceptor; import io.sentry.hints.DiskFlushNotification; public class SentryMain { @@ -85,7 +94,17 @@ public class SentryMain { } }); } - + // Filter breadrcrumb content from crash report. + options.setBeforeBreadcrumb((breadcrumb, hint) -> { + String url = (String) breadcrumb.getData("url"); + if (url == null || url.isEmpty()) return breadcrumb; + if ("cloudflare-dns.com".equals(Uri.parse(url).getHost())) + return null; + if (AndroidacyUtil.isAndroidacyLink(url)) { + breadcrumb.setData("url", AndroidacyUtil.hideToken(url)); + } + return breadcrumb; + }); }); } diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java index 83b1e29..f1dafb5 100644 --- a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java +++ b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java @@ -279,7 +279,7 @@ public final class AndroidacyRepoData extends RepoData { if (this.testMode) { if (url.startsWith("https://production-api.androidacy.com/")) { Log.e(TAG, "Got non test mode url: " + AndroidacyUtil.hideToken(url)); - url = "https://staging-api.androidacy.com/" + url.substring(27); + url = "https://staging-api.androidacy.com/" + url.substring(38); } } else { if (url.startsWith("https://staging-api.androidacy.com/")) {