Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,589 Commits 2 Branches 249 Tags
Commit Graph

5589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
darken
1ea4d0a330 Improve error messages, prevent duplicate information display. 
Fixes #1144
 2018-12-12 14:08:11 +01:00
Hans-Christoph Steiner
eb651c9996 Merge branch 'wording-fixes' into 'master' 
Wording fixes

See merge request fdroid/fdroidclient!759
 2018-12-06 18:33:48 +00:00
Jan-Christoph Borchardt
9dd64b8cbc Avoid addressing person with 'me' (when 'you' is used elsewhere) 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-12-06 18:01:08 +00:00
Jan-Christoph Borchardt
09a7ec3fd3 Change inconsistent 'Upgrade' to 'Update' 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-12-06 18:01:08 +00:00
Jan-Christoph Borchardt
5f660501e3 Change technical 'Run' to more understandable 'Open' 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-12-06 18:01:08 +00:00
Hans-Christoph Steiner
42934a6ec9 Merge branch 'index-v1.json-integer-sdk-version' into 'master' 
switch all SDK version values to integers, as per definition

See merge request fdroid/fdroidclient!763
 2018-12-06 16:35:43 +00:00
Hans-Christoph Steiner
c1db27715c switch all SDK version values to integers, as per definition 
```
sed -E -i 's,("[a-z]+SdkVersion": )"([0-9]+)",\1 \2,' app/src/test/resources/*.json
```

* fdroid/fdroidserver!596
* fdroid/fdroidserver#593
* fdroid/fdroidserver#596
 2018-12-06 16:07:56 +00:00
Hans-Christoph Steiner
589a29386c Merge branch 'fix_apk_address' into 'master' 
fix apk address

See merge request fdroid/fdroidclient!762
 2018-11-20 09:24:30 +00:00
Danial Behzadi
a912c3ea3e fix apk address 2018-11-19 11:35:04 +03:30
Hans-Christoph Steiner
f6a7029fed version code 1005000 1.5-alpha0 2018-10-19 15:30:02 +02:00
Hans-Christoph Steiner
04468d4576 update changelog 2018-10-19 15:29:18 +02:00
Hans-Christoph Steiner
071bca951e Merge branch 'weblate' into 'master' 
Weblate

See merge request fdroid/fdroidclient!758
 2018-10-19 12:55:50 +00:00
Hans-Christoph Steiner
d191d10621 Weblate 2018-10-19 12:55:50 +00:00
Hans-Christoph Steiner
255fe37dc1 Merge branch 'jsonLoader' into 'master' 
* jsonLoader: (28 commits)
  fix checkstyle complaints
  force DBHelperTest.canAddAdditionalRepos() to run on CI
  clean up whitespace in repo descriptions
  rename parseXmlRepos to parseAdditionalReposXml
  rename item lists to repoItems
  rename defaultReposFile to additionalReposFile
  separate defaultRepos from initialRepos, which includes additionalRepos
  rename REPO_XML_ARG_COUNT to REPO_XML_ITEM_COUNT
  fix additional_repos.xml handling to be properly parsed
  move comments to javadoc
  priority is NOT ignored, just additional_repos.xml is not allowed to set
  fix DBHelperTest to actually load and parse additional_repos.xml
  changed the tests: now testing only DBHelper.parseXmlRepos()
  removed stars from imports
  finished additional repos test
  some minor style changes
  minor style changes
  implemented creating xml file on oem partition; not sure whether it works cause gradle runs forever (>20min)
  started implementing test
  removed priority from additional_repos.xml
  ...

closes fdroid/fdroidclient!705
 2018-10-19 13:40:48 +02:00
Hans-Christoph Steiner
eb023887a5 fix checkstyle complaints 
* LocalFinalVariableName
* EqualsAvoidNull
* EmptyLineSeparator
* SeparatorWrap
* LineLength
 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
409846e199 force DBHelperTest.canAddAdditionalRepos() to run on CI 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
6dd4523d3c clean up whitespace in repo descriptions 
This cleans up the whitespace in the description item, since the
XML parsing will include the linefeeds and indenting in the description.
 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
1788546267 rename parseXmlRepos to parseAdditionalReposXml 2018-10-18 15:07:54 +02:00
Hans-Christoph Steiner
ec58141379 rename item lists to repoItems 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
9f3a32d986 rename defaultReposFile to additionalReposFile 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
aace086da4 separate defaultRepos from initialRepos, which includes additionalRepos 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
e8264d7dbb rename REPO_XML_ARG_COUNT to REPO_XML_ITEM_COUNT 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
b9b7dab2c4 fix additional_repos.xml handling to be properly parsed 
additional_repos.xml has 7 <item> elements per repo, while default_repos.xml
has 8.  The difference is that additional_repos.xml does not have the
"priority" <item> since it is not allowed to override anything that is set
in default_repos.xml.

see spec in !705
 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
7eb53518aa move comments to javadoc 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
b529e10c4a priority is NOT ignored, just additional_repos.xml is not allowed to set 2018-10-18 15:07:53 +02:00
Hans-Christoph Steiner
95c375ac26 fix DBHelperTest to actually load and parse additional_repos.xml 2018-10-18 15:07:53 +02:00
Dimitri Rusin
dd08655d43 changed the tests: now testing only DBHelper.parseXmlRepos() 2018-09-20 19:12:14 +00:00
Dimitri Rusin
5a6d2df3ac removed stars from imports 2018-09-20 12:19:35 +00:00
Dimitri Rusin
dc19b11ae1 finished additional repos test 2018-09-17 13:54:15 +00:00
Dimitri Rusin
59d0f7d6be some minor style changes 2018-09-17 13:54:15 +00:00
Dimitri Rusin
324cb2998b minor style changes 2018-09-17 13:54:15 +00:00
Dimitri Rusin
27e0eaad9e implemented creating xml file on oem partition; not sure whether it works cause gradle runs forever (>20min) 2018-09-17 13:54:15 +00:00
Dimitri Rusin
895166e9db started implementing test 2018-09-17 13:54:15 +00:00
Dimitri Rusin
f5a5260e3e removed priority from additional_repos.xml 2018-09-17 13:54:15 +00:00
Dimitri Rusin
9e2882451f add internal repos after additional ones 2018-09-17 13:54:15 +00:00
Dimitri Rusin
3193b7f93a syntactic improvements, plus now prioritizes correctly 2018-09-17 13:54:15 +00:00
Dimitri Rusin
a96621c6ec renamed to additional_repos.xml, now collects them on all custom partitions 2018-09-17 13:54:15 +00:00
Dimitri Rusin
51135e5684 replaced json with xml 2018-09-17 13:54:15 +00:00
Dimitri Rusin
03507804b6 started implementing xml approach with priority checking 2018-09-17 13:54:15 +00:00
Dimitri Rusin
adc1c80b77 more syntax improvements 2018-09-17 13:54:15 +00:00
Dimitri Rusin
b150a01706 improved syntax 2018-09-17 13:54:15 +00:00
Dimitri Rusin
b17a40c215 now default repos from /oem are loaded every time ./databases cannot be found 2018-09-17 13:54:15 +00:00
Hans-Christoph Steiner
e500299c24 version code 1004050 2018-09-12 14:28:20 +02:00
Hans-Christoph Steiner
907dc03253 update changelog 2018-09-12 14:28:20 +02:00
Hans-Christoph Steiner
c56e5262d3 Merge branch 'weblate' into 'master' 
Weblate

See merge request fdroid/fdroidclient!753
 2018-09-12 12:27:56 +00:00
Hans-Christoph Steiner
d386183f1a Weblate 2018-09-12 12:27:56 +00:00
Hans-Christoph Steiner
4127e235e2 Merge branch 'little-fixes' into 'master' 
two little UI fixes for the 1.4 release

See merge request fdroid/fdroidclient!752
 2018-09-12 12:18:18 +00:00
Hans-Christoph Steiner
10b9dc7f1e include Android 9.0 (28) in the versions display 2018-09-12 13:47:22 +02:00
Hans-Christoph Steiner
d11c67ead5 fix Anti-Features list display in < android-24 
Html.fromHtml() strips <li> and <ul> on Android 6.0 and older, but div works
 2018-09-12 13:40:15 +02:00
Hans-Christoph Steiner
1c7e4aac29 Merge branch 'installed-version' into 'master' 
Always display installed app version in the app version list

Closes #1572

See merge request fdroid/fdroidclient!749
 2018-09-12 11:38:32 +00:00