855 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Hans-Christoph Steiner
89e2c9948a fix off-by-one error in update check for db-version/56
We missed an off-by-one in my previous DB change:
90467bf8bf2f8e4a46cb1db563154df4035bf746

This causes the installed app parsing to happen on each start when on any
build that is on db-version/56.  Its not a big deal since the broken code
was not shipped at all, even in an alpha.
2016-06-16 16:50:29 +02:00
Hans-Christoph Steiner
5523a443f8 never have null Apks in InstallManagerService
In order to avoid having null guards making the code ugly, use a "blank"
instance of Apk which will work for the various comparisons.  This fixes
this crash:

fixes #688

java.lang.NullPointerException
	at org.fdroid.fdroid.installer.InstallManagerService$4.onReceive(InstallManagerService.java:243)
	at android.support.v4.content.LocalBroadcastManager.executePendingBroadcasts(LocalBroadcastManager.java:297)
	at android.support.v4.content.LocalBroadcastManager.access$000(LocalBroadcastManager.java:46)
	at android.support.v4.content.LocalBroadcastManager$1.handleMessage(LocalBroadcastManager.java:116)
	at android.os.Handler.dispatchMessage(Handler.java:102)
	at android.os.Looper.loop(Looper.java:136)
	at android.app.ActivityThread.main(ActivityThread.java:5001)
	at java.lang.reflect.Method.invokeNative(Native Method)
	at java.lang.reflect.Method.invoke(Method.java:515)
	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:785)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:601)
	at dalvik.system.NativeStart.main(Native Method)
2016-06-16 16:50:29 +02:00
Daniel Martí
e285fd6f38 Merge branch 'prep-providers-for-download-progress' into 'master'
Improve order by/selection logic for database layer.

This was extracted from the postponed !311.

The order by stuff previously only allowed specifying a particular field. We should also be able to sort based on arbitrary expressions, and such expressions will require the ability to bind arguments using the "?" syntax. This change provides a Java abstraction for the order by, and improves the handling of selection arguments that need to bind to "?" so that both the selection (i.e. `WHERE` clause) and the `ORDER BY` clause can provide arguments as required.

See merge request !329
2016-06-16 13:00:45 +00:00
Peter Serwylo
3f9370371b Make sure to query package manager for PackageInfo when required.
A previous commit accidentally pushed the code which queries the
`PackageManager` to a different method, but then still used the
`packageInfo` which was supposed to be populated by that code.

This change rectifies this, and in the process also clarifies/documents under
what circumstances the `PackageManager` needs to be queried, rather than
relying on the incoming intent.

Fixes #686.
2016-06-16 16:26:23 +10:00
Peter Serwylo
f023cd7757 Improve order by/selection logic.
The order by stuff previously only allowed specifying a particular field.
We should also be able to sort based on arbitrary expressions, and such
expressions will require the ability to bind arguments using the "?" syntax.
This changes provides a Java abstraction for the order by, and improves
the handling of selection arguments that need to bind to "?" so that both
the selection (i.e. WHERE clause) and the ORDER BY clause can provide
arguments as required.
2016-06-16 09:34:50 +10:00
Peter Serwylo
f3cb1d5bd4 Ask for all fields from the content provider.
It is not a particularly expensive operation in the scheme of things. When we
are going to the database, the bottlneck is in disk access for the actual query
of the database tables. The difference between retrieving two columns or
all the columns when the query is for a handful of apps is inconsequential.

Thus, it is better to be safe than sorry and just ask for all the things so
that our value objects are correctly populated.
2016-06-15 06:12:17 +10:00
Dominik Schürmann
174b1d108f ApkVerifier: check targetSdkVersion 2016-06-13 20:42:08 +02:00
Daniel Martí
6b18ab4204 Merge branch 'permissions-ui' into 'master'
Permissions UI in AppDetails

* Removes the "m" prefix and some unnecessary TODOs
* Re-uses the permission list from the privileged installer for the list in AppDetails:

![device-2016-06-09-234253](/uploads/0f3807f05084e763c07c9b4b7c49c481/device-2016-06-09-234253.png)

See merge request !332
2016-06-13 18:37:33 +00:00
Hans-Christoph Steiner
d40c94ab11 Merge branch 'targetSdkVersion' into 'master'
include targetSdkVersion in Apk

In order to work well with the Android 6.0+ permissions, the client needs to know whether an APK has been built against android-23 or higher.

@pserwylo @dschuermann how does this look?

See merge request !323
2016-06-10 08:43:44 +00:00
Hans-Christoph Steiner
59688c7ff0 include targetSdkVersion in Apk
In order to work well with the Android 6.0+ permissions, the client needs
to know whether an APK has been built against android-23 or higher.

closes #682 https://gitlab.com/fdroid/fdroidclient/issues/682
2016-06-10 10:28:25 +02:00
Dominik Schürmann
c88afd0995 Reuse AppSecurityPermissions in AppDetails 2016-06-09 23:42:14 +02:00
Dominik Schürmann
f5db19eba8 Remove m prefix from variables, remove TODOs 2016-06-09 23:31:27 +02:00
Daniel Martí
7e27edc9b5 Merge branch 'check-perms-after-install' into 'master'
Check permissions for unattended installer

This PR introduces the class ``ApkVerifier`` which checks the permissions of the downloaded apk file against the expected permissions from the F-Droid listing (``Apk`` class).

* I removed ``AndroidXMLDecompress`` because everything which it has been used for can also be done with ``PackageManager.getPackageArchiveInfo()``, to the best of my knowledge. I even asked in at a similar project why ``PackageManager.getPackageArchiveInfo()``may not be enough: https://github.com/jaredrummler/APKParser/issues/3 It turns out in our case it should do everything we need.
* The code responsible for sanitizing the local apk file and making it world readable has also been moved into ``ApkVerifier`` for now. This can change in a later PR when I introduce the FileProvider for downloaded apks.

We still need to check the target sdk version (see TODO in ``ApkVerifier``). This depends on https://gitlab.com/fdroid/fdroidclient/merge_requests/323

See merge request !322
2016-06-09 18:56:12 +00:00
Daniel Martí
abb7db0bc2 Merge branch 'remove-first-run' into 'master'
Remove first-time dialogs for extension installer

The root mechanism will not be useful in 5.1 and later and has been shown to be error prone.

See merge request !330
2016-06-09 13:00:43 +00:00
Dominik Schürmann
f6cc716fac Remove first-time dialogs for extension installer
The root mechanism will not be useful in 5.1 and later and has been shown
to be error prone.

Fixes #636
2016-06-09 11:12:09 +02:00
Dominik Schürmann
739bd00257 Documentation and cleanup 2016-06-09 10:31:33 +02:00
Dominik Schürmann
4bed9d67c5 Verify permissions of downloaded apk 2016-06-09 10:25:57 +02:00
Dominik Schürmann
1652c32d51 Move permission getter in Apk class
Also fix permissions list based on the fact
that F-Droid deletes android.permission. prefix
only for default Android permissions, not custom ones.
2016-06-09 10:25:57 +02:00
Dominik Schürmann
24ed40bd34 Move Apk verification and file sanitizing into own class
* use getPackageArchiveInfo of AOSP instead of AndroidXMLDecompress
* verify in InstallManagerService instead of Installer subclasses
2016-06-09 10:25:57 +02:00
Peter Serwylo
253900e927 Multi-repo updater ported to robolectric.
The tests pass, but there is a lingering message that gets logged:

```
Jun 08, 2016 7:31:13 AM com.almworks.sqlite4java.Internal log
WARNING: [sqlite] [DETACH DATABASE temp_update_db]DB[1][C]: exception when clearing
com.almworks.sqlite4java.SQLiteException: [1] DB[1] reset [no such database: temp_update_db]
	at com.almworks.sqlite4java.SQLiteConnection.throwResult(SQLiteConnection.java:1309)
	at com.almworks.sqlite4java.SQLiteConnection.throwResult(SQLiteConnection.java:1282)
	at com.almworks.sqlite4java.SQLiteConnection.cacheStatementHandle(SQLiteConnection.java:1211)
	at com.almworks.sqlite4java.SQLiteConnection.access$900(SQLiteConnection.java:54)
	at com.almworks.sqlite4java.SQLiteConnection$CachedController.dispose(SQLiteConnection.java:1606)
	at com.almworks.sqlite4java.SQLiteStatement.dispose(SQLiteStatement.java:187)
	at org.robolectric.shadows.ShadowSQLiteConnection$Connections$4.call(ShadowSQLiteConnection.java:421)
	at org.robolectric.shadows.ShadowSQLiteConnection$Connections$6.call(ShadowSQLiteConnection.java:449)
	at org.robolectric.shadows.ShadowSQLiteConnection$Connections$6.call(ShadowSQLiteConnection.java:443)
	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
	at java.lang.Thread.run(Thread.java:745)
```

The `temp_update_db` is the one used for repo updates, but I thought that it
correctly gets dropped/detached by the `TempAppProvider` when required. In fact,
given the nature of the error message (no such database: temp_update_db), that
hints at the fact that it is indeed dropped. I'm struggling to figure out what
causes this, but it should not be harmful to the running of the tests. If a test
actually fails, then it is picked up correctly by JUnit.
2016-06-09 10:44:40 +10:00
Peter Serwylo
839ebebd87 Migrated Apk tests to robolectric.
Relatively straightforward port, nothing particularly special here.
2016-06-09 10:44:40 +10:00
Peter Serwylo
c7bb93f743 Inject hash + hashType into install method.
This makes testing of the function easier, as the method previously expected
a real file to exist on disk for which it could then hash. This instead allows
mock hash values to be inserted when under test.

Other than this, the semantics remain exactly the same as before, and the
expensive hashing is still done on a worker thread as part of the `IntentService`.
2016-06-09 10:44:40 +10:00
Daniel Martí
99a488dc18 Merge branch 'studio-suggestions' into 'master'
Studio suggestions



See merge request !324
2016-06-08 20:10:38 +00:00
Dominik Schürmann
1bb35aced4 Remove cancel button for install
The install progress is not cancelable thus the cancel
button should not be displayed. This corresponds to the
behaviour of Google Play.
2016-06-08 14:18:30 +02:00
Daniel Martí
2c16ffdefe Remove redundant throw clauses found by Studio 2016-06-07 22:33:09 +01:00
Daniel Martí
d2ac7e6eba Remove some dead code found by Studio 2016-06-07 22:33:09 +01:00
Daniel Martí
649647497e Apply some "access can be weaker" Studio fixes 2016-06-07 22:33:09 +01:00
Daniel Martí
e2f5d97cb2 Merge branch 'crash-fixes' into 'master'
Service crash fixes

3 relatively simple crash fixes.  The two related to `WifiStateChangeService` have already be included in `stable-0.100`, 7385d320b42af960be63c9c179e1cbf186c1398a should be cherry-picked into `stable-0.100` after this is merged.

I already have 198ad843c1fabc8cf57ffe85c77230288cd6d7a4 ready in my stable-0.100 branch

See merge request !317
2016-06-02 13:20:14 +00:00
Peter Serwylo
7c8ea5c5af Prevent InstalledAppProvider from notifying about changes.
Historically the providers were responsible for notifying about inserts/deletes
for this table. However this is no longer the case with the new service responsible
for throttling the rate with which these notifications occur.
2016-06-02 21:08:23 +10:00