Fixed web browser full screen.

Fixes #321
AndreyPavlenko · Jan 10, 2024 · f929ade · f929ade
1 parent aac96b6
commit f929ade
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/modules/web/src/main/java/me/aap/fermata/addon/web/FermataChromeClient.java b/modules/web/src/main/java/me/aap/fermata/addon/web/FermataChromeClient.java
@@ -101,8 +101,7 @@ public boolean onJsBeforeUnload(WebView view, String url, String message, JsResu
 
 	@Override
 	public void onShowCustomView(View view, CustomViewCallback callback) {
-		if (view instanceof ViewGroup) {
-			ViewGroup g = (ViewGroup) view;
+		if (view instanceof ViewGroup g) {
 			View focus = g.getFocusedChild();
 
 			if (focus != null) {
@@ -117,7 +116,6 @@ public void onShowCustomView(View view, CustomViewCallback callback) {
 		customView = view;
 		customViewCallback = callback;
 		addCustomView(view);
-		getWebView().setVisibility(GONE);
 		MainActivityDelegate a = MainActivityDelegate.get(view.getContext());
 		setFullScreen(a, true);
 
@@ -263,15 +261,13 @@ public void onPermissionRequest(PermissionRequest request) {
 
 		for (String p : resources) {
 			switch (p) {
-				case PermissionRequest.RESOURCE_AUDIO_CAPTURE:
-					perms.put(Manifest.permission.RECORD_AUDIO, p);
-					break;
-				case PermissionRequest.RESOURCE_VIDEO_CAPTURE:
-					perms.put(Manifest.permission.CAMERA, p);
-					break;
-				case PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID:
+				case PermissionRequest.RESOURCE_AUDIO_CAPTURE ->
+						perms.put(Manifest.permission.RECORD_AUDIO, p);
+				case PermissionRequest.RESOURCE_VIDEO_CAPTURE -> perms.put(Manifest.permission.CAMERA, p);
+				case PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID -> {
 					request.grant(resources);
 					return;
+				}
 			}
 		}
 

diff --git a/modules/web/src/main/java/me/aap/fermata/addon/web/yt/YoutubeChromeClient.java b/modules/web/src/main/java/me/aap/fermata/addon/web/yt/YoutubeChromeClient.java
@@ -46,6 +46,12 @@ protected void setFullScreen(MainActivityDelegate a, boolean fullScreen) {
 		a.setVideoMode(fullScreen, getFullScreenView());
 	}
 
+	@Override
+	public void onShowCustomView(View view, CustomViewCallback callback) {
+		getWebView().setVisibility(GONE);
+		super.onShowCustomView(view, callback);
+	}
+
 	@Override
 	public boolean canEnterFullScreen() {
 		MainActivityDelegate a = MainActivityDelegate.get(getWebView().getContext());