Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ dependencies {
implementation 'androidx.navigation:navigation-ui:2.8.9'
implementation 'com.google.code.gson:gson:2.11.0'
implementation 'io.github.medyo:android-about-page:2.0.0'
implementation 'androidx.webkit:webkit:1.13.0'
implementation 'androidx.webkit:webkit:1.17.0'
implementation 'com.jakewharton:process-phoenix:2.1.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.14.1'
Expand Down
25 changes: 21 additions & 4 deletions app/src/main/java/com/cylonid/nativealpha/WebViewActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import androidx.core.app.ShareCompat;
import androidx.core.content.ContextCompat;
import androidx.webkit.WebSettingsCompat;
import androidx.webkit.WebViewCompat;
import androidx.webkit.WebViewFeature;

import com.cylonid.nativealpha.databinding.DialogHttpAuthBinding;
Expand Down Expand Up @@ -119,6 +120,8 @@ public class WebViewActivity extends AppCompatActivity implements EasyPermission
private AdblockProviderApiHelper adblockProviderApiHelper;
private AdblockLifecycleHelper adblockLifecycleHelper;

private static final int MAX_SAVED_STATE_BYTES = 256 * 1024;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -135,14 +138,14 @@ protected void onCreate(Bundle savedInstanceState) {
finish();
} else {
if(webapp.isBiometricProtection()) {
new BiometricPromptHelper(WebViewActivity.this).showPrompt(() -> setupWebView(), () -> finish(), getString(R.string.bioprompt_restricted_webapp));
new BiometricPromptHelper(WebViewActivity.this).showPrompt(() -> setupWebView(savedInstanceState), () -> finish(), getString(R.string.bioprompt_restricted_webapp));
}
setupWebView();
setupWebView(savedInstanceState);
}
}

@SuppressLint("ClickableViewAccessibility")
private void setupWebView() {
private void setupWebView(Bundle savedState) {

String processName = Application.getProcessName();
String packageName = this.getPackageName();
Expand Down Expand Up @@ -245,8 +248,14 @@ private void setupWebView() {
wv.getSettings().setBuiltInZoomControls(true);
}

if (WebViewFeature.isFeatureSupported(WebViewFeature.BACK_FORWARD_CACHE)) {
WebSettingsCompat.setBackForwardCacheEnabled(wv.getSettings(), true);
}

CUSTOM_HEADERS = initCustomHeaders(webapp.isSendSavedataRequest());
loadURL(wv, url);
if (savedState == null || wv.restoreState(savedState) == null) {
loadURL(wv, url);
}
wv.setWebChromeClient(new CustomWebChromeClient());
wv.setOnLongClickListener(view -> {
if(webapp.getAlwaysUseFallbackContextMenu()) return false;
Expand Down Expand Up @@ -507,6 +516,14 @@ private void showWebViewPopupMenu() {
mPopupMenu.show();
}

@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
if (wv != null && WebViewFeature.isFeatureSupported(WebViewFeature.SAVE_STATE)) {
WebViewCompat.saveState(wv, outState, MAX_SAVED_STATE_BYTES, false);
}
}

@Override
public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig);
Expand Down