2.50.0

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

.github/workflows/android.yml

@@ -6,29 +6,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
     - name: Install GNU C++ compiler
       run: |
         sudo apt-get update
         sudo apt-get install -y g++
-    - name: Setup JDK 1.11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.11
-    - name: Setup Android SDK
-      uses: maxim-lobanov/setup-android-tools@v1
-      with:
-        packages: |
-          build-tools;32.0.0
-          platforms;android-32
-          ndk;23.2.8568313
-          cmake;3.22.1
-        cache: true
+    - name: Switch to JDK 11
+      run: export JAVA_HOME=$JAVA_HOME_11_X64
+    - name: Install required Android SDK packages
+      run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.22.1" "ndk;23.2.8568313"
     - name: Build required modules
       run: |
-        export ANDROID_SDK_ROOT=$ANDROID_HOME
         export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
         pushd app/jni
         ./build_boost.sh
@@ -38,7 +28,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew --no-daemon assembleDebug
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: android-apks
         path: app/build/outputs/apk/debug/*.apk
@@ -46,27 +36,19 @@ jobs:
   build-binary:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
     - name: Install GNU C++ compiler
       run: |
         sudo apt-get update
         sudo apt-get install -y g++
-    - name: Setup JDK 1.11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.11
-    - name: Setup Android SDK
-      uses: maxim-lobanov/setup-android-tools@v1
-      with:
-        packages: |
-          ndk;23.2.8568313
-          cmake;3.22.1
-        cache: true
+    - name: Switch to JDK 11
+      run: export JAVA_HOME=$JAVA_HOME_11_X64
+    - name: Install required Android SDK packages
+      run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.22.1" "ndk;23.2.8568313"
     - name: Build required modules
       run: |
-        export ANDROID_SDK_ROOT=$ANDROID_HOME
         export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
         pushd binary/jni
         ./build_boost.sh
@@ -84,12 +66,12 @@ jobs:
         ./build-archive
         popd
     - name: Upload binaries archive
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: android-binaries
         path: binary/libs/*
     - name: Upload binaries package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: android-binaries-pack
         path: contrib/binary_pack/i2pd_*_android_binary.zip

README.md

@@ -35,7 +35,7 @@ cd /tmp/android-sdk
 wget https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip
 unzip commandlinetools-linux-8092744_latest.zip
 # install required tools
-./cmdline-tools/bin/sdkmanager --sdk_root=/opt/android-sdk "build-tools;31.0.0" "cmake;3.18.1" "ndk;21.4.7075529"
+./cmdline-tools/bin/sdkmanager --sdk_root=/opt/android-sdk "build-tools;33.0.1" "cmake;3.22.1" "ndk;23.2.8568313"
 ```
 
 ### Clone repository with submodules
@@ -47,8 +47,11 @@ git clone --recurse-submodules https://github.com/PurpleI2P/i2pd-android.git
 ### Compile application
 
 ```bash
-export ANDROID_SDK_ROOT=/opt/android-sdk
-export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/21.4.7075529
+# if you are not using Java 11 by default:
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
+export ANDROID_HOME=/opt/android-sdk
+export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
 
 pushd app/jni
 ./build_boost.sh
@@ -69,7 +72,7 @@ Java 11 can be downloaded from [jdk.java.com](https://jdk.java.net/java-se-ri/11
 
 Download Android SDK command line tools for Windows, unpack and install it replacing `--sdk_root=` path.
 
-`ANDROID_SDK_ROOT` variable must point to SDK using linux-way path, like `/c/dev/android-sdk` when SDK installed to `C:\dev\android-sdk`.
+`ANDROID_HOME` variable must point to SDK using linux-way path, like `/c/dev/android-sdk` when SDK installed to `C:\dev\android-sdk`.
 
 Gradle can be called with `./gradlew` command inside project root, or you can install it using `pacman` and call `gradle` like on linux.
 

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "org.purplei2p.i2pd"
         targetSdkVersion 33
         minSdkVersion 16
-        versionCode 2460000
-        versionName "2.46.0"
+        versionCode 2500000
+        versionName "2.50.0"
         archivesBaseName += "-$versionName"
         ndkVersion "23.2.8568313"
 

app/jni/build_boost.sh

@@ -70,8 +70,8 @@ checkPreRequisites
 cd boost
 
 # disable verbose output
-sed -i -e 's/d+2/d+0/' build-android.sh
-sed -i -e 's/\"23\.1\"\|\"25\.0\"/\"23\.1\"\|\"23\.2\"\|\"25\.0\"/' build-android.sh
+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

app/jni/build_miniupnpc.sh

@@ -37,8 +37,8 @@ function checkPreRequisites {
 		exit
 	fi
 
-	if [ -z "$ANDROID_SDK_ROOT" -a "$ANDROID_SDK_ROOT" == "" ]; then
-		echo -e "\033[31mFailed! ANDROID_SDK_ROOT is empty. Run 'export ANDROID_SDK_ROOT=[PATH_TO_NDK]'\033[0m"
+	if [ -z "$ANDROID_HOME" -a "$ANDROID_HOME" == "" ]; then
+		echo -e "\033[31mFailed! ANDROID_HOME is empty. Run 'export ANDROID_HOME=[PATH_TO_NDK]'\033[0m"
 		exit
 	fi
 
@@ -83,7 +83,7 @@ cd miniupnp/miniupnpc
 rm -rf build out
 
 # add cmake from Android SDK to PATH
-PATH=$ANDROID_SDK_ROOT/cmake/$CMAKE_VERSION/bin:$PATH
+PATH=$ANDROID_HOME/cmake/$CMAKE_VERSION/bin:$PATH
 
 if (( $# == 0 )); then
 	build x86_64 arm64 arm x86

app/src/main/res/values-zh-rCN/strings.xml

@@ -9,7 +9,7 @@
     <string name="action_reload_tunnels_config">重新加载隧道</string>
     <string name="action_start_webview">打开网页控制台</string>
     <string name="action_settings">设置</string>
-    <string name="graceful_stop_is_already_in_progress">已经平滑退出了 I2P 网络</string>
+    <string name="graceful_stop_is_already_in_progress">平滑退出已在进行...</string>
     <string name="graceful_stop_is_in_progress">正在平滑退出</string>
     <string name="gracefulShutdownInProgress">正在平滑关闭 剩余时间:</string>
     <string name="already_stopped">已停止</string>

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

@@ -0,0 +1,3 @@
+* Updated codebase to 2.46.1
+* Switch to OpenSSL 1.1.1t
+* Update Boost building scripts

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

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

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

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

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

@@ -0,0 +1,2 @@
+* Updated codebase to 2.48.0 with SOCKS5 authorization fix (2.48.0-3-g07c5291)
+* Updated OpenSSL to 1.1.1u

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

@@ -0,0 +1,2 @@
+* Updated codebase to 2.49.0
+* Updated OpenSSL to 1.1.1w

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

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