From 09d2685934adc3a97a2ec91543c21a80a26c8628 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Wed, 25 Oct 2023 18:49:40 +0100 Subject: [PATCH] Update from `ru.noties:markwon:2.0.1` to `io.noties.markwon:core:4.6.2` --- .../ooniprobe/activity/MeasurementDetailActivity.java | 6 ++++-- .../ooniprobe/activity/OverviewActivity.java | 7 ++++--- .../openobservatory/ooniprobe/activity/ProxyActivity.java | 6 ++++-- .../ooniprobe/fragment/measurement/PsiphonFragment.java | 7 +++++-- .../ooniprobe/fragment/measurement/RiseupVPNFragment.java | 7 +++++-- .../ooniprobe/fragment/measurement/TorFragment.java | 7 +++++-- .../fragment/measurement/WebConnectivityFragment.java | 8 +++++--- .../fragment/onboarding/Onboarding3Fragment.java | 6 ++++-- gradle/libs.versions.toml | 4 ++-- 9 files changed, 38 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/MeasurementDetailActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/MeasurementDetailActivity.java index 91bdc4dfd..9eada3e2d 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/activity/MeasurementDetailActivity.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/MeasurementDetailActivity.java @@ -27,7 +27,7 @@ import org.openobservatory.ooniprobe.model.database.Network; import org.openobservatory.ooniprobe.test.suite.PerformanceSuite; import org.openobservatory.ooniprobe.test.test.*; -import ru.noties.markwon.Markwon; +import io.noties.markwon.Markwon; import javax.inject.Inject; import java.io.Serializable; @@ -212,7 +212,9 @@ public void onError(String msg) { binding.log.setVisibility(View.GONE); if (!measurementsManager.hasReportId(measurement)) binding.explorer.setVisibility(View.GONE); - Markwon.setMarkdown(binding.methodology, getString(R.string.TestResults_Details_Methodology_Paragraph, getString(measurement.getTest().getUrlResId()))); + Markwon.builder(this) + .build() + .setMarkdown(binding.methodology, getString(R.string.TestResults_Details_Methodology_Paragraph, getString(measurement.getTest().getUrlResId()))); load(); binding.log.setOnClickListener(v -> logClick()); binding.data.setOnClickListener(v -> dataClick()); diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java index 60d418a96..9d1b79018 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java @@ -23,7 +23,7 @@ import javax.inject.Inject; -import ru.noties.markwon.Markwon; +import io.noties.markwon.Markwon; public class OverviewActivity extends AbstractActivity { private static final String TEST = "test"; @@ -54,6 +54,7 @@ public static Intent newIntent(Context context, AbstractSuite testSuite) { binding.run.setAlpha(0.5F); binding.run.setEnabled(false); } + Markwon markwon = Markwon.builder(this).build(); if (testSuite.getName().equals(ExperimentalSuite.NAME)) { String experimentalLinks = "\n\n* [STUN Reachability](https://github.com/ooni/spec/blob/master/nettests/ts-025-stun-reachability.md)" + @@ -61,12 +62,12 @@ public static Intent newIntent(Context context, AbstractSuite testSuite) { "\n\n* [ECH Check](https://github.com/ooni/spec/blob/master/nettests/ts-039-echcheck.md)" + "\n\n* [Tor Snowflake](https://ooni.org/nettest/tor-snowflake/) "+ String.format(" ( %s )",getString(R.string.Settings_TestOptions_LongRunningTest))+ "\n\n* [Vanilla Tor](https://github.com/ooni/spec/blob/master/nettests/ts-016-vanilla-tor.md) " + String.format(" ( %s )",getString(R.string.Settings_TestOptions_LongRunningTest)); - Markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1(), experimentalLinks)); + markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1(), experimentalLinks)); if (TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL) binding.desc.setTextDirection(View.TEXT_DIRECTION_RTL); } else - Markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1())); + markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1())); Result lastResult = Result.getLastResult(testSuite.getName()); if (lastResult == null) binding.lastTime.setText(R.string.Dashboard_Overview_LastRun_Never); diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/ProxyActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/ProxyActivity.java index 902fec4c8..fdc5bb245 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/activity/ProxyActivity.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/activity/ProxyActivity.java @@ -14,7 +14,7 @@ import org.openobservatory.ooniprobe.common.ProxyProtocol; import org.openobservatory.ooniprobe.common.ProxySettings; import org.openobservatory.ooniprobe.databinding.ActivityProxyBinding; -import ru.noties.markwon.Markwon; +import io.noties.markwon.Markwon; import javax.inject.Inject; import java.net.URISyntaxException; @@ -119,7 +119,9 @@ public void onCreate(Bundle savedInstanceState) { setContentView(binding.getRoot()); // We fill the footer that helps users to understand this settings screen. - Markwon.setMarkdown(binding.proxyFooter, getString(R.string.Settings_Proxy_Footer)); + Markwon.builder(this) + .build() + .setMarkdown(binding.proxyFooter, getString(R.string.Settings_Proxy_Footer)); // We read settings and configure the initial view. loadSettingsAndConfigureInitialView(); diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/PsiphonFragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/PsiphonFragment.java index ae697cff3..f1e51559a 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/PsiphonFragment.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/PsiphonFragment.java @@ -10,7 +10,8 @@ import org.openobservatory.ooniprobe.R; import org.openobservatory.ooniprobe.databinding.FragmentMeasurementPsiphonBinding; import org.openobservatory.ooniprobe.model.database.Measurement; -import ru.noties.markwon.Markwon; + +import io.noties.markwon.Markwon; public class PsiphonFragment extends Fragment { private static final String MEASUREMENT = "measurement"; @@ -28,7 +29,9 @@ public static PsiphonFragment newInstance(Measurement measurement) { Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT); assert measurement != null; FragmentMeasurementPsiphonBinding binding = FragmentMeasurementPsiphonBinding.inflate(inflater,container,false); - Markwon.setMarkdown(binding.desc, + Markwon.builder(getContext()) + .build() + .setMarkdown(binding.desc, measurement.is_anomaly ? getString(R.string.TestResults_Details_Circumvention_Psiphon_Blocked_Content_Paragraph) : getString(R.string.TestResults_Details_Circumvention_Psiphon_Reachable_Content_Paragraph) diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/RiseupVPNFragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/RiseupVPNFragment.java index 83670bd5e..32401d0da 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/RiseupVPNFragment.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/RiseupVPNFragment.java @@ -10,7 +10,8 @@ import org.openobservatory.ooniprobe.R; import org.openobservatory.ooniprobe.databinding.FragmentMeasurementRiseupvpnBinding; import org.openobservatory.ooniprobe.model.database.Measurement; -import ru.noties.markwon.Markwon; + +import io.noties.markwon.Markwon; public class RiseupVPNFragment extends Fragment { private static final String MEASUREMENT = "measurement"; @@ -28,7 +29,9 @@ public static RiseupVPNFragment newInstance(Measurement measurement) { Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT); assert measurement != null; FragmentMeasurementRiseupvpnBinding binding = FragmentMeasurementRiseupvpnBinding.inflate(inflater,container,false); - Markwon.setMarkdown(binding.desc, + Markwon.builder(getContext()) + .build() + .setMarkdown(binding.desc, measurement.is_anomaly ? getString(R.string.TestResults_Details_Circumvention_RiseupVPN_Blocked_Content_Paragraph) : getString(R.string.TestResults_Details_Circumvention_RiseupVPN_Reachable_Content_Paragraph) diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/TorFragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/TorFragment.java index 3b47b9dcd..d859d2eca 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/TorFragment.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/TorFragment.java @@ -10,7 +10,8 @@ import org.openobservatory.ooniprobe.R; import org.openobservatory.ooniprobe.databinding.FragmentMeasurementTorBinding; import org.openobservatory.ooniprobe.model.database.Measurement; -import ru.noties.markwon.Markwon; + +import io.noties.markwon.Markwon; public class TorFragment extends Fragment { private static final String MEASUREMENT = "measurement"; @@ -30,7 +31,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT); assert measurement != null; FragmentMeasurementTorBinding binding = FragmentMeasurementTorBinding.inflate(inflater,container,false); - Markwon.setMarkdown(binding.desc, + Markwon.builder(getContext()) + .build() + .setMarkdown(binding.desc, measurement.is_anomaly ? getString(R.string.TestResults_Details_Circumvention_Tor_Blocked_Content_Paragraph) : getString(R.string.TestResults_Details_Circumvention_Tor_Reachable_Content_Paragraph) diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/WebConnectivityFragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/WebConnectivityFragment.java index e39131b45..6951ada06 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/WebConnectivityFragment.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/WebConnectivityFragment.java @@ -10,7 +10,8 @@ import org.openobservatory.ooniprobe.R; import org.openobservatory.ooniprobe.databinding.FragmentMeasurementWebconnectivityBinding; import org.openobservatory.ooniprobe.model.database.Measurement; -import ru.noties.markwon.Markwon; + +import io.noties.markwon.Markwon; public class WebConnectivityFragment extends Fragment { private static final String MEASUREMENT = "measurement"; @@ -30,10 +31,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT); assert measurement != null; FragmentMeasurementWebconnectivityBinding binding = FragmentMeasurementWebconnectivityBinding.inflate(inflater,container,false); + Markwon markwon = Markwon.builder(getContext()).build(); if (measurement.is_anomaly) - Markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_LikelyBlocked_Content_Paragraph, measurement.url.url, getString(measurement.getTestKeys().getWebsiteBlocking()))); + markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_LikelyBlocked_Content_Paragraph, measurement.url.url, getString(measurement.getTestKeys().getWebsiteBlocking()))); else - Markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_Reachable_Content_Paragraph, measurement.url.url)); + markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_Reachable_Content_Paragraph, measurement.url.url)); return binding.getRoot(); } } diff --git a/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding3Fragment.java b/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding3Fragment.java index 005204e37..3fe085d54 100644 --- a/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding3Fragment.java +++ b/app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding3Fragment.java @@ -14,7 +14,7 @@ import org.openobservatory.ooniprobe.common.ThirdPartyServices; import org.openobservatory.ooniprobe.common.service.ServiceUtil; import org.openobservatory.ooniprobe.databinding.FragmentOnboarding3Binding; -import ru.noties.markwon.Markwon; +import io.noties.markwon.Markwon; import javax.inject.Inject; @@ -31,7 +31,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c binding.bullet1.setText(getString(R.string.bullet, getString(R.string.Onboarding_DefaultSettings_Bullet_1))); binding.bullet2.setText(getString(R.string.bullet, getString(R.string.Onboarding_DefaultSettings_Bullet_2))); binding.bullet3.setText(getString(R.string.bullet, getString(R.string.Onboarding_DefaultSettings_Bullet_3))); - Markwon.setMarkdown(binding.paragraph, getString(R.string.Onboarding_DefaultSettings_Paragraph)); + Markwon.builder(getContext()) + .build() + .setMarkdown(binding.paragraph, getString(R.string.Onboarding_DefaultSettings_Paragraph)); binding.master.setOnClickListener(v -> masterClick()); binding.slave.setOnClickListener(v -> slaveClick()); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e1737e670..5d6e009d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ googlePlaycore = "1.10.3" # OONI compileSdk = "34" lottie = "3.0.7" -markwon = "2.0.1" +markwon = "4.6.2" shapeofview = "1.3.2" targetSdk = "33" minSdk = "21" @@ -69,7 +69,7 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" } lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" } -markwon = { module = "ru.noties:markwon", version.ref = "markwon" } +markwon = { module = "io.noties.markwon:core", version.ref = "markwon" } retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofitCore" } retrofit-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "retrofitLoggingInterceptor" } retrofit-lib = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofitCore" }