enable SAM by default

sh4dak · Apr 24, 2017 · 8a97571 · 8a97571
1 parent 65dda4a
commit 8a97571
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
       package="org.purplei2p.i2pd"
       android:versionCode="1"
       android:versionName="2.13.0">
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="25"/>
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

diff --git a/android/project.properties b/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-25
+target=android-24
diff --git a/libi2pd/Config.cpp b/libi2pd/Config.cpp
@@ -116,7 +116,7 @@ namespace config {
 
     options_description sam("SAM bridge options");
     sam.add_options()
-      ("sam.enabled",         value<bool>()->default_value(false),                        "Enable or disable SAM Application bridge")
+      ("sam.enabled",         value<bool>()->default_value(true),                        "Enable or disable SAM Application bridge")
       ("sam.address",         value<std::string>()->default_value("127.0.0.1"),           "SAM listen address")
       ("sam.port",            value<uint16_t>()->default_value(7656),                     "SAM listen port")
       ;