Setting activity

app/build.gradle

@@ -5,6 +5,7 @@ plugins {
 dependencies {
     implementation 'androidx.core:core:1.9.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    //implementation 'org.ini4j:ini4j:0.5.4'
 }
 
 android {

app/src/main/AndroidManifest.xml

@@ -74,5 +74,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.purplei2p.i2pd.I2PDPermsAskerActivity" />
         </activity>
+        <activity
+            android:name=".MyPreferenceActivity"
+            android:label="Settings"
+            >
+        </activity>
+
     </application>
 </manifest>

app/src/main/java/org/purplei2p/i2pd/MyPreferenceActivity.java

@@ -0,0 +1,62 @@
+package org.purplei2p.i2pd;
+
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.PreferenceActivity;
+
+public class MyPreferenceActivity extends PreferenceActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preferences_i2pd);
+
+        // Main Category
+        ListPreference logLevel = (ListPreference) findPreference("logLevelPreference");
+        CheckBoxPreference ipv4Enable = (CheckBoxPreference) findPreference("ipv4EnablePreference");
+        CheckBoxPreference ipv6Enable = (CheckBoxPreference) findPreference("ipv6EnablePreference");
+        EditTextPreference portPreference = (EditTextPreference) findPreference("portPreference");
+        ListPreference bandwidthPreference = (ListPreference) findPreference("bandwidthPreference");
+        CheckBoxPreference noTransitPreference = (CheckBoxPreference) findPreference("noTransitPreference");
+        CheckBoxPreference floodfillPreference = (CheckBoxPreference) findPreference("floodfillPreference");
+        CheckBoxPreference ssuPreference = (CheckBoxPreference) findPreference("ssuPreference");
+
+        // NTCP2 Category
+        CheckBoxPreference ntcp2Enable = (CheckBoxPreference) findPreference("ntcp2EnablePreference");
+        CheckBoxPreference ntcp2Publish = (CheckBoxPreference) findPreference("ntcp2PublishPreference");
+
+        // Web Console Category
+        CheckBoxPreference webConsoleEnable = (CheckBoxPreference) findPreference("webConsoleEnablePreference");
+        EditTextPreference webConsoleAddress = (EditTextPreference) findPreference("webConsoleAddressPreference");
+        EditTextPreference webConsolePort = (EditTextPreference) findPreference("webConsolePortPreference");
+        CheckBoxPreference webConsoleAuth = (CheckBoxPreference) findPreference("webConsoleAuthPreference");
+        EditTextPreference webConsoleUser = (EditTextPreference) findPreference("webConsoleUserPreference");
+        EditTextPreference webConsolePassword = (EditTextPreference) findPreference("webConsolePasswordPreference");
+
+        // HTTP Proxy Category
+        CheckBoxPreference httpProxyEnable = (CheckBoxPreference) findPreference("httpProxyEnablePreference");
+        EditTextPreference httpProxyAddress = (EditTextPreference) findPreference("httpProxyAddressPreference");
+        EditTextPreference httpProxyPort = (EditTextPreference) findPreference("httpProxyPortPreference");
+        EditTextPreference httpProxyKeys = (EditTextPreference) findPreference("httpProxyKeysPreference");
+
+        // SOCKS Proxy Category
+        CheckBoxPreference socksProxyEnable = (CheckBoxPreference) findPreference("socksProxyEnablePreference");
+        EditTextPreference socksProxyAddress = (EditTextPreference) findPreference("socksProxyAddressPreference");
+        EditTextPreference socksProxyPort = (EditTextPreference) findPreference("socksProxyPortPreference");
+        EditTextPreference socksProxyKeys = (EditTextPreference) findPreference("socksProxyKeysPreference");
+
+        // SAM Category
+        CheckBoxPreference samEnable = (CheckBoxPreference) findPreference("samEnablePreference");
+        EditTextPreference samAddress = (EditTextPreference) findPreference("samAddressPreference");
+        EditTextPreference samPort = (EditTextPreference) findPreference("samPortPreference");
+
+        // UPnP Category
+        CheckBoxPreference upnpEnable = (CheckBoxPreference) findPreference("upnpEnablePreference");
+        EditTextPreference upnpForwardName = (EditTextPreference) findPreference("upnpForwardNamePreference");
+
+        // Limits Category
+        EditTextPreference transitTunnelEdit = (EditTextPreference) findPreference("transitTunnelPreference");
+    }
+}

app/src/main/java/org/purplei2p/i2pd/SettingsActivity.java

@@ -11,8 +11,12 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+
+
 import java.io.File;
 import java.util.List;
 import java.util.Objects;
@@ -21,7 +25,6 @@ import java.util.Objects;
 //import org.purplei2p.i2pd.iniedotr.IniEditor;
 
 public class SettingsActivity extends Activity {
-    //protected IniEditor iniedit = new IniEditor();
     private String TAG = "i2pdSrvcSettings";
     private File cacheDir;
     public static String onBootFileName = "/onBoot"; // just file, empty, if exist the do autostart, if not then no.
@@ -83,9 +86,16 @@ public class SettingsActivity extends Activity {
         setContentView(R.layout.activity_settings);
         Objects.requireNonNull(getActionBar()).setDisplayHomeAsUpEnabled(true);
         Switch autostart_switch = findViewById(R.id.autostart_enable);
-
+        Button openPreferences = findViewById(R.id.OpenPreferences);
         cacheDir = getApplicationContext().getCacheDir();
         File onBoot = new File(cacheDir.getAbsolutePath() + onBootFileName);
+        openPreferences.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(SettingsActivity.this, MyPreferenceActivity.class);
+                startActivity(intent);
+            }
+        });
         autostart_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 // do something, the isChecked will be

app/src/main/res/layout/activity_settings.xml

@@ -28,6 +28,18 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?android:attr/listDivider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/OpenPreferences"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/OpenPreferences" />
+    </LinearLayout>
     <!--
     <TextView
         android:id="@+id/settings_section2"

app/src/main/res/values-ru/strings.xml

@@ -43,4 +43,5 @@
     <string name="add_tunnel_button">Добавить туннель</string>
     <string name="add_tunnel">Управление туннелями</string>
     <string name="del_tunnel_button">Удалить туннель</string>
+    <string name="OpenPreferences">Открыть основные настройки</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -60,5 +60,6 @@
     <string name="add_tunnel">Tunnels management</string>
 
     <string name="del_tunnel_button">Delete tunnel</string>
+    <string name="OpenPreferences">Open i2pd settings</string>
 
 </resources>

app/src/main/res/xml/preferences_i2pd.xml

@@ -3,97 +3,108 @@
 
     <PreferenceCategory android:title="Main">
 
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="check_box_preference_1"
-            android:title="Log" />
         <ListPreference
+            android:id="@+id/LogLevel"
             android:defaultValue="1"
             android:entries="@array/pref_loglevel"
             android:entryValues="@array/pref_loglevel"
-            android:key="list_preference_1"
+            android:key="logLevelPreference"
             android:summary="Logging level to file. Use 'none' to reduce memory usage"
             android:title="Log level" />
         <CheckBoxPreference
+            android:id="@+id/IPV4Enable"
             android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:key="ipv4EnablePreference"
             android:title="IPv4" />
         <CheckBoxPreference
+            android:id="@+id/IPV6Enable"
             android:defaultValue="false"
-            android:key="check_box_preference_1"
+            android:key="ipv6EnablePreference"
             android:title="IPv6" />
         <EditTextPreference
-            android:defaultValue="Default value"
-            android:key="edit_text_preference_1"
+            android:id="@+id/Port"
+            android:defaultValue="auto"
+            android:key="portPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Port" />
         <ListPreference
+            android:id="@+id/BandWithType"
             android:entries="@array/pref_bandwidth_limit_flags"
             android:entryValues="@array/pref_bandwidth_limit_flags"
-            android:key="list_preference_1"
+            android:key="bandwidthPreference"
             android:summary="Bandwidth limit for transit traffic"
             android:title="Bandwidth" />
         <CheckBoxPreference
+            android:id="@+id/NoTransitCheckbox"
             android:defaultValue="false"
-            android:key="check_box_preference_1"
+            android:key="noTransitPreference"
             android:summary="Disable transit"
             android:title="No transit" />
         <CheckBoxPreference
+            android:id="@+id/FloodfillCheckBox"
             android:defaultValue="false"
-            android:key="check_box_preference_1"
+            android:key="floodfillPreference"
             android:summary="Uses more battery"
             android:title="Floodfill" />
         <CheckBoxPreference
+            android:id="@+id/SSUCheckBox"
             android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:key="ssuPreference"
             android:title="SSU" />
 
     </PreferenceCategory>
     <PreferenceCategory android:title="NTCP2">
-
         <CheckBoxPreference
+            android:id="@+id/NTCP2Checkbox"
             android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:key="ntcp2EnablePreference"
             android:title="Enable" />
         <CheckBoxPreference
+            android:id="@+id/NTCPPublishCheckbox"
             android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:key="ntcp2PublishPreference"
             android:summary="Disable to make unable to connect to your device"
             android:title="Publish" />
     </PreferenceCategory>
     <PreferenceCategory android:title="Web Console">
 
         <CheckBoxPreference
+            android:id="@+id/WebConsoleEnableCheckbox"
             android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:key="webConsoleEnablePreference"
             android:title="Enable" />
         <EditTextPreference
+            android:id="@+id/WebConsoleIPText"
             android:defaultValue="127.0.0.1"
-            android:key="edit_text_preference_1"
+            android:key="webConsoleAddressPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Address" />
         <EditTextPreference
+            android:id="@+id/WebConsolePortText"
             android:defaultValue="7070"
-            android:key="edit_text_preference_1"
+            android:key="webConsolePortPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Port" />
         <CheckBoxPreference
+            android:id="@+id/WebConsoleUseAuthCheckbox"
             android:defaultValue="false"
-            android:key="check_box_preference_1"
+            android:key="webConsoleAuthPreference"
             android:summary="Use HTTP authorization to access Web Console"
-            android:title="Autorization" />
+            android:title="Authorization" />
         <EditTextPreference
+            android:id="@+id/WebConsoleUser"
             android:defaultValue="Default value"
-            android:key="edit_text_preference_1"
+            android:key="webConsoleUserPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="User" />
         <EditTextPreference
+            android:id="@+id/WebConsoleUserPassword"
             android:defaultValue="Default value"
-            android:key="edit_text_preference_1"
+            android:key="webConsolePasswordPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Password" />
@@ -101,24 +112,28 @@
     <PreferenceCategory android:title="@string/services_http_proxy">
 
         <CheckBoxPreference
+            android:id="@+id/EnableHTTPProxy"
             android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:key="httpProxyEnablePreference"
             android:title="Enable" />
         <EditTextPreference
+            android:id="@+id/HTTPProxyHost"
             android:defaultValue="127.0.0.1"
-            android:key="edit_text_preference_1"
+            android:key="httpProxyAddressPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Address" />
         <EditTextPreference
+            android:id="@+id/HTTPProxyPort"
             android:defaultValue="4444"
-            android:key="edit_text_preference_1"
+            android:key="httpProxyPortPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Port" />
         <EditTextPreference
-            android:defaultValue="proxy-keys.dat"
-            android:key="edit_text_preference_1"
+            android:id="@+id/HTTPProxyKeys"
+            android:defaultValue="transient"
+            android:key="httpProxyKeysPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Keys" />
@@ -126,24 +141,28 @@
     <PreferenceCategory android:title="SOCKS Proxy">
 
         <CheckBoxPreference
+            android:id="@+id/SocksProxyEnableCheckbox"
             android:defaultValue="false"
-            android:key="check_box_preference_1"
+            android:key="socksProxyEnablePreference"
             android:title="Enable" />
         <EditTextPreference
+            android:id="@+id/SocksProxyHost"
             android:defaultValue="127.0.0.1"
-            android:key="edit_text_preference_1"
+            android:key="socksProxyAddressPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Address" />
         <EditTextPreference
+            android:id="@+id/SocksProxyPort"
             android:defaultValue="4447"
-            android:key="edit_text_preference_1"
+            android:key="socksProxyPortPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Port" />
         <EditTextPreference
-            android:defaultValue="proxy-keys.dat"
-            android:key="edit_text_preference_1"
+            android:id="@+id/SocksProxyKey"
+            android:defaultValue="transient"
+            android:key="socksProxyKeysPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Keys" />
@@ -151,18 +170,21 @@
     <PreferenceCategory android:title="SAM">
 
         <CheckBoxPreference
+            android:id="@+id/SAMEnable"
             android:defaultValue="false"
-            android:key="check_box_preference_1"
+            android:key="samEnablePreference"
             android:title="Enable" />
         <EditTextPreference
+            android:id="@+id/SAMHost"
             android:defaultValue="127.0.0.1"
-            android:key="edit_text_preference_1"
+            android:key="samAddressPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Address" />
         <EditTextPreference
+            android:id="@+id/SAMPort"
             android:defaultValue="7656"
-            android:key="edit_text_preference_1"
+            android:key="samPortPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Port" />
@@ -170,12 +192,14 @@
     <PreferenceCategory android:title="UPnP">
 
         <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="check_box_preference_1"
+            android:id="@+id/UPnPEnable"
+            android:defaultValue="false"
+            android:key="upnpEnablePreference"
             android:title="Enable" />
         <EditTextPreference
+            android:id="@+id/UPnPForwardName"
             android:defaultValue="I2Pd"
-            android:key="edit_text_preference_1"
+            android:key="upnpForwardNamePreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:title="Forwarding name" />
@@ -183,11 +207,12 @@
     <PreferenceCategory android:title="Limits">
 
         <EditTextPreference
-            android:defaultValue="50"
-            android:key="edit_text_preference_1"
+            android:id="@+id/TransitTunnelEdit"
+            android:defaultValue="3000"
+            android:key="transitTunnelPreference"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:summary="Limit possible built transit tunnels"
             android:title="Transit tunnels" />
     </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>