android/README.md | 14 +
android/source/lint-baseline.xml | 72 ----------
android/source/src/main/play/listings/en-US/graphics/icon.png | 1
3 files changed, 18 insertions(+), 69 deletions(-)
New commits:
commit 69189de8fa9a9d4973a4304a82780d32e79fbe6f
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 16 09:26:44 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 16 12:14:04 2024 +0200
tdf#157009 android: Add icon symlink for F-Droid
Add a symlink to the app icon at the expected
location when using the Triple-T data structure
that can be used to provide metadata for F-Droid. [1]
As Android Viewer currently uses a non-default directory layout,
this currently needs to be placed in a different subdirectory than
the actual source code in order for F-Droid to find it, see the
discussion in [2] for more details.
This should cause the app icon to show up in F-Droid
after the next update.
[1]
https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#triple-t-structure
[2]
https://gitlab.com/fdroid/fdroiddata/-/merge_requests/13643#note_1538888683
Change-Id: Ic1a987e430b6e92134ac19d7f1c264953cd3cf0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167732
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/android/README.md b/android/README.md
index 919122df38d1..186208c3e118 100644
--- a/android/README.md
+++ b/android/README.md
@@ -310,3 +310,17 @@ Anyway, our current "experimental" apps are not based on
`NativeActivity`.
They have normal Java code for the activity, and just call out to a single,
app-specific native library (called `liblo-native-code.so`) to do all the
heavy lifting.
+
+## Triple-T metadata for F-Droid
+
+The subdirectory `source/src/main/play` contains data in the Triple-T
+structure that F-Droid evaluates to extract metadata.
+
+More information:
+<https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#triple-t-structure>
+
+As Android Viewer currently uses a non-default directory layout,
+this currently needs to be placed in a different subdirectory than
+the actual source code in order for F-Droid to find it, see the
+[related
discussion](<https://gitlab.com/fdroid/fdroiddata/-/merge_requests/13643#note_1538888683>)
+for more details.
diff --git a/android/source/src/main/play/listings/en-US/graphics/icon.png
b/android/source/src/main/play/listings/en-US/graphics/icon.png
new file mode 120000
index 000000000000..f3e316efb456
--- /dev/null
+++ b/android/source/src/main/play/listings/en-US/graphics/icon.png
@@ -0,0 +1 @@
+../../../../../../ic_launcher-web.png
\ No newline at end of file
commit e63fa1ab17a082b14927079cfc04843061024947
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 16 09:07:30 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 16 12:13:57 2024 +0200
android lint: Udate lint-baseline.xml
Some of the issues have been addressed in
the meanwhile, so regenerate the file to
reflect that.
Change-Id: I5c0f8a112cf02a89fe652c79ed8d70213f6fbc1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167725
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/android/source/lint-baseline.xml b/android/source/lint-baseline.xml
index d973b4c4b078..d78cdfca6bd4 100644
--- a/android/source/lint-baseline.xml
+++ b/android/source/lint-baseline.xml
@@ -8,7 +8,7 @@
errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="AndroidManifest.xml"
- line="10"
+ line="9"
column="36"/>
</issue>
@@ -67,17 +67,6 @@
column="25"/>
</issue>
- <issue
- id="CommitPrefEdits"
- message="`SharedPreferences.edit()` without a corresponding `commit()`
or `apply()` call"
- errorLine1=" preferences.edit().putString(SELECTED_LANG, lang);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/java/org/libreoffice/LocaleHelper.java"
- line="49"
- column="9"/>
- </issue>
-
<issue
id="DefaultLocale"
message="Implicitly using the default locale is a common source of
bugs: Use `String.format(Locale, ...)` instead"
@@ -89,17 +78,6 @@
column="16"/>
</issue>
- <issue
- id="AppBundleLocaleChanges"
- message="Found dynamic locale changes, but did not find corresponding
Play Core library calls for downloading languages and splitting by language is
not disabled in the `bundle` configuration"
- errorLine1=" cfg.locale = locale;"
- errorLine2=" ~~~~~~">
- <location
- file="src/java/org/libreoffice/LocaleHelper.java"
- line="40"
- column="13"/>
- </issue>
-
<issue
id="InflateParams"
message="Avoid passing `null` as the view root (needed to resolve
layout parameters on the inflated layout's root element)"
@@ -122,50 +100,6 @@
column="79"/>
</issue>
- <issue
- id="QueryPermissionsNeeded"
- message="Consider adding a `<queries>` declaration to your manifest
when calling this method; see https://g.co/dev/packagevisibility for details"
- errorLine1=" if
(takePictureIntent.resolveActivity(mContext.getPackageManager()) != null) {"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/java/org/libreoffice/FormattingController.java"
- line="370"
- column="31"/>
- </issue>
-
- <issue
- id="QueryPermissionsNeeded"
- message="Consider adding a `<queries>` declaration to your manifest
when calling this method; see https://g.co/dev/packagevisibility for details"
- errorLine1="
.queryIntentActivities(takePictureIntent, PackageManager.MATCH_DEFAULT_ONLY);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/java/org/libreoffice/FormattingController.java"
- line="386"
- column="26"/>
- </issue>
-
- <issue
- id="GradleDependency"
- message="A newer version of com.google.android.material:material than
1.11.0 is available: 1.12.0"
- errorLine1=" implementation
'com.google.android.material:material:1.11.0'"
- errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="build.gradle"
- line="35"
- column="20"/>
- </issue>
-
- <issue
- id="UnsupportedChromeOsCameraSystemFeature"
- message="You should look for any camera available on the device, not
just the rear"
- errorLine1=" if
(!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA))
{"
- errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/java/org/libreoffice/FormattingController.java"
- line="363"
- column="14"/>
- </issue>
-
<issue
id="SpUsage"
message="Should use "`sp`" instead of "`dp`" for
text sizes"
@@ -184,7 +118,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="AndroidManifest.xml"
- line="109"
+ line="108"
column="13"/>
</issue>
@@ -1436,7 +1370,7 @@
errorLine2="
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/java/org/libreoffice/ui/LibreOfficeUIActivity.java"
- line="430"
+ line="407"
column="13"/>
</issue>
