Add settings for script system access policy

celestiamobile · Feb 19, 2023 · c051e5f · c051e5f
1 parent becf3a6
commit c051e5f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 3 deletions.
diff --git a/Celestia/src/main/cpp/CelestiaAppCore.cpp b/Celestia/src/main/cpp/CelestiaAppCore.cpp
@@ -1084,4 +1084,21 @@ Java_space_celestia_celestia_AppCore_c_1getLanguage(JNIEnv *env, jclass clazz) {
     if (strcmp(lang, "LANGUAGE") == 0)
         return env->NewStringUTF("en");
     return env->NewStringUTF(lang);
+}
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_space_celestia_celestia_AppCore_c_1setScriptSystemAccessPolicy(JNIEnv *env, jclass clazz,
+                                                                    jlong pointer,
+                                                                    jint script_system_access_policy) {
+    auto core = (CelestiaCore *)pointer;
+    core->setScriptSystemAccessPolicy((CelestiaCore::ScriptSystemAccessPolicy)script_system_access_policy);
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_space_celestia_celestia_AppCore_c_1getScriptSystemAccessPolicy(JNIEnv *env, jclass clazz,
+                                                                    jlong pointer) {
+    auto core = (CelestiaCore *)pointer;
+    return (jint)core->getScriptSystemAccessPolicy();
 }
diff --git a/Celestia/src/main/java/space/celestia/celestia/AppCore.java b/Celestia/src/main/java/space/celestia/celestia/AppCore.java
@@ -730,6 +730,12 @@ public double getDoubleValueForField(@NonNull String field) {
     public int getTemperatureScale() { return c_getTemperatureScale(pointer); }
     private static native void c_setTemperatureScale(long pointer, int temperatureScale);
     private static native int c_getTemperatureScale(long pointer);
+
+    public void setScriptSystemAccessPolicy(int scriptSystemAccessPolicy) { c_setScriptSystemAccessPolicy(pointer, scriptSystemAccessPolicy); }
+    public int getScriptSystemAccessPolicy() { return c_getScriptSystemAccessPolicy(pointer); }
+    private static native void c_setScriptSystemAccessPolicy(long pointer, int scriptSystemAccessPolicy);
+    private static native int c_getScriptSystemAccessPolicy(long pointer);
+
     public void setTimeZone(int timeZone) { c_setTimeZone(pointer, timeZone); }
     public int getTimeZone() { return c_getTimeZone(pointer); }
     private static native void c_setTimeZone(long pointer, int TimeZone);

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="328"
+    android:versionCode="329"
     android:versionName="1.5.17">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />

diff --git a/app/src/main/assets/defaults.json b/app/src/main/assets/defaults.json
@@ -81,5 +81,6 @@
     "ShowHorizonGrid": 0,
     "ShowGalacticGrid": 0,
     "MeasurementSystem": 0,
-    "TemperatureScale": 0
+    "TemperatureScale": 0,
+    "ScriptSystemAccessPolicy": 0
 }
diff --git a/app/src/main/java/space/celestia/mobilecelestia/settings/SettingsModel.kt b/app/src/main/java/space/celestia/mobilecelestia/settings/SettingsModel.kt
@@ -97,6 +97,7 @@ enum class SettingsKey(private val rawDisplayName: String) : PreferenceManager.K
     HudDetail("Info Display"),
     MeasurementSystem("Measure Units"),
     TemperatureScale("Temperature Scale"),
+    ScriptSystemAccessPolicy("Script System Access Policy"),
     // Double values
     FaintestVisible("Faintest Stars"),
     AmbientLightLevel("Ambient Light"),
@@ -188,6 +189,7 @@ enum class SettingsKey(private val rawDisplayName: String) : PreferenceManager.K
                 HudDetail,
                 MeasurementSystem,
                 TemperatureScale,
+                ScriptSystemAccessPolicy,
             )
 
         val allDoubleCases: List<SettingsKey>
@@ -490,7 +492,21 @@ private val staticRendererItems: List<SettingsItem> = listOf(
 )
 
 private val staticAdvancedItems: List<SettingsItem> = listOf(
-    SettingsDataLocationItem()
+    SettingsDataLocationItem(),
+    SettingsCommonItem(
+        CelestiaString("Security", ""),
+        listOf(
+            SettingsCommonItem.Section(
+                listOf(
+                    SettingsKeyedSelectionItem(SettingsKey.ScriptSystemAccessPolicy, CelestiaString("Ask", ""), 0),
+                    SettingsKeyedSelectionItem(SettingsKey.ScriptSystemAccessPolicy, CelestiaString("Allow", ""), 1),
+                    SettingsKeyedSelectionItem(SettingsKey.ScriptSystemAccessPolicy, CelestiaString("Deny", ""), 2)
+                ),
+                header = CelestiaString(SettingsKey.ScriptSystemAccessPolicy.displayName, ""),
+                footer = CelestiaString("This policy decides whether Lua scripts have access to the files on the system or not.", "")
+            )
+        )
+    ),
 )
 
 class SettingsRenderInfoItem : SettingsItem, Serializable {

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -1,4 +1,20 @@
+<!--
+  ~ strings.xml
+  ~
+  ~ Copyright (C) 2001-2020, Celestia Development Team
+  ~
+  ~ This program is free software; you can redistribute it and/or
+  ~ modify it under the terms of the GNU General Public License
+  ~ as published by the Free Software Foundation; either version 2
+  ~ of the License, or (at your option) any later version.
+  -->
+
 <resources>
     <string name="app_name">Celestia</string>
     <string name="celestia_language">ru</string>
+    <string name="privacy_policy_alert_title">Политика конфиденциальности и Договор об оказании услуг</string>
+    <string name="privacy_policy_alert_detail">Пожалуйста, внимательно прочтите Политику конфиденциальности и Договор об оказании услуг.</string>
+    <string name="privacy_policy_alert_show_policy_button_title">Показать</string>
+    <string name="privacy_policy_alert_accept_button_title">Принимаю</string>
+    <string name="privacy_policy_alert_decline_button_title">Не сейчас</string>
 </resources>