3711 Commits

Author SHA1 Message Date
Peter Serwylo
c55a53ec69 Ensure constants always used for fields in DBHelper. 2016-07-04 22:34:09 +10:00
Peter Serwylo
131978ad02 Refactored create table statements to use constants from schema. 2016-07-04 22:34:09 +10:00
Peter Serwylo
2ffd4ae428 Ensure constants always used for fields in RepoProvider. 2016-07-04 22:34:09 +10:00
Peter Serwylo
a8d2b2aff3 Ensure constants always used for fields in AppProvider. 2016-07-04 22:34:09 +10:00
Peter Serwylo
47fa5a94b3 Ensure constants always used for fields in ApkProvider. 2016-07-04 22:34:09 +10:00
Peter Serwylo
942cfb59d6 Merge branch 'check-bumps' into 'master'
Check tools version bumps



See merge request !348
2016-07-04 12:31:30 +00:00
Daniel Martí
7fe15e6c7d PMD: bump to 5.5.0 2016-07-04 11:32:29 +01:00
Daniel Martí
8af44b1af5 checkstyle: bump to 7.0
Remove LITERAL_DO from the config in RightCurly as we want this:

        do {
            foo;
        } while (bar);

Not this:

        do {
            foo;
        }
        while (bar);

This went unnoticed as LITERAL_DO was broken in RightCurly in earlier
Checkstyle versions.
2016-07-04 11:31:41 +01:00
Daniel Martí
3fae57c360 Merge branch 'fix-511--database-constants' into 'master'
Refactor database schema constants

**Note:** When this is merged I'll rebase !347 and remove its WIP.

## Summary

In order to do the database changes required for #511, I've found that it is difficult due to my inclination to switch between referring to database columns by either a Java constant such as `AppProvider.DataColumns.NAME` and string literals such as `"name"`. All string literals should be migrated to constants, and that will happen in my next MR. In order to prepare for this, I've gathered together the constants into one common place: `org.fdroid.fdroid.data.Schema`. This is going to be the authoritative place for the schema to be stored going forward, and will help when reasoning about the database structure. 

Although it seems large, this change is a fairly straightforward find/replace job. It also passes all tests for which there is good test coverage in the content providers.

## Changes

Create `Schema` interface to make it simpler to replace string literals with constants.

Right now, table names are in `DBHelper.TABLE_*` constants, and each tables fields are
in `*Provider.DataColumns.*` constants. This brings them all into a predictable location.
In addition, it makes it easier to statically import `Schema` so that instead of, e.g.,

* `AppProvider.DataColumns.PACKAGE_NAME`

We can choose one of the following, based on our current context:

* `Schema.AppTable.Cols.PACKAGE_NAME`
* `AppTable.Cols.PACKAGE_NAME`
* `Cols.PACKAGE_NAME`

In the worst case, it isa couple of chars shorter than now. In the best case, if we are
writing a class that primarily deals with Apps (e.g. App.java or AppProvider.java) then
we get a big win with just `Cols.PACKAGE_NAME`.

Having these things slightly shorter may seem like it is pointless, but the length of
each constant probably contributed to my lack of willingness to use constants instead
of string literals when constructing queries.

In the future, this should be moved towards something more akin to:

> http://openhms.sourceforge.net/sqlbuilder/

and I hope that extracting all the schema stuff into one interface may help that.


See merge request !346
2016-07-03 22:47:16 +00:00
F-Droid Translatebot
b6b039aa49 Pull translation updates from Weblate
Translators:

ageru                  French
ezjerry liao           Traditional Chinese
Kristjan Räts          Estonian
Nutchanon Wetchasit    Thai
Osoitz                 Basque
2016-07-03 19:24:15 +01:00
Peter Serwylo
668cc27d29 Replaced DBHelper.TABLE_INSTALLED_APP with Schema.InstalledAppTable.NAME 2016-06-30 17:09:01 +10:00
Peter Serwylo
6fb23d2efa Extracted InstalledAppProvider.DataColumns to Schema.InstalledAppTable.Cols 2016-06-30 17:06:40 +10:00
Peter Serwylo
d1ceb84af4 Replaced DBHelper.TABLE_APP with Schema.AppTable.NAME 2016-06-30 14:14:18 +10:00
Peter Serwylo
14958d48e3 Replaced DBHelper.TABLE_APK with Schema.ApkTable.NAME 2016-06-30 14:14:18 +10:00
Peter Serwylo
d1c04de71a Replaced DBHelper.TABLE_REPO with Schema.RepoTable.NAME 2016-06-30 14:14:18 +10:00
Peter Serwylo
8a155aef89 Extracted RepoProvider.DataColumns to Schema.RepoTable.Cols 2016-06-30 14:14:15 +10:00
Peter Serwylo
0ea5325b81 Extracted ApkProvider.DataColumns to Schema.ApkTable.Cols 2016-06-30 14:11:35 +10:00
Peter Serwylo
315f20df0c Extracted AppProvider.DataColumns to Schema.AppTable.Cols 2016-06-30 13:36:27 +10:00
Peter Serwylo
7c13cc26fc Create Schema interface to make it simpler to replace string literals with constants.
Right now, table names are in `DBHelper.TABLE_*` constants, and each tables fields are
in `*Provider.DataColumns.*` constants. This brings them all into a predictable location.
In addition, it makes it easier to statically import `Schema` so that instead of, e.g.,

 * `AppProvider.DataColumns.PACKAGE_NAME`

We can choose one of the following, based on our current context:

 * `Schema.AppTable.Cols.PACKAGE_NAME`
 * `AppTable.Cols.PACKAGE_NAME`
 * `Cols.PACKAGE_NAME`

In the worst case, it isa couple of chars shorter than now. In the best case, if we are
writing a class that primarily deals with Apps (e.g. App.java or AppProvider.java) then
we get a big win with just `Cols.PACKAGE_NAME`.

Having these things slightly shorter may seem like it is pointless, but the length of
each constant probably contributed to my lack of willingness to use constants instead
of string literals when constructing queries.

In the future, this should be moved towards something more akin to:

> http://openhms.sourceforge.net/sqlbuilder/

and I hope that extracting all the schema stuff into one interface may help that.
2016-06-30 13:36:23 +10:00
Daniel Martí
72c6b86376 Merge branch 'permission-fix' into 'master'
Check that permissions are a subset of listed ones

* uses containsAll() instead of equals()

Fixes #703

See merge request !344
2016-06-27 06:40:48 +00:00
Dominik Schürmann
3162e93b35 Check that permissions are a subset of listed ones
* uses containsAll() instead of equals()

Fixes #703
2016-06-26 17:48:19 +02:00
F-Droid Translatebot
5dd95754cd Pull translation updates from Weblate
Translators:

Allan Nordhøy               Norwegian Bokmål
Allan Nordhøy               Swedish
ezjerry liao                Traditional Chinese
halcyonest                  Korean
Kristjan Räts               Estonian
Mikkel Kirkgaard Nielsen    Danish
riotism                     Chinese (Hong Kong)
Thomas Craig                Simplified Chinese
xinxinxinxinxin             French
YFdyh000                    Simplified Chinese
2016-06-25 20:51:06 +01:00
Daniel Martí
07a8b7a935 Merge branch 'emulator-v23' into 'master'
CI: replace v17 emulator with v23



See merge request !340
2016-06-23 11:02:37 +00:00
Daniel Martí
3b649138bd Bump buildToolsVersions
The new CI image has 24, not 23.0.3.
2016-06-23 11:42:53 +01:00
Daniel Martí
c7fd3f238d CI: replace v17 emulator with v23 2016-06-23 11:42:53 +01:00
Peter Serwylo
64bc13de8a Use symlink instead of hardlink, which was accidentally used on API < 19.
At the same time, also changed visibility of methods to package local
to remove need for test class.
2016-06-23 11:14:43 +10:00
Daniel Martí
95d8537187 Merge branch 'gradle-changes' into 'master'
Lint updates, update ACRA

This might fix #677, although hard to tell since I cannot reproduce the issue.

See merge request !343
2016-06-22 10:30:51 +00:00
Daniel Martí
a383c7a457 Sync changelog with stable branch 2016-06-21 17:02:10 +01:00
Daniel Martí
29689338f9 Merge branch 'master' into 'master'
two more crash fixes for 0.100.1

fixed two more from the ACRA reports

See merge request !342
2016-06-21 12:47:12 +00:00
Hans-Christoph Steiner
65cbc9dc10 do not crash if there are no cache files to delete
java.lang.NullPointerException
at org.fdroid.fdroid.Utils.clearOldFiles(Utils.java:347)
at org.fdroid.fdroid.CleanCacheService.onHandleIntent(CleanCacheService.java:51)
at android.app.IntentService$ServiceHandler.handleMessage(IntentService.java:65)
at android.os.Handler.dispatchMessage(Handler.java:107)
at android.os.Looper.loop(Looper.java:194)
at android.os.HandlerThread.run(HandlerThread.java:60)
2016-06-21 14:37:01 +02:00
Daniel Martí
cd1f59fb29 Bump ACRA to 4.9.0
Also change the overrides from onCreate to init as suggested in the
changelog:

https://github.com/ACRA/acra/wiki/ChangeLog#acra-490-rc-1-2-may-2016

The behaviour should be very similar, although overriding the wrong
method (which we were doing) could cause all sorts of weird issues.
2016-06-21 13:35:29 +01:00
Daniel Martí
26f5286f97 lint: don't unnecessarily disable warnings
Those that are sometimes false positives but could still point out valid
issues should be warnings, not disabled entirely.

The first two are warnings already, the third is an error.
2016-06-21 13:26:56 +01:00
Daniel Martí
ae2def3e0d Merge branch 'master' into 'master'
a couple of fixes, including enabling lint errors to fail the CI build!

Three fixes, including enabling lint errors to fail the CI build!  Comments in the commit message. 09eea0d40bcf6b7a5612ef719177fd4ab2d2193b should be cherry-picked into stable-v0.100 for 0.100.1.  Its already in my repo as fb70aada63029e430f2b4f2fb68427e719b63753.

See merge request !341
2016-06-21 11:50:24 +00:00
Hans-Christoph Steiner
09eea0d40b ignore "java.lang.IllegalArgumentException: Could not parse [null/24]"
This is currently baffling me as to how it can happen.  This isn't a pretty
fix but it is better that letting F-Droid crash.  db9bdc31 was supposed to
make it so that only one thread at a time ever updated the static vars on
FDroidApp.

closes #690
2016-06-21 13:03:37 +02:00
Hans-Christoph Steiner
ba88bd7060 only show update notification if updates are going to happen
UpdateService.onHandleIntent() starts with a time check for whether an
update is actually scheduled.  Before, UpdateService put up a notification
when it started.  This changes it so that the notification is put up after
the check, so it should only show the notification if UpdateService is
actually going to run, and no longer when it is just waking up to check the
time.

!307 #662
2016-06-21 12:52:05 +02:00
Hans-Christoph Steiner
80b158e7d6 enable build fail on lint error to catch them in CI builds
The spongycastle issue is taking a long time to get resolved, has not yet
affected us, and would be a lot of work to fix in a different way. So the
'InvalidPackage' error is just disabled for now.
2016-06-21 12:52:05 +02:00
Daniel Martí
015343f9df Bump to 0.101-alpha1 v0.101-alpha1 2016-06-20 21:52:26 +01:00
F-Droid Translatebot
d718528466 Pull translation updates from Weblate
Translators:

Danial Behzadi     Persian
ezjerry liao       Traditional Chinese
Marian Hanzel      Slovak
xinxinxinxinxin    French
2016-06-20 21:51:32 +01:00
Daniel Martí
34aa8ab062 Merge branch 'apkfileprovider' into 'master'
Provide content Uris to downloaded apks via FileProvider

* moves apk verification back inside the Installer class
* uses support libs FileProvider for content Uris
* move apk file caching and storage methods into ApkFileProvider class

Some of the ugly version checks for Android N can be removed after Android N has been released. Unfortunately Google decided to keep SDK version at 23 for Android N dev preview and only change the CODENAME, thus ``Build.VERSION.SDK_INT <= Build.VERSION_CODES.M`` returns true on Android N preview :/ , see https://commonsware.com/blog/2016/03/17/backwards-compatibility-n-developer-preview.html

Tested on Android N dev preview 3 emulator, Android 6 stock and Android 5.1 rooted with priv extension.

See merge request !331
2016-06-20 15:44:26 +00:00
Daniel Martí
ef403928cf Merge branch 'issue-564--filter-anti-features--refactor-and-test-in-prep' into 'master'
Tests + Refactorings in preperation for #564  (Filter anti features)

As described in #564, there is a small amount of ground work to be done in order to support a UI for filtering anti features. This is the first stage of that. A subsequent MR will add a database migration to put anti features in their own table, and have a join table between apps and anti features. See commit messages for more detailed descriptions.

See merge request !339
2016-06-20 14:53:20 +00:00
Peter Serwylo
243bb1948f Added tests for two helper methods for comma separated string parsing. 2016-06-21 00:21:19 +10:00
Peter Serwylo
a192389318 Completely removed CommaSeparatedList class, replaced with two helper methods in Utils.
The two helper methods alleviate the need for copious null checks. They also provide
consistent behaviour when there are zero elements (i.e. they return null, rather than
an empty string or empty array, as was the case before).
2016-06-21 00:21:19 +10:00
Peter Serwylo
d99b357a1f Replace CommaSeparatedList with String[].
This is a combination of:
 * `String[].split(",")` and
 * `TextUtils.join(",", values)`

It seems a bit wastefull to have our own implementation of these two things
which lightly wrap this code, and produce a datastructure which is non standard
and foreign to Java developers.
2016-06-21 00:21:19 +10:00
Peter Serwylo
57c63a8e2a Test coverage of anti feature parsing in RepoUpdater. 2016-06-21 00:21:19 +10:00
Dominik Schürmann
5facd1b9a1 Proper SDK 24 version check
* not targetting SDK 24 due to
  https://gitlab.com/fdroid/fdroidserver/issues/185
2016-06-20 14:53:43 +02:00
Dominik Schürmann
16f97125d7 Provide content Uris via FileProvider
* moves apk verification back inside the Installer class
* uses support libs FileProvider for content Uris
* move apk file caching and storage methods into
ApkCache class
2016-06-20 11:07:06 +02:00
Daniel Martí
780c3968b5 Merge branch 'alpha1' into 'master'
version bumps before alpha1

The more we test these updates the better, so the best moment to update libs is now.

See merge request !338
2016-06-19 22:00:47 +00:00
Daniel Martí
4fbc327a91 Bump robolectric to 3.1 now that it's out
And remove the now unnecessary -rc justification comment.
2016-06-17 15:51:50 +01:00
Daniel Martí
3d59f4f192 Bump commons-net to 3.5 2016-06-17 15:51:50 +01:00
Daniel Martí
b71cb37cad Bump commons-io to 2.5 2016-06-17 15:51:50 +01:00