Fix ClassCastException in takeScreenshot()

woesss · Jul 14, 2024 · 177c985 · 177c985
1 parent cc87cf5
commit 177c985
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/java/javax/microedition/lcdui/Canvas.java b/app/src/main/java/javax/microedition/lcdui/Canvas.java
@@ -271,7 +271,7 @@ public void onDraw(android.graphics.Canvas canvas) {
 		}
 	}
 
-	public Single<Bitmap> getScreenShot() {
+	public Single<Bitmap> getScreenshot() {
 		if (renderer != null && !screenshotRawMode) {
 			return renderer.takeScreenShot();
 		}

diff --git a/app/src/main/java/javax/microedition/shell/MicroActivity.java b/app/src/main/java/javax/microedition/shell/MicroActivity.java
@@ -520,7 +520,7 @@ private void handleVkOptions(int id) {
 
 	@SuppressLint("CheckResult")
 	private void takeScreenshot() {
-		microLoader.takeScreenshot((Canvas) current, new SingleObserver<>() {
+		microLoader.takeScreenshot(current, new SingleObserver<>() {
 			@Override
 			public void onSubscribe(@NonNull Disposable d) {
 			}

diff --git a/app/src/main/java/javax/microedition/shell/MicroLoader.java b/app/src/main/java/javax/microedition/shell/MicroLoader.java
@@ -281,8 +281,11 @@ void applyConfiguration() {
 		}
 	}
 
-	void takeScreenshot(Canvas canvas, SingleObserver<String> observer) {
-		canvas.getScreenShot()
+	void takeScreenshot(Object target, SingleObserver<String> observer) {
+		if (!(target instanceof Canvas canvas)) {
+			return;
+		}
+		canvas.getScreenshot()
 				.subscribeOn(Schedulers.computation())
 				.observeOn(Schedulers.io())
 				.map(bitmap -> {