clear android code

gradle/base.gradle

@@ -37,7 +37,7 @@ dependencies {
     errorprone("com.google.errorprone:error_prone_core:2.36.0")
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.errorprone.enabled = true
     options.errorprone.disableWarningsInGeneratedCode = true
 }

gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineActivity.java

@@ -820,7 +820,7 @@ public void onDestroy() {
         List<MengineService> plugins = this.getPlugins();
 
         for (MengineService p : plugins) {
-            p.setMengineActivity(null);
+            p.removeMengineActivity();
         }
 
         if (m_clipboard != null) {

gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineAnalytics.java

@@ -18,6 +18,10 @@ public static void setMengineApplication(@NonNull MengineApplication application
         MengineAnalytics.m_application = application;
     }
 
+    public static void removeMengineApplication() {
+        MengineAnalytics.m_application = null;
+    }
+
     static private void assertContext(String key) {
         if (BuildConfig.DEBUG == false) {
             return;

gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineApplication.java

@@ -294,6 +294,10 @@ public String getAndroidId() {
         return m_androidId;
     }
 
+    public long getSaveVersion() {
+        return m_saveVersion;
+    }
+
     public String getInstallKey() {
         return m_installKey;
     }
@@ -1193,8 +1197,8 @@ public void onTerminate() {
             service.onFinalize(this);
         }
 
-        MengineLog.setMengineApplication(null);
-        MengineAnalytics.setMengineApplication(null);
+        MengineLog.removeMengineApplication();
+        MengineAnalytics.removeMengineApplication();
 
         MengineNative.AndroidNativePython_removePlugin("Application");
 

gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineLog.java

@@ -50,6 +50,10 @@ public static void setMengineApplication(@NonNull MengineApplication application
         MengineLog.m_application = application;
     }
 
+    public static void removeMengineApplication() {
+        MengineLog.m_application = null;
+    }
+
     public static void initializeBaseServices() {
         MengineLog.m_initializeBaseServices = true;
 

gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineService.java

@@ -36,6 +36,10 @@ public void setMengineActivity(@NonNull MengineActivity activity) {
         m_activity = activity;
     }
 
+    public void removeMengineActivity() {
+        m_activity = null;
+    }
+
     public MengineActivity getMengineActivity() {
         return m_activity;
     }

gradle/libraries/Mengine/src/main/java/org/Mengine/Base/MengineUtils.java

@@ -936,14 +936,23 @@ public static Display getDefaultDisplay(Context context) {
         }
     }
 
-    @SuppressWarnings("deprecation")
+    public static Rect getDeviceWindowRectQ(Context context, Display display) {
+        DisplayMetrics realMetrics = new DisplayMetrics();
+        display.getRealMetrics( realMetrics );
+
+        int width = realMetrics.widthPixels;
+        int height = realMetrics.heightPixels;
+
+        return new Rect(0, 0, width, height);
+    }
+
     public static Rect getDeviceWindowRect(Context context, Display display)
     {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
             WindowManager windowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
 
             if (windowManager == null) {
-                return null;
+                return MengineUtils.getDeviceWindowRectQ(context, display);
             }
 
             WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();
@@ -952,13 +961,7 @@ public static Rect getDeviceWindowRect(Context context, Display display)
 
             return bounds;
         } else {
-            DisplayMetrics realMetrics = new DisplayMetrics();
-            display.getRealMetrics( realMetrics );
-
-            int width = realMetrics.widthPixels;
-            int height = realMetrics.heightPixels;
-
-            return new Rect(0, 0, width, height);
+            return MengineUtils.getDeviceWindowRectQ(context, display);
         }
     }
 

gradle/libraries/Mengine/src/main/proguard-rules.pro

@@ -1,4 +1,4 @@
--keep public class * extends org.Mengine.Base.MenginePluginExtension {
+-keep public class * extends org.Mengine.Base.MengineServiceInvalidInitializeException {
     native <methods>;
     public <methods>;
 }

gradle/plugins/AppLovin/NonetBanners/main/java/org/Mengine/Plugin/AppLovin/MengineAppLovinNonetBanners.java

@@ -46,7 +46,7 @@ static class NonetBanner {
     protected Timer m_refreshTimer;
 
     @Override
-    public void onAppCreate(MengineApplication application, MengineAppLovinPlugin plugin) throws MengineServiceInvalidInitializeException {
+    public void onAppCreate(@NonNull MengineApplication application, @NonNull MengineAppLovinPlugin plugin) throws MengineServiceInvalidInitializeException {
         m_plugin = plugin;
 
         m_banners = new ArrayList<>();
@@ -110,14 +110,14 @@ public void onAppCreate(MengineApplication application, MengineAppLovinPlugin pl
     }
 
     @Override
-    public void onAppTerminate(MengineApplication application, MengineAppLovinPlugin plugin) {
+    public void onAppTerminate(@NonNull MengineApplication application, @NonNull MengineAppLovinPlugin plugin) {
         m_banners = null;
 
         m_plugin = null;
     }
 
     @Override
-    public void onActivityCreate(MengineActivity activity) throws MengineServiceInvalidInitializeException {
+    public void onActivityCreate(@NonNull MengineActivity activity) throws MengineServiceInvalidInitializeException {
         if (m_banners.isEmpty() == true) {
             return;
         }
@@ -215,23 +215,20 @@ protected void addNonetBanner(MengineApplication application, String image, Stri
         params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
         view.setLayoutParams(params);
 
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                m_plugin.logMessage("[NONET_BANNERS] click banner request: %d url: %s"
-                    , m_requestId
-                    , url
-                );
+        view.setOnClickListener(v -> {
+            m_plugin.logMessage("[NONET_BANNERS] click banner request: %d url: %s"
+                , m_requestId
+                , url
+            );
 
-                m_plugin.buildEvent("mng_ad_nonet_banners_clicked")
-                    .addParameterString("url", url)
-                    .addParameterLong("request_id", m_requestId)
-                    .log();
+            m_plugin.buildEvent("mng_ad_nonet_banners_clicked")
+                .addParameterString("url", url)
+                .addParameterLong("request_id", m_requestId)
+                .log();
 
-                MengineActivity activity = m_plugin.getMengineActivity();
+            MengineActivity activity = m_plugin.getMengineActivity();
 
-                MengineUtils.openUrl(activity, url);
-            }
+            MengineUtils.openUrl(activity, url);
         });
 
         m_plugin.logMessage("[NONET_BANNERS] add banner url: %s"

gradle/plugins/Facebook/src/main/java/org/Mengine/Plugin/Facebook/MengineFacebookPlugin.java

@@ -468,7 +468,7 @@ public void onError(@NonNull FacebookException exception) {
                     .addParameterString("url", link)
                     .addParameterString("hashtag", hashtag)
                     .addParameterString("quote", quote)
-                    .addParameterString("error", error_message)
+                    .addParameterException("exception", exception)
                     .log();
 
                 MengineFacebookPlugin.this.pythonCall("onFacebookShareError", ERROR_CODE_UNKNOWN, error_message);

gradle/plugins/FirebasePerformanceMonitoring/src/main/java/org/Mengine/Plugin/FirebasePerformanceMonitoring/MengineFirebasePerformanceTraceProvider.java

@@ -8,7 +8,7 @@
 import java.util.Map;
 
 class MengineFirebasePerformanceTraceProvider implements MenginePerformanceTraceProvider {
-    private Trace m_trace;
+    private final Trace m_trace;
 
     MengineFirebasePerformanceTraceProvider(String name, Map<String, String> attributes) {
         m_trace = FirebasePerformance.getInstance()

gradle/plugins/GoogleGameSocial/src/main/java/org/Mengine/Plugin/GoogleGameSocial/MengineGoogleGameSocialPlugin.java

@@ -51,7 +51,9 @@ public void onCreate(@NonNull MengineActivity activity, Bundle savedInstanceStat
         GamesSignInClient gamesSignInClient = PlayGames.getGamesSignInClient(activity);
 
         gamesSignInClient.isAuthenticated().addOnCompleteListener(isAuthenticatedTask -> {
-            if (isAuthenticatedTask.isSuccessful() == false) {
+            boolean isAuthenticated = isAuthenticatedTask.isSuccessful();
+
+            if (isAuthenticated == false) {
                 Exception e = isAuthenticatedTask.getException();
 
                 this.logError("[ERROR] google game social isAuthenticated failed: %s"

gradle/plugins/LocalNotifications/src/main/java/org/Mengine/Plugin/LocalNotifications/MengineLocalNotificationsPlugin.java

@@ -329,7 +329,7 @@ protected void parseInternalLocalNotifications(MengineActivity activity) {
 
             return;
         } catch (final IOException e) {
-            this.logError("[LOCAL_NOTIFICATIOINS] XmlPullParserException: %s"
+            this.logError("[LOCAL_NOTIFICATIOINS] IOException: %s"
                 , e.getMessage()
             );