Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean web resources before closing web PiP

Browse source
This commit is contained in:
Gabriel Calero 2018-07-04 17:38:42 -03:00
parent 9675328f1e
commit 6e3d3d457f
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
View file

@ -131,7 +131,10 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
webSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false); webSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false);
QtLayout qtLayout = (QtLayout) mainLayout.getChildAt(0); QtLayout qtLayout = (QtLayout) mainLayout.getChildAt(0);
QtLayout.LayoutParams layoutParams = new QtLayout.LayoutParams(webSlidingDrawer.getLayoutParams()); QtLayout.LayoutParams layoutParams = new QtLayout.LayoutParams(webSlidingDrawer.getLayoutParams());
webSlidingDrawer.setOnDrawerCloseListener(() -> {
WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
webViewFragment.close();
});
int widthPx = Math.max(size.x, size.y); int widthPx = Math.max(size.x, size.y);
int heightPx = Math.min(size.x, size.y); int heightPx = Math.min(size.x, size.y);
@ -299,7 +302,12 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment"); WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
webViewFragment.loadUrl((String) args.get(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL), true); webViewFragment.loadUrl((String) args.get(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL), true);
webViewFragment.setToolbarVisible(true); webViewFragment.setToolbarVisible(true);
webViewFragment.setCloseAction(() -> { webSlidingDrawer.animateClose(); webSlidingDrawer.setVisibility(View.GONE);} ); webViewFragment.setCloseAction(() -> {
if (webSlidingDrawer.isOpened()) {
webSlidingDrawer.animateClose();
}
webSlidingDrawer.setVisibility(View.GONE);
});
} }
}); });
break; break;

11
android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
View file

@ -133,6 +133,13 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
return false; return false;
} }
public void close() {
myWebView.loadUrl("about:blank");
if (mCloseAction != null) {
mCloseAction.run();
}
}
public enum SafenessLevel { public enum SafenessLevel {
NOT_ANALYZED_YET(""), NOT_ANALYZED_YET(""),
NOT_SECURE(""), NOT_SECURE(""),
@ -205,9 +212,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
expand(); expand();
}); });
mToolbar.findViewById(R.id.close).setOnClickListener(view -> { mToolbar.findViewById(R.id.close).setOnClickListener(view -> {
if (mCloseAction != null) { close();
mCloseAction.run();
}
}); });
if (mUrl != null) { if (mUrl != null) {
loadUrl(myWebView, mUrl); loadUrl(myWebView, mUrl);