From 49ee19d785c2ccf167a4119c43d25048b12cd6ef Mon Sep 17 00:00:00 2001
From: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:36:13 +0100
Subject: [PATCH 1/4] Fix FileDetailFragment not starting
- opens on specified tab
- opens when launched from PreviewImageActivity
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
---
.../android/ui/fragment/FileDetailFragment.java | 13 +++++++------
.../android/ui/preview/PreviewImageActivity.kt | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
index b36cf8f2cd..edd6262df9 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -352,12 +352,13 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
}
});
- // FIXME file detail not opening from Media tab
- if (binding != null) {
- TabLayout.Tab tab = binding.tabLayout.getTabAt(activeTab);
- if (tab == null) return;
- binding.tabLayout.selectTab(tab);
- }
+ binding.tabLayout.post(() -> {
+ if (binding != null) {
+ TabLayout.Tab tab = binding.tabLayout.getTabAt(activeTab);
+ if (tab == null) return;
+ tab.select();
+ }
+ });
}
@Override
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
index ff6d81ded9..9ed0babe6a 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt
@@ -357,7 +357,7 @@ class PreviewImageActivity : FileActivity(), FileFragment.ContainerActivity, OnR
}
startActivity(intent)
- backToDisplayActivity()
+ finish()
}
override fun showDetails(file: OCFile, activeTab: Int) {
From 4134bca13e400369b54c4dd66bdc21deeb010d27 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:14:17 +0000
Subject: [PATCH 2/4] Update marcelklehr/get-github-handles-from-website-action
action to v1.0.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/pr-feedback.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml
index 6a01fa09b2..98d2715e2b 100644
--- a/.github/workflows/pr-feedback.yml
+++ b/.github/workflows/pr-feedback.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: The get-github-handles-from-website action
- uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
+ uses: marcelklehr/get-github-handles-from-website-action@06b2239db0a48fe1484ba0bfd966a3ab81a08308 # v1.0.1
id: scrape
with:
website: 'https://nextcloud.com/team/'
From dd68fe6162b9c89c2636f3e02b396efa03e2ff2d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:26:51 +0000
Subject: [PATCH 3/4] Update github/codeql-action action to v3.27.7
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/codeql.yml | 4 ++--
.github/workflows/scorecard.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e8289d23e1..c265dc1968 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -39,7 +39,7 @@ jobs:
with:
swap-size-gb: 10
- name: Initialize CodeQL
- uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+ uses: github/codeql-action/init@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
with:
languages: ${{ matrix.language }}
- name: Set up JDK 17
@@ -53,4 +53,4 @@ jobs:
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
./gradlew assembleDebug
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+ uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f2aecf6782..3ad37292b1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -42,6 +42,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+ uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
with:
sarif_file: results.sarif
From abe82cb47fe0803be33610d59d1e42b543ce0e03 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:36:24 +0000
Subject: [PATCH 4/4] Update daggerVersion to v2.53.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
build.gradle | 2 +-
gradle/verification-metadata.xml | 27 +++++++++++++++------------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index aabd00b24e..f52ac868e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
androidxTestVersion = "1.6.1"
appCompatVersion = '1.7.0'
checkerVersion = "3.21.2"
- daggerVersion = "2.52"
+ daggerVersion = "2.53.1"
documentScannerVersion = "1.1.1"
espressoVersion = "3.6.1"
jacoco_version = '0.8.12'
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5ed0f83735..257a761c7c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -12,6 +12,7 @@
+
@@ -14567,14 +14568,11 @@
-
+
+
+
-
-
-
-
-
@@ -14597,14 +14595,11 @@
-
+
+
+
-
-
-
-
-
@@ -15074,6 +15069,14 @@
+
+
+
+
+
+
+
+