2.37.0

Signed-off-by: R4SAS <r4sas@i2pmail.org>
PurpleI2P · Mar 15, 2021 · bb93876 · bb93876
1 parent b30bd69
commit bb93876
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/app/jni/i2pd b/app/jni/i2pd
diff --git a/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java b/app/src/main/java/org/purplei2p/i2pd/DaemonWrapper.java
@@ -150,8 +150,8 @@ public static String getDataDir() { // for settings iniEditor
 
     public void changeDataDir(String dataDir, Boolean updateAssets) {
         I2PD_JNI.setDataDir(dataDir);
-	if( updateAssets ) processAssets();
-	//ToDo: move old dir to new dir?
+        if( updateAssets ) processAssets();
+        //ToDo: move old dir to new dir?
     }
 
     public boolean isStartedOkay() {

diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java b/app/src/main/java/org/purplei2p/i2pd/I2PDActivity.java
@@ -505,6 +505,6 @@ private void quit() {
         } catch (Throwable tr) {
             Log.e(TAG, "", tr);
         }
-        //System.exit(0);
+        System.exit(0);
     }
 }
diff --git a/app/src/main/res/menu/options_main.xml b/app/src/main/res/menu/options_main.xml
@@ -29,6 +29,6 @@
         <item
             android:id="@+id/action_stop"
             android:orderInCategory="99"
-            android:title="@string/action_stop" />
+            android:title="@string/action_exit" />
     </group>
 </menu>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -5,6 +5,7 @@
 
     <string name="action_start">Запустить</string>
     <string name="action_stop">Остановить</string>
+    <string name="action_exit">Выход</string>
     <string name="action_graceful_stop">Корректная остановка</string>
     <string name="action_cancel_graceful_stop">Отменить корректную остановку</string>
     <string name="action_reload_tunnels_config">Перезагрузить туннели</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
 
     <string name="action_start">Start</string>
     <string name="action_stop">Stop</string>
+    <string name="action_exit">Exit</string>
     <string name="action_graceful_stop">Graceful Stop</string>
     <string name="action_cancel_graceful_stop">Cancel Graceful Stop</string>
     <string name="action_reload_tunnels_config">Reload tunnels</string>

diff --git a/fastlane/metadata/android/en-US/changelogs/23700.txt b/fastlane/metadata/android/en-US/changelogs/23700.txt
@@ -0,0 +1,2 @@
+* Updated codebase to 2.37.0
+* Changes in main activity
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Updated codebase to 2.37.0
		* Changes in main activity