Merge "Validate network using NetworkMonitor facilities"
diff --git a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 7c2908b..0e3df0a 100644
--- a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -573,13 +573,21 @@
mSslError = error;
}
+ private String makeHtmlTag() {
+ if (getWebview().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ return "<html dir=\"rtl\">";
+ }
+
+ return "<html>";
+ }
+
private String makeSslErrorPage() {
final String warningMsg = getString(R.string.ssl_error_warning);
final String exampleMsg = getString(R.string.ssl_error_example);
final String continueMsg = getString(R.string.ssl_error_continue);
final String certificateMsg = getString(R.string.ssl_error_view_certificate);
return String.join("\n",
- "<html>",
+ makeHtmlTag(),
"<head>",
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">",
" <style>",
diff --git a/tests/src/com/android/captiveportallogin/CaptivePortalLoginActivityTest.java b/tests/src/com/android/captiveportallogin/CaptivePortalLoginActivityTest.java
index 8e662bf..44e532c 100644
--- a/tests/src/com/android/captiveportallogin/CaptivePortalLoginActivityTest.java
+++ b/tests/src/com/android/captiveportallogin/CaptivePortalLoginActivityTest.java
@@ -58,7 +58,6 @@
public class CaptivePortalLoginActivityTest {
private static final String TEST_URL = "http://android.test.com";
private static final int TEST_NETID = 1234;
- private long mPackageVersion;
private CaptivePortalLoginActivity mActivity;
private MockitoSession mSession;
private Network mNetwork = new Network(TEST_NETID);
@@ -133,8 +132,6 @@
.strictness(Strictness.WARN)
.startMocking();
final Context context = InstrumentationRegistry.getContext();
- mPackageVersion = context.getPackageManager().getPackageInfo(
- context.getPackageName(), 0 /* flags */).getLongVersionCode();
setDismissPortalInValidatedNetwork(true);
// onCreate will be triggered in launchActivity(). Handle mock objects after
// launchActivity() if any new mock objects. Activity launching flow will be
