2.56.0

Signed-off-by: r4sas <r4sas@i2pmail.org>

app/build.gradle

@@ -29,8 +29,8 @@ android {
         targetSdkVersion 33
         // TODO: 24?
         minSdkVersion 16
-        versionCode 2530100
-        versionName "2.53.1"
+        versionCode 2560000
+        versionName "2.56.0"
         archivesBaseName += "-$versionName"
         ndkVersion "23.2.8568313"
 

app/jni/Android.mk

@@ -4,9 +4,6 @@ LOCAL_MODULE := i2pd
 LOCAL_CPP_FEATURES := rtti exceptions
 LOCAL_C_INCLUDES += $(IFADDRS_PATH) $(LIB_SRC_PATH) $(LIB_CLIENT_SRC_PATH) $(LANG_SRC_PATH) $(DAEMON_SRC_PATH)
 LOCAL_STATIC_LIBRARIES := \
-	boost_system \
-	boost_date_time \
-	boost_filesystem \
 	boost_program_options \
 	crypto \
 	ssl \
@@ -29,27 +26,6 @@ LOCAL_SRC_FILES := \
 
 include $(BUILD_SHARED_LIBRARY)
 
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_system
-LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_system.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_date_time
-LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_date_time.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_filesystem
-LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_filesystem.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := boost_program_options

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

@@ -203,7 +203,15 @@ public class DaemonWrapper {
     }
 
     private void processAssets() {
-        File holderFile = new File(i2pdpath, "assets.ready");
+        // Checking if application folder exists, and create it if not
+        Log.d(TAG, "checking app directory");
+        File appPath = new File(i2pdpath);
+	if (!appPath.exists()) {
+            boolean result = appPath.mkdir();
+            Log.d(TAG, "appPath.mkdir() returned " + result + " for " + appPath);
+        }
+
+        File holderFile = new File(appPath, "assets.ready");
         String versionName = BuildConfig.VERSION_NAME; // here will be app version, like 2.XX.XX
         StringBuilder text = new StringBuilder();
         Log.d(TAG, "checking assets");
@@ -246,7 +254,7 @@ public class DaemonWrapper {
                 boolean deleteResult = holderFile.delete();
                 if (!deleteResult)
                     Log.e(TAG, "holderFile.delete() returned " + deleteResult + ", absolute path='" + holderFile.getAbsolutePath() + "'");
-                File certPath = new File(i2pdpath, "certificates");
+                File certPath = new File(appPath, "certificates");
                 deleteRecursive(certPath);
 
                 // copy assets. If processed file exists, it won't be overwritten

binary/jni/Android.mk

@@ -4,9 +4,6 @@ LOCAL_MODULE := i2pd
 LOCAL_CPP_FEATURES := rtti exceptions
 LOCAL_C_INCLUDES += $(IFADDRS_PATH) $(LIB_SRC_PATH) $(LIB_CLIENT_SRC_PATH) $(LANG_SRC_PATH) $(DAEMON_SRC_PATH)
 LOCAL_STATIC_LIBRARIES := \
-	boost_system \
-	boost_date_time \
-	boost_filesystem \
 	boost_program_options \
 	crypto \
 	ssl \
@@ -29,27 +26,6 @@ LOCAL_SRC_FILES := \
 
 include $(BUILD_EXECUTABLE)
 
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_system
-LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_system.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_date_time
-LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_date_time.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_filesystem
-LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_filesystem.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include
-include $(PREBUILT_STATIC_LIBRARY)
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := boost_program_options

binary/jni/boost

@@ -1 +1 @@
-Subproject commit 7daeea97271a4067386254dc491d49db2b13ae65
+Subproject commit 51924ec5533a4fefb5edf99feaeded794c06a4fb

binary/jni/build.sh

@@ -23,7 +23,7 @@ fi
 
 _NDK_OPTS="-j `nproc` NDK_MODULE_PATH=$DIR"
 
-help()
+_help()
 {
 	echo "Syntax: $(basename "$SOURCE") [-m|d|s|h|v]"
 	echo "Options:"
@@ -36,6 +36,12 @@ help()
 	echo
 }
 
+_failed()
+{
+	echo "Compilation failed";
+	exit 1;
+}
+
 while getopts ":dbsvxh" option; do
 	case $option in
 		d) # debug build
@@ -54,7 +60,7 @@ while getopts ":dbsvxh" option; do
 			_NDK_OPTS="$_NDK_OPTS V=1 NDK_LOG=1"
 			;;
 		h) # display help
-			help
+			_help
 			exit;;
 		\?) # Invalid option
 			echo "Error: Invalid option. Use $(basename "$SOURCE") -h for help"
@@ -66,12 +72,15 @@ done
 if [ -z "$_SKIP_LIBS" ]; then
 	echo "Building boost..."
 	./build_boost.sh
+	[ $? -ne 0 ] && _failed
 
 	echo "Building openssl..."
 	./build_openssl.sh
+	[ $? -ne 0 ] && _failed
 
 	echo "Building miniupnpc..."
 	./build_miniupnpc.sh
+	[ $? -ne 0 ] && _failed
 fi
 
 if [ ! -z "$_BINARY" ]; then

binary/jni/build_boost.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-BOOST_VERSION=1.78.0
-BOOST_LIBS=date_time,filesystem,program_options,system
+BOOST_VERSION=1.84.0
+BOOST_LIBS=program_options
 
 function build_one {
 	echo "Configuring and building..."
@@ -71,7 +71,6 @@ cd boost
 
 # disable verbose output
 sed -i -E -e 's/d\+2/d\+0/' build-android.sh
-sed -i -E -e 's/\"23\.1\"\|\"25\.0\"/\"23\.1\"\|\"23\.2\"\|\"25\.0\"/' build-android.sh
 
 if (( $# == 0 )); then
 	build all

binary/jni/i2pd

@@ -1 +1 @@
-Subproject commit 81cc3e3de8526b7f2ccc91053c9d1718d3293136
+Subproject commit fb90b01f6c2f71831f854b3f43fc79fde246ee33

fastlane/metadata/android/en-US/changelogs/2540000.txt

@@ -0,0 +1 @@
+* Updated codebase to 2.54.0

fastlane/metadata/android/en-US/changelogs/2550000.txt

@@ -0,0 +1 @@
+* Updated codebase to 2.55.0

fastlane/metadata/android/en-US/changelogs/2560000.txt

@@ -0,0 +1 @@
+* Updated codebase to 2.56.0