Beta 2.12.0

.github/workflows/build.yml

@@ -21,10 +21,13 @@ jobs:
       - name: Checkout submodules
         run: git submodule update --init --recursive
 
-      - name: Set up NDK
-        uses: nttld/setup-ndk@ed92fe6cadad69be94a966a7ee3271275e62f779 # v1
-        with:
-          ndk-version: r25b
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Install required NDK
+        run: |
+          yes | sdkmanager --licenses
+          sdkmanager "ndk;29.0.13113456"
 
       - name: Install liboqs dependencies
         run: |

.github/workflows/codeql.yml

@@ -27,16 +27,21 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1
-
       - name: Initialize CodeQL
         uses: github/codeql-action/init@8dca8a82e2fa1a2c8908956f711300f9c4a4f4f6 # v2
         with:
           languages: java
 
       - name: Checkout submodules
         run: git submodule update --init --recursive
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Install required NDK
+        run: |
+          yes | sdkmanager --licenses
+          sdkmanager "ndk;29.0.13113456"
 
       - name: Set up JDK 17
         uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3

core/build.gradle

@@ -32,9 +32,9 @@ android {
     defaultConfig {
         minSdkVersion 25
         targetSdkVersion 35
-        versionCode 139
-        versionName "2.11.1"
-        ndkVersion "25.1.8937393"
+        versionCode 141
+        versionName "2.12.0"
+        ndkVersion "29.0.13113456"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'

core/src/main/AndroidManifest.xml

@@ -61,20 +61,79 @@
         <activity
             android:name="net.ivpn.core.v2.MainActivity"
             android:screenOrientation="portrait"
-            android:exported="true"
+            android:exported="false"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustNothing"
             android:launchMode="singleInstance">
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity>
+
+        <!-- Activity aliases for app icon switching -->
+        <activity-alias
+            android:name="net.ivpn.client.MainActivity"
+            android:targetActivity="net.ivpn.core.v2.MainActivity"
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-        </activity>
+        </activity-alias>
+
+        <activity-alias
+            android:name="net.ivpn.client.MainActivityWeather"
+            android:targetActivity="net.ivpn.core.v2.MainActivity"
+            android:label="@string/app_icon_name_weather"
+            android:icon="@mipmap/ic_launcher_weather"
+            android:enabled="false"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name="net.ivpn.client.MainActivityAlarmClock"
+            android:targetActivity="net.ivpn.core.v2.MainActivity"
+            android:label="@string/app_icon_name_alarm_clock"
+            android:icon="@mipmap/ic_launcher_alarm_clock"
+            android:enabled="false"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name="net.ivpn.client.MainActivityCalculator"
+            android:targetActivity="net.ivpn.core.v2.MainActivity"
+            android:label="@string/app_icon_name_calculator"
+            android:icon="@mipmap/ic_launcher_calculator"
+            android:enabled="false"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity-alias>
 
         <activity
             android:name="net.ivpn.core.vpn.local.PermissionActivity"

core/src/main/cpp/CMakeLists.txt

@@ -269,3 +269,8 @@ add_custom_command(TARGET pie_openvpn.${ANDROID_ABI} POST_BUILD
 add_dependencies(opvpnutil pie_openvpn.${ANDROID_ABI} nopie_openvpn.${ANDROID_ABI})
 add_dependencies(pie_openvpn.${ANDROID_ABI} makeassetdir)
 add_dependencies(nopie_openvpn.${ANDROID_ABI} makeassetdir)
+
+# For blur
+add_library(blurlib SHARED blur/blurlib.cpp)
+
+target_link_libraries(blurlib -ljnigraphics)