/*
- * Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2015-2020 Soren Stoutner <soren@stoutner.com>.
*
* Download cookie code contributed 2017 Hendrik Knackstedt. Copyright assigned to Soren Stoutner <soren@stoutner.com>.
*
// Get a handle for the file name edit text.
EditText fileNameEditText = saveWebpageDialog.findViewById(R.id.file_name_edittext);
+ TextView fileExistsWarningTextView = saveWebpageDialog.findViewById(R.id.file_exists_warning_textview);
// Instantiate the file name helper.
FileNameHelper fileNameHelper = new FileNameHelper();
// Move the cursor to the end of the file name edit text.
fileNameEditText.setSelection(fileNamePath.length());
+
+ // Hide the file exists warning.
+ fileExistsWarningTextView.setVisibility(View.GONE);
}
}
}
// Get a handle for the open dialog.
Dialog openDialog = openDialogFragment.getDialog();
- // Remove the incorrect lint warning below tha tth edialog might be null.
+ // Remove the incorrect lint warning below that the dialog might be null.
assert openDialog != null;
// Get a handle for the file name edit text.
waitingForProxyDialogFragment.dismiss();
}
- // Load any URLs that are waiting for the proxy.
+ // Reload existing URLs and load any URLs that are waiting for the proxy.
for (int i = 0; i < webViewPagerAdapter.getCount(); i++) {
// Get the WebView tab fragment.
WebViewTabFragment webViewTabFragment = webViewPagerAdapter.getPageFragment(i);
String waitingForProxyUrlString = nestedScrollWebView.getWaitingForProxyUrlString();
// Load the pending URL if it exists.
- if (!waitingForProxyUrlString.isEmpty()) {
+ if (!waitingForProxyUrlString.isEmpty()) { // A URL is waiting to be loaded.
// Load the URL.
loadUrl(nestedScrollWebView, waitingForProxyUrlString);
// Reset the waiting for proxy URL string.
nestedScrollWebView.resetWaitingForProxyUrlString();
+ } else { // No URL is waiting to be loaded.
+ // Reload the existing URL.
+ nestedScrollWebView.reload();
}
}
}