From c4ba808bf9e2ab6735320534589e04945c983695 Mon Sep 17 00:00:00 2001
From: Fahim Masud Choudhury <fahim.choudhury@murena.io>
Date: Wed, 23 Jul 2025 12:30:19 +0600
Subject: [PATCH 1/2] chore: update nc-android-lib to v2.0.3 to fix eDrive sync
 issue on SSO account set up

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5c806d348..40111597f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -253,7 +253,7 @@ dependencies {
     implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2
     implementation 'com.google.code.gson:gson:2.10.1'
-    implementation("foundation.e:Nextcloud-Android-Library:2.0.2-u2.17-release") {
+    implementation("foundation.e:Nextcloud-Android-Library:2.0.3-u2.17-release") {
         exclude group: 'foundation.e.dav4jvm', module: 'dav4jvm'
         exclude group: 'com.gitlab.bitfireAT', module: 'dav4jvm'
         exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version
-- 
GitLab


From 4ef1845f902e69bd21685a32765d03d03f36be3c Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 23 Jul 2025 14:10:12 +0530
Subject: [PATCH 2/2] ci: generate apks only if branch is protected

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e186dac9f..7aac89442 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,6 +69,9 @@ build-staging:
 
 init_submodules:
   stage: gitlab_release
+  rules:
+    - if: '$CI_COMMIT_REF_PROTECTED == "true"'
+    - when: manual
   script:
     - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo
   artifacts:
-- 
GitLab