[android] Add F-Droid metadata and enable automatic upload #1033

rtsisyk · 2021-08-07T14:43:48Z

rtsisyk commented

2021-08-07 14:43:48 +00:00

CC: @relan @rugk

👍 1

vng (Migrated from github.com) reviewed 2021-08-07 14:43:48 +00:00

relan commented

2021-08-07 15:09:31 +00:00

(Migrated from github.com)

What is "automatic upload" about exactly?

rtsisyk commented

2021-08-07 15:53:39 +00:00

What is "automatic upload" about exactly?

This patch adds version.yaml as suggested here. organicmaps/organicmaps#825 (comment)

UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+

>What is "automatic upload" about exactly? This patch adds [version.yaml]( https://git.omaps.dev/organicmaps/organicmaps/pulls/1033/files#diff-ea127981e719c1c79c8f991444e2f90f03c1edd58febc875514c65cf88cdfa9cR1 ) as suggested here. https://git.omaps.dev/organicmaps/organicmaps/issues/825#issuecomment-877426472 ``` UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ ```

👍 1

biodranik (Migrated from github.com) reviewed 2021-08-07 17:04:45 +00:00

README.md

					
				@ -27,3 +26,4 @@

				  <img src="android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg" width="400" />

				</p>

				## Features

biodranik (Migrated from github.com) commented

2021-08-07 17:04:45 +00:00

Можно уже раз сесть и больше скринов нарезать, всяких там настроек, загрузки, поисковых результатов и проч.

biodranik (Migrated from github.com) reviewed 2021-08-07 17:05:54 +00:00

android/build.gradle

biodranik (Migrated from github.com) commented

2021-08-07 17:05:53 +00:00

У нас не текущая дата должна быть, а дата последнего коммита. Т.е. если нет изменений в коде в течение недели, и потом мы пересобираем версию, номер генерится абсолютно идентичный.

biodranik (Migrated from github.com) reviewed 2021-08-07 17:06:27 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +5,4 @@

				• Fast offline search on the map and bookmarks

				• Dark mode to protect your eyes

				Organic Maps is <b>pure and organic, made with love</b>:

biodranik (Migrated from github.com) commented

2021-08-07 17:06:27 +00:00

Фдроид точно умеет html?

biodranik (Migrated from github.com) reviewed 2021-08-07 17:06:43 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

biodranik (Migrated from github.com) commented

2021-08-07 17:06:43 +00:00

Maps app!!! уже третий раз этот коммент пишу.

biodranik (Migrated from github.com) reviewed 2021-08-07 17:07:06 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

biodranik (Migrated from github.com) commented

2021-08-07 17:07:05 +00:00

Если есть тег зачёркивания, значит надо его использовать.

biodranik (Migrated from github.com) reviewed 2021-08-07 17:07:40 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

biodranik (Migrated from github.com) commented

2021-08-07 17:07:40 +00:00

~~No pesticides~~ Purely organic

~~No pesticides~~ Purely organic

biodranik (Migrated from github.com) reviewed 2021-08-07 17:08:10 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

 @ -0,0 +27,4 @@
 At Organic Maps, we believe that <b>privacy is a fundamental human right</b>:
 • Organic Maps is an indie community-driven open-source project
 • We protect privacy from Big Tech’s prying eyes

biodranik (Migrated from github.com) commented

2021-08-07 17:08:10 +00:00

your privacy

biodranik (Migrated from github.com) reviewed 2021-08-07 17:09:14 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

biodranik (Migrated from github.com) commented

2021-08-07 17:09:14 +00:00

… and only minimally required permissions are found…

relan (Migrated from github.com) reviewed 2021-08-07 18:23:49 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +5,4 @@

				• Fast offline search on the map and bookmarks

				• Dark mode to protect your eyes

				Organic Maps is <b>pure and organic, made with love</b>:

relan (Migrated from github.com) commented

2021-08-07 18:23:49 +00:00

Фдроид точно умеет html?

https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#html-descriptions

> Фдроид точно умеет html? https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/#html-descriptions

rtsisyk reviewed 2021-08-07 19:14:27 +00:00

android/build.gradle

rtsisyk commented

2021-08-07 19:14:27 +00:00

а там и стоит дата текущего коммита

rtsisyk reviewed 2021-08-07 19:14:51 +00:00

README.md

					
				@ -27,3 +26,4 @@

				  <img src="android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg" width="400" />

				</p>

				## Features

rtsisyk commented

2021-08-07 19:14:51 +00:00

нерелеватно цели и задачам данного PR

rtsisyk reviewed 2021-08-07 19:15:16 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

 @ -0,0 +27,4 @@
 At Organic Maps, we believe that <b>privacy is a fundamental human right</b>:
 • Organic Maps is an indie community-driven open-source project
 • We protect privacy from Big Tech’s prying eyes

rtsisyk commented

2021-08-07 19:15:16 +00:00

Тексты из гугл плея

rtsisyk reviewed 2021-08-07 19:15:23 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

rtsisyk commented

2021-08-07 19:15:22 +00:00

Тексты из гугл плея

biodranik (Migrated from github.com) reviewed 2021-08-07 19:22:48 +00:00

android/build.gradle

biodranik (Migrated from github.com) commented

2021-08-07 19:22:48 +00:00

Тогда нужно комментарий поменять.

biodranik (Migrated from github.com) reviewed 2021-08-07 19:23:38 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

 @ -0,0 +27,4 @@
 At Organic Maps, we believe that <b>privacy is a fundamental human right</b>:
 • Organic Maps is an indie community-driven open-source project
 • We protect privacy from Big Tech’s prying eyes

biodranik (Migrated from github.com) commented

2021-08-07 19:23:38 +00:00

Вот как раз исправим и обновим везде. Вместо размножения косяков.

biodranik (Migrated from github.com) reviewed 2021-08-07 19:23:51 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

biodranik (Migrated from github.com) commented

2021-08-07 19:23:51 +00:00

См. выше.

biodranik (Migrated from github.com) reviewed 2021-08-07 19:24:35 +00:00

biodranik (Migrated from github.com) left a comment

What else is needed from us for automated updates?

rugk commented

2021-08-07 19:28:33 +00:00

(Migrated from github.com)

/cc @IzzySoft

rtsisyk reviewed 2021-08-08 05:29:37 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

rtsisyk commented

2021-08-08 05:29:37 +00:00

Я поправил.

rtsisyk reviewed 2021-08-08 05:29:44 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

 @ -0,0 +27,4 @@
 At Organic Maps, we believe that <b>privacy is a fundamental human right</b>:
 • Organic Maps is an indie community-driven open-source project
 • We protect privacy from Big Tech’s prying eyes

rtsisyk commented

2021-08-08 05:29:44 +00:00

Поправил.

rtsisyk reviewed 2021-08-08 05:29:57 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

rtsisyk commented

2021-08-08 05:29:56 +00:00

Done

rtsisyk reviewed 2021-08-08 05:30:04 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

rtsisyk commented

2021-08-08 05:30:04 +00:00

Done

rtsisyk reviewed 2021-08-08 05:30:32 +00:00

android/build.gradle

rtsisyk commented

2021-08-08 05:30:32 +00:00

Поменял.

rtsisyk reviewed 2021-08-08 05:32:59 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +5,4 @@

				• Fast offline search on the map and bookmarks

				• Dark mode to protect your eyes

				Organic Maps is <b>pure and organic, made with love</b>:

rtsisyk commented

2021-08-08 05:32:59 +00:00

Rules are similar to Google Play.

rtsisyk reviewed 2021-08-08 05:35:23 +00:00

README.md

					
				@ -27,3 +26,4 @@

				  <img src="android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg" width="400" />

				</p>

				## Features

rtsisyk commented

2021-08-08 05:35:23 +00:00

Пусть пока в фдроид будут 4 скриншота из readme. Они вполне достойные. Про изменения скриншотов, впрочем как и про тексты давайте отдельно. Цель данного PR - добавить инфраструктуру для фдроид. После добавления патча появится возможность править в репе.

rtsisyk reviewed 2021-08-08 05:59:58 +00:00

android/src/fdroid/play/version.yaml

rtsisyk commented

2021-08-08 05:59:58 +00:00

Probably we don't need this file:

If no file for the version code was specified, code and name can be extracted from the tag: |+(\d+)||Android-([\d.]+)

https://f-droid.org/en/docs/Build_Metadata_Reference/#UpdateCheckData

Probably we don't need this file: > If no file for the version code was specified, code and name can be extracted from the tag: |\+(\d+)||Android-([\d.]+) https://f-droid.org/en/docs/Build_Metadata_Reference/#UpdateCheckData

rtsisyk reviewed 2021-08-08 06:07:28 +00:00

android/src/fdroid/play/version.yaml

rtsisyk commented

2021-08-08 06:07:28 +00:00

I am still not sure. We need to try :)

biodranik (Migrated from github.com) approved these changes 2021-08-08 06:25:20 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +22,4 @@

				• No noisy email spam

				• No push notifications

				• No crapware

				• Purely organic

biodranik (Migrated from github.com) commented

2021-08-08 06:23:52 +00:00

Надо было оставить перечёркнутым, зачем удалять?

android/src/fdroid/play/release-notes/en-US/default.txt

					
				@ -0,0 +9,4 @@

				• Display and edit multiple phone numbers

				• Reduced apk size

				• Wrong regions are not offered anymore for cross-region routing

				• Improved ETA for remote roads

biodranik (Migrated from github.com) commented

2021-08-08 06:25:14 +00:00

• You can now route to/from private roads and areas for car navigation

Этот фикс тоже попадёт в фдроид.

• You can now route to/from private roads and areas for car navigation Этот фикс тоже попадёт в фдроид.

rtsisyk reviewed 2021-08-08 06:35:43 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +22,4 @@

				• No noisy email spam

				• No push notifications

				• No crapware

				• Purely organic

rtsisyk commented

2021-08-08 06:35:43 +00:00

Наверное я не так понял. Тэг <s> в гугле не работает. Как сделаем?

Наверное я не так понял. Тэг `<s>` в гугле не работает. Как сделаем?

rtsisyk reviewed 2021-08-08 06:44:33 +00:00

android/src/fdroid/play/release-notes/en-US/default.txt

					
				@ -0,0 +9,4 @@

				• Display and edit multiple phone numbers

				• Reduced apk size

				• Wrong regions are not offered anymore for cross-region routing

				• Improved ETA for remote roads

rtsisyk commented

2021-08-08 06:44:33 +00:00

Добавил...

rtsisyk reviewed 2021-08-08 06:45:09 +00:00

android/src/fdroid/play/version.yaml

rtsisyk commented

2021-08-08 06:45:09 +00:00

It looks like we still need it: https://gitlab.com/fdroid/fdroidserver/-/blob/master/fdroidserver/checkupdates.py#L145
Without this file, it will check build.gradle.

It looks like we still need it: https://gitlab.com/fdroid/fdroidserver/-/blob/master/fdroidserver/checkupdates.py#L145 Without this file, it will check build.gradle.

biodranik (Migrated from github.com) reviewed 2021-08-08 07:26:37 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +22,4 @@

				• No noisy email spam

				• No push notifications

				• No crapware

				• Purely organic

biodranik (Migrated from github.com) commented

2021-08-08 07:26:37 +00:00

Список работающих тегов https://stackoverflow.com/questions/11071127/google-play-app-description-formatting

Попробуй так: N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶

Список работающих тегов https://stackoverflow.com/questions/11071127/google-play-app-description-formatting Попробуй так: N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶

biodranik (Migrated from github.com) reviewed 2021-08-08 07:28:05 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +22,4 @@

				• No noisy email spam

				• No push notifications

				• No crapware

				• Purely organic

biodranik (Migrated from github.com) commented

2021-08-08 07:28:05 +00:00

N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶

rtsisyk reviewed 2021-08-08 16:15:32 +00:00

android/src/fdroid/play/listings/en-US/full-description.txt

					
				@ -0,0 +22,4 @@

				• No noisy email spam

				• No push notifications

				• No crapware

				• Purely organic

rtsisyk commented

2021-08-08 16:15:32 +00:00

Ух ты какое читерство :) Применил вручную, потестируем.

IzzySoft commented

2021-08-11 07:15:59 +00:00

(Migrated from github.com)

What else is needed from us for automated updates?

Where to find the literal values for versionCode and versionName? Tag names should match one of those. Assuming e.g. the latter is found as version in package.json:

"version": "1.0.0",

the tag name should contain that as the only variable content, e.g. v1.0.0 or v1.0.0-fdroid would be fine. F-Droid then would need to know how to find the two, as @rtsisyk points out here.

> What else is needed from us for automated updates? Where to find the literal values for `versionCode` and `versionName`? Tag names should match one of those. Assuming e.g. the latter is found as `version` in `package.json`: ```json "version": "1.0.0", ``` the tag name should contain that as the only variable content, e.g. `v1.0.0` or `v1.0.0-fdroid` would be fine. F-Droid then would need to know how to find the two, as @rtsisyk [points out here](#issuecomment-894671673).

rtsisyk commented

2021-08-11 08:41:06 +00:00

We tag Android build as 2021.08.11-android. Version file https://github.com/organicmaps/organicmaps/blob/master/android/src/fdroid/play/version.yaml.

Do I need to tag it again to trigger the update?

We tag Android build as 2021.08.11-android. Version file https://github.com/organicmaps/organicmaps/blob/master/android/src/fdroid/play/version.yaml. Do I need to tag it again to trigger the update?

rtsisyk commented

2021-08-11 08:46:59 +00:00

I don't see new metadata on the web-site https://f-droid.org/ru/packages/app.organicmaps/ :(

IzzySoft commented

2021-08-11 12:06:38 +00:00

(Migrated from github.com)

Do I need to tag it again to trigger the update?

The current metadata have:

AutoUpdateMode: Version
UpdateCheckMode: Tags
UpdateCheckData: android/src/fdroid/play/version.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
CurrentVersion: 2021.08.08-7-FDroid
CurrentVersionCode: 21080807

I see no tag for 2021.08.11-android – the only newer tag I see is 2021.08.09-1-ios which should not be relevant here. But then I don't see a 2021.08.08-7-FDroid tag either – that build seems to have come from that *-ios tag (going by the commit hash of the corresponding build block). As it's currently set up, F-Droid will build each tag regardless of its name, as long as versionCode in the corresponding android/src/fdroid/play/version.yaml has been increased.

And yes: if you want a newer version, you need to create the corresponding tag.

I don't see new metadata on the web-site f-droid.org/ru/packages/app.organicmaps :(

That's either because it has not yet been tagged by you – or rather because 2021.08.08-7 did not arrive there yet (newest APK I see there is 2021.08.05-15). A build cycle on average takes between 2 and 5 days, so the 2021.08.08-7 is most likely not yet published. Last build cycle completed yesterday and is now waiting for signing and publication, it's most likely part of that batch.

> Do I need to tag it again to trigger the update? The current metadata have: ```yaml AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: android/src/fdroid/play/version.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ CurrentVersion: 2021.08.08-7-FDroid CurrentVersionCode: 21080807 ``` I see no tag for `2021.08.11-android` – the only newer tag I see is `2021.08.09-1-ios` which should not be relevant here. But then I don't see a `2021.08.08-7-FDroid` tag either – that build seems to have come from that `*-ios` tag (going by the commit hash of the corresponding build block). As it's currently set up, F-Droid will build each tag regardless of its name, as long as `versionCode` in the corresponding `android/src/fdroid/play/version.yaml` has been increased. And yes: if you want a newer version, you need to create the corresponding tag. > I don't see new metadata on the web-site f-droid.org/ru/packages/app.organicmaps :( That's either because it has not yet been tagged by you – or rather because 2021.08.08-7 did not arrive there yet (newest APK I see there is 2021.08.05-15). A build cycle on average takes between 2 and 5 days, so the 2021.08.08-7 is most likely not yet published. Last build cycle completed yesterday and is now waiting for signing and publication, it's most likely part of that batch.

rtsisyk commented

2021-08-11 12:55:08 +00:00

I see no tag for 2021.08.11-android – the only newer tag I see is 2021.08.09-1-ios which should not be relevant here. But then I don't see a 2021.08.08-7-FDroid tag either – that build seems to have come from that *-ios tag (going by the commit hash of the corresponding build block).

There was 2021.08.08-7-android, but I removed it as asked by @relan: organicmaps/organicmaps#825 (comment)

As it's currently set up, F-Droid will build each tag regardless of its name, as long as versionCode in the corresponding android/src/fdroid/play/version.yaml has been increased

I think it is fine. Please correct me if I am wrong that in the current setup tags don't matter and they are only needed to trigger the version check. A new version will be created if and only if we have a) Some tag (any one!) b) Updated version.yaml

> I see no tag for 2021.08.11-android – the only newer tag I see is 2021.08.09-1-ios which should not be relevant here. But then I don't see a 2021.08.08-7-FDroid tag either – that build seems to have come from that *-ios tag (going by the commit hash of the corresponding build block). There was `2021.08.08-7-android`, but I removed it as asked by @relan: https://git.omaps.dev/organicmaps/organicmaps/issues/825#issuecomment-895230076 > As it's currently set up, F-Droid will build each tag regardless of its name, as long as versionCode in the corresponding android/src/fdroid/play/version.yaml has been increased I think it is fine. Please correct me if I am wrong that in the current setup tags don't matter and they are only needed to trigger the version check. A new version will be created if and only if we have a) Some tag (any one!) b) Updated version.yaml

IzzySoft commented

2021-08-11 22:02:27 +00:00

(Migrated from github.com)

I'd say your summary is correct. Especially if relan already OK'ed it (I noticed this too late). It might look weird that you make special *-ios tags which might still end up in a new Android version – but if that's fine with you, I won't argue.

I'd say your summary is correct. Especially if relan already OK'ed it (I noticed this too late). It might look weird that you make special `*-ios` tags which might still end up in a new Android version – but if that's fine with you, I won't argue.

biodranik commented

2021-08-12 12:44:26 +00:00

(Migrated from github.com)

That's not fine. @rtsisyk let's make sure that ios tags won't hit the FDroid repo.

relan commented

2021-08-13 09:29:18 +00:00

(Migrated from github.com)

Only tags with the android suffix will be checked now: 50d9e68e2c/metadata/app.organicmaps.yml (L268) (it's a regex)

Only tags with the `android` suffix will be checked now: https://gitlab.com/fdroid/fdroiddata/-/blob/50d9e68e2c29f1d9b7daf7f9bc65f667b7ffce0b/metadata/app.organicmaps.yml#L268 (it's a regex)

👍 3 🎉 1

rtsisyk commented

2021-08-14 05:18:27 +00:00

Bumped version to 2021.08.14-4-android, let's try.

rtsisyk commented

2021-08-19 05:48:36 +00:00

I see new metadata and screenshots, but not the latest build, unfortunately.

I see new metadata and screenshots, but not the latest build, unfortunately. ![Screenshot_20210819-084818_F-Droid](https://user-images.githubusercontent.com/1799054/130014798-d621f906-0c37-4efa-985f-f1b23f24818f.jpg)

IzzySoft commented

2021-08-19 07:49:21 +00:00

(Migrated from github.com)

@rtsisyk it's still in the build queue. The last index was released 5 days ago (as this was merged only then, it couldn't have been part of it) – so this "latest build" cannot have been part of it. It was just built yesterday (successfully), so it will ship when that build cycle is finished (we're still waiting for the last batch to make it to the index, so this will most likely be in the second to next index release, hopefully on the weekend).

@rtsisyk it's still in the build queue. The last index was released 5 days ago (as this was merged only then, it couldn't have been part of it) – so this "latest build" cannot have been part of it. It was just [built yesterday](https://monitor.f-droid.org/builds/log/app.organicmaps/21081404) (successfully), so it will ship when that build cycle is finished (we're still waiting for the last batch to make it to the index, so this will most likely be in the second to next index release, hopefully on the weekend).

rtsisyk commented

2021-08-20 07:21:21 +00:00

No worries. I just thought that we still have something wrong in our configuration. Let's wait for the next update.

IzzySoft commented

2021-08-20 11:34:05 +00:00

(Migrated from github.com)

No, all fine. Hope deploy won't be stuck for long (current cycle is ready, waiting for signing (which is a manual step) and deploy – the latter is where the previous cycle must still be hanging as it never arrived in the index. That's still our main bottleneck; we're working on solutions, but it will still take time to establish them).

This repo is archived. You cannot comment on pull requests.

No reviewers

vng

biodranik