From 2200bb9b4505181b65df1c544aec9fafd7c087c8 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sun, 6 Nov 2022 00:21:25 +0800
Subject: [PATCH] Upgrade java compatibility to Java 17

---
 app/build.gradle                                     |  6 +++---
 app/src/main/java/com/hippo/scene/StageActivity.java | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 21fbb2e74..54f35c9a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,12 +43,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     lint {
diff --git a/app/src/main/java/com/hippo/scene/StageActivity.java b/app/src/main/java/com/hippo/scene/StageActivity.java
index f26c7f1f7..b68900d40 100644
--- a/app/src/main/java/com/hippo/scene/StageActivity.java
+++ b/app/src/main/java/com/hippo/scene/StageActivity.java
@@ -619,19 +619,17 @@ public abstract class StageActivity extends EhActivity {
         super.onProvideAssistContent(outContent);
         int size = mSceneTagList.size();
         String tag = mSceneTagList.get(size - 1);
-        SceneFragment scene;
         Fragment fragment = getSupportFragmentManager().findFragmentByTag(tag);
         if (fragment == null) {
             Log.e(TAG, "onProvideAssistContent: Can't find scene by tag: " + tag);
             return;
         }
-        if (!(fragment instanceof SceneFragment)) {
-            Log.e(TAG, "onProvideAssistContent: The fragment is not SceneFragment");
-            return;
-        }
 
-        scene = (SceneFragment) fragment;
-        scene.onProvideAssistContent(outContent);
+        if (fragment instanceof SceneFragment scene) {
+            scene.onProvideAssistContent(outContent);
+        } else {
+            Log.e(TAG, "onProvideAssistContent: The fragment is not SceneFragment");
+        }
     }
 
     public SceneFragment findSceneByTag(String tag) {