Merge branch 'v1.12'

.github/workflows/release-net.yml

@@ -83,8 +83,6 @@ jobs:
       run: |
         make manifestlink Flavor=Net
 
-
-
     - name: Build APK (net)
       env:
         KeyStore: "${{ github.workspace }}/kp2a.keystore"
@@ -93,6 +91,22 @@ jobs:
       run: |
         make Configuration=Release Flavor=Net
 
+
+    - name: Install NuGet dependencies (nonet)
+      run: make nuget Flavor=NoNet
+
+    - name: Use the _nonet manifest
+      run: |
+        make manifestlink Flavor=NoNet
+
+    - name: Build APK (NoNet)
+      env:
+        KeyStore: "${{ github.workspace }}/kp2a.keystore"
+        MyAndroidSigningStorePass: ${{ secrets.KEY_STORE_PASSWORD }}
+        MyAndroidSigningKeyPass: ${{ secrets.KEY_PASSWORD }}
+      run: |
+        make Configuration=Release Flavor=NoNet        
+
     - name: List files
       shell: bash
       run: |
@@ -101,11 +115,11 @@ jobs:
     - name: Archive production artifacts (net)
       uses: actions/upload-artifact@v4
       with:
-        name: signed APK ('net' built on ${{ github.job }})
+        name: signed APKs (built on ${{ github.job }})
         path: |
           src/keepass2android-app/bin/Release/net8.0-android/*-Signed.apk
     
-    - name: Upload APK to GitHub Release
+    - name: Upload APKs to GitHub Release
       uses: softprops/action-gh-release@v2
       if: github.ref_type == 'tag'
       with:

.github/workflows/release.yml

@@ -0,0 +1,127 @@
+name: Create keepass2android release
+env:
+  NAME: 'Release'
+
+on:
+  release:
+    types: [published]  # Trigger when a new GitHub release is published
+  workflow_dispatch: # For manual testing
+
+jobs:
+
+  build-release:
+
+    runs-on: windows-2022
+
+
+
+    steps:
+    
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Extract key store
+      env: 
+        KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+        KeyStore: "${{ github.workspace }}/kp2a.keystore"
+        
+      shell: bash
+      run: |
+        echo $KeyStore
+        echo $KEYSTORE_BASE64 | base64 --decode > $KeyStore
+
+        
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: ${{ runner.os }}-nuget-${{ hashFiles('src/**/*.csproj', 'src/**/packages.config') }}
+        restore-keys: |
+          ${{ runner.os }}-nuget-
+
+    # Workaround an issue when building on windows-2022. Error was
+    #       D8 : OpenJDK 64-Bit Server VM warning : INFO: os::commit_memory(0x00000000ae400000, 330301440, 0) failed; error='The paging file is too small for this operation to complete' (DOS error/errno=1455) [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
+    #       C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Xamarin\Android\Xamarin.Android.D8.targets(81,5): error MSB6006: "java.exe" exited with code 1. [D:\a\keepass2android\keepass2android\src\keepass2android\keepass2android-app.csproj]
+    - name: Configure Pagefile
+      uses: al-cheb/configure-pagefile-action@a3b6ebd6b634da88790d9c58d4b37a7f4a7b8708 # v1.4
+      with:
+        minimum-size: 8GB
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+      # If we want to also have nmake, use this instead
+      #uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Switch to JDK-17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Display java version
+      run: java -version
+
+    - name: Build native dependencies
+      shell: cmd
+      run: |
+        make native
+
+    - name: Build java dependencies
+      shell: cmd
+      run: |
+        make java
+
+    - name: Install NuGet dependencies (net)
+      run: make nuget Flavor=Net
+
+    - name: Use the _net manifest
+      run: |
+        make manifestlink Flavor=Net
+
+    - name: Build APK (net)
+      env:
+        KeyStore: "${{ github.workspace }}/kp2a.keystore"
+        MyAndroidSigningStorePass: ${{ secrets.KEY_STORE_PASSWORD }}
+        MyAndroidSigningKeyPass: ${{ secrets.KEY_PASSWORD }}
+      run: |
+        make Configuration=Release Flavor=Net
+
+
+    - name: Install NuGet dependencies (nonet)
+      run: make nuget Flavor=NoNet
+
+    - name: Use the _nonet manifest
+      run: |
+        make manifestlink Flavor=NoNet
+
+    - name: Build APK (NoNet)
+      env:
+        KeyStore: "${{ github.workspace }}/kp2a.keystore"
+        MyAndroidSigningStorePass: ${{ secrets.KEY_STORE_PASSWORD }}
+        MyAndroidSigningKeyPass: ${{ secrets.KEY_PASSWORD }}
+      run: |
+        make Configuration=Release Flavor=NoNet        
+
+    - name: List files
+      shell: bash
+      run: |
+        ls src/keepass2android-app/bin/**/*.*
+
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: signed APK (built on ${{ github.job }})
+        path: |
+          src/keepass2android-app/bin/Release/net8.0-android/*-Signed.apk
+    
+    - name: Upload APK to GitHub Release
+      uses: softprops/action-gh-release@v2
+      if: github.ref_type == 'tag'
+      with:
+        files: |
+            src/keepass2android-app/bin/Release/net8.0-android/*-Signed.apk

src/keepass2android-app/Manifests/AndroidManifest_net.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-			android:versionCode="211"
+      android:versionCode="212"
-			android:versionName="1.12-r7"
+      android:versionName="1.12-r8"
       package="keepass2android.keepass2android"
       xmlns:tools="http://schemas.android.com/tools"
       android:installLocation="auto">
@@ -46,12 +46,10 @@
 
   <permission android:description="@string/permission_desc2" android:icon="@drawable/ic_launcher" android:label="KP2A entry search" android:name="keepass2android.keepass2android.permission.KP2aInternalSearch" android:protectionLevel="signature" />
   <permission android:description="@string/permission_desc3" android:icon="@drawable/ic_launcher" android:label="KP2A choose autofill dataset" android:name="keepass2android.keepass2android.permission.Kp2aChooseAutofill" android:protectionLevel="signature" />
-
   <application android:label="keepass2android"
     android:icon="@mipmap/ic_launcher_online"
     android:roundIcon="@mipmap/ic_launcher_online_round"
     android:networkSecurityConfig="@xml/network_security_config"
-
   >
 
     <meta-data
@@ -107,16 +105,15 @@
       </intent-filter>
     </activity>
     <activity android:name="keepass2android.softkeyboard.InputLanguageSelection"
-              
                android:exported="true">
-      <!-- android:label="@string/language_selection_title" TODO  -->
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <action android:name="keepass2android.softkeyboard.INPUT_LANGUAGE_SELECTION"/>
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
-    <activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity"  android:windowSoftInputMode="adjustResize" android:exported="true">
+    <activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity" android:windowSoftInputMode="adjustResize"
+    android:exported="true">
       <intent-filter android:label="@string/app_name">
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />

src/keepass2android-app/Manifests/AndroidManifest_nonet.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-			android:versionCode="200" 
+      android:versionCode="212"
-			android:versionName="1.11-r0" 
+      android:versionName="1.12-r8"
       package="keepass2android.keepass2android_nonet"
       xmlns:tools="http://schemas.android.com/tools"
       android:installLocation="auto">
@@ -11,6 +11,9 @@
     <!-- Specific intents and packages we query for (required since Android 11) -->
     <package android:name="keepass2android.plugin.keyboardswap2" />
     <package android:name="keepass2android.AncientIconSet" />
+    <package android:name="keepass2android.plugin.qr" />
+    <package android:name="it.andreacioni.kp2a.plugin.keelink" />
+    <package android:name="com.inputstick.apps.kp2aplugin" />
     <package android:name="com.dropbox.android" />
 
     <intent>
@@ -39,13 +42,13 @@
       <action android:name="android.intent.action.VIEW" />
     </intent>
   </queries>
-			
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
+
   <permission android:description="@string/permission_desc2" android:icon="@drawable/ic_launcher_offline" android:label="KP2A entry search" android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalSearch" android:protectionLevel="signature" />
   <permission android:description="@string/permission_desc3" android:icon="@drawable/ic_launcher_offline" android:label="KP2A choose autofill dataset" android:name="keepass2android.keepass2android_nonet.permission.Kp2aChooseAutofill" android:protectionLevel="signature" />
-	<application 
+  <application android:label="keepass2android"
-		android:label="keepass2android" 
     android:icon="@mipmap/ic_launcher_offline"
+    android:roundIcon="@mipmap/ic_launcher_offline_round"
     android:networkSecurityConfig="@xml/network_security_config"
   >
 
@@ -78,7 +81,6 @@
       </intent-filter>
     </activity>
     <activity android:name="keepass2android.softkeyboard.InputLanguageSelection"
-                android:label="@string/language_selection_title"
                android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
@@ -86,7 +88,6 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
- 
     <activity android:configChanges="orientation|keyboard|keyboardHidden" android:label="@string/app_name" android:theme="@style/Kp2aTheme_BlueNoActionBar" android:name="keepass2android.SelectCurrentDbActivity" android:windowSoftInputMode="adjustResize"
     android:exported="true">
       <intent-filter android:label="@string/app_name">
@@ -218,15 +219,6 @@ The scheme=file is still there for old OS devices. It's also queried by apps lik
         <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.kdb" />
       </intent-filter>
 
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-        <data
-          android:scheme="https"
-          android:host="my.yubico.com"
-          android:pathPrefix="/neo"/>
-      </intent-filter>
-	  
       <intent-filter android:label="@string/kp2a_findUrl">
         <action android:name="android.intent.action.SEND" />
         <category android:name="android.intent.category.DEFAULT" />
@@ -254,14 +246,18 @@ The scheme=file is still there for old OS devices. It's also queried by apps lik
   </application>
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+  <uses-permission android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalFileBrowsing" />
+  <uses-permission android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalSearch" />
   <uses-permission android:name="android.permission.USE_FINGERPRINT" />
   <uses-permission android:name="android.permission.USE_BIOMETRIC" />
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
   <uses-feature android:name="android.hardware.camera" android:required="false" />
 
-  <uses-permission android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalFileBrowsing" />
+  <!-- Samsung Pass permission -->
-  <uses-permission android:name="keepass2android.keepass2android_nonet.permission.KP2aInternalSearch" />
+  <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
-	
 </manifest>