3864 Commits

Author SHA1 Message Date
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
Daniel Martí
1ac53078ee Bump support libs to 24.0.0
Also bump the docker image since it contains the newer support m2 repo.
2016-06-17 15:51:25 +01:00
Daniel Martí
783d6d1ba6 Remove now unused ic_stat_notify
The code that used it got removed for good in f6cc716f.
2016-06-17 15:29:38 +01:00
F-Droid Translatebot
5dd1cd6ee6 Pull translation updates from Weblate
Translators:

Francesco Giordano    Italian
Jaroslav Lichtblau    Czech
Mutante Citta         Italian
2016-06-16 20:59:55 +01:00
Daniel Martí
95b7201868 Merge branch 'fix-582--lint-errors' into 'master'
Extracted new API styles dependent on API 16 and 17 into values-17.

This involved the typical Android design pattern of a "Base" style in
`values/styles.xml`, then the an empty normal style which uses that Base style
as a `parent` also in `values/styles.xml`, and finally any API specific
styles in another version of the normal style in a `values/styles-v17` folder.

Same was done for android:actionBarStyle moving it into into values-v11.
This time, didn't worry about the base style, because there was not much to be
gained. by doing so.

Fixes #582.

See merge request !335
2016-06-16 19:44:08 +00:00
Daniel Martí
4f67437bc9 Merge branch 'two-0.101-fixes' into 'master'
Two 0.101 fixes

This includes two fixes for 0.101.  One of them has already been included in stable-v0.100 for 0.100.1.

See merge request !337
2016-06-16 19:14:25 +00: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
Daniel Martí
81ff5f3cd2 Merge branch 'fix-686--install-npe' into 'master'
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.

See merge request !336
2016-06-16 10:24:24 +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
aae87eb92e Extracted new API styles dependent on API 16 and 17 into values-17.
This involved the typical Android design pattern of a "Base" style in
`values/styles.xml`, then the an empty normal style which uses that Base style
as a `parent` also in `values/styles.xml`, and finally any API specific
styles in another version of the normal style in a `values/styles-v17` folder.

Same was done for android:actionBarStyle moving it into into values-v11.
This time, didn't worry about the base style, because there was not much to be
gained. by doing so.
2016-06-16 15:37:19 +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
Hans-Christoph Steiner
d47e87e53b Merge branch 'fix-685--downloading-unknown' into 'master'
Ask for all fields from the content provider.

**To be cherry-picked into `master` as well as this merge into `stable-v0.100`**

Fixes #684. 

![fixed](/uploads/dcef00026427778c9180b7da7ab0a9ee/fixed.png)

Ask for all fields from the `ContentProvider`.
    
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 (looking up indexes, performing joins, etc). 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. There are indeed suitable times to only request specific fields, but I'd suggest that they are probably only when we need to ask a question about thousands of apps at a time, and then the heap space becomes a concern.

See merge request !328
2016-06-14 21:40:17 +00: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
Daniel Martí
4685d82ee6 Remove a couple of unused strings
Updates #684.
2016-06-14 11:45:07 +01:00
F-Droid Translatebot
679fdb3fb1 Pull translation updates from Weblate
Translators:

Adrià García-Alzórriz    Catalan
Daniel Martí             Catalan
Enol Puente              Asturian
ezjerry liao             Traditional Chinese
Jonatan                  Swedish
Miss Min                 Persian
Nutchanon Wetchasit      Thai
Sergio Oller             Catalan
2016-06-14 11:35:45 +01:00
Daniel Martí
eac0df88af CI: bump image 2016-06-13 23:36:13 +01:00
Daniel Martí
05a5041971 Merge branch 'verify-target-sdk' into 'master'
ApkVerifier: check targetSdkVersion



See merge request !333
2016-06-13 21:19:32 +00: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
db-version/57
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í
1f61259ae3 Add Thai to the languages list 2016-06-09 14:14:13 +01:00
Daniel Martí
471447fc10 Run tools/remove-unused-trans.py
After a few strings were removed in !330.
2016-06-09 14:05:17 +01:00
F-Droid Translatebot
66d309b848 Pull translation updates from Weblate
Translators:

Mohamad Hasan Al Banna    Indonesian
Nutchanon Wetchasit       Thai
Prasanna Venkadesh        Tamil
2016-06-09 14:04:51 +01: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
Daniel Martí
345d735d8f Merge branch 'robolectric' into 'master'
Port most tests to JVM via Robolectric library

Fixes #607.

This ports all but one of the tests from `app/src/androidTest` to `app/src/test` to be run on the JVM.

I would've liked to port the final one, but it must be run on Android because we are testing the ability of an Android OS to perform symlinks. Also, it is not a bad thing in itself to have tests run on an emulator, just that those which _can_ be run on the host JVM should be. In the future, there will no doubt be other tests which are required to run on the JVM. At the very least, we should be able to run tests on faster emulators now because we are not constrained by the failing provider tests.

This branch required only very minimal changes to the client code, but resulted in the removal of a whole bunch of crappy mocking code that I had to add in order to support testing of the content providers (i.e. navigating around all of the final/hidden/etc apis in Android).

See merge request !327
2016-06-09 11:02:11 +00:00
Dominik Schürmann
c1abd09362 Remove AndroidXMLDecompressTest 2016-06-09 12:36:43 +02: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
182a63af41 Ensure tests for proper multirepo support are not run.
They are here so that when we support multiple repos in a more robust
manner, we can use these tests to show that it was successful.
2016-06-09 10:44:40 +10:00
Peter Serwylo
53e74dcdbd Appease checkstyle for test code.
Like PMD, we also had to add a concession to allow static imports.
This time, it was achieved by moving the assertions to a more generally
named `Assert` class, and then allowing static imports from that.
2016-06-09 10:44:40 +10:00
Peter Serwylo
4e73d1e5e6 Finish porting tests to Robolectric, and appease PMD.
To appease PMD, we now have a three rulesets in `config/pmd/*.xml`:

 * `rules.xml`: The bulk of the rules, used by both main and test code.
 * `rules-main.xml`: Rules specific to the andoid client code.
 * `rules-test.xml`: Rules specific to test code.

The rationale is because checkstyle by default checks for "too many static
imports", which is a fair call. However in JUnit4 code, it is common to
import many `assert*` static methods.
2016-06-09 10:44:40 +10: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
660ebc5ec8 Migrated to robolectric.
This required changing the SAX parser to be namespace aware, as it seems
that is the default in Android, but not the default in the OpenJDK.
2016-06-09 10:44:40 +10:00
Peter Serwylo
60451a050f Remove unused test code.
Many of the `Mock*` classes are there to deal with idiosyncrosies of
the Android SDK, including `final`/package local/`@Hide` annotations/etc.
They are no longer required with robolectric tests.
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
4e66bb810f Ported AppProvider tests to Robolectric.
Get around silly `final` methods in `ContentResolver` with Mockito and `delegatesTo`.

The Robolectric library presumes that people always want to test content providers by
manually invoking the `query`/`update`/`delete` methods on the `ShadowContentResolver`.
While that is a great feature for testing, we have helper methods that require testing,
and these methods accept either a _real_ `ContentResolver` or `Context`. Robolectric
did some cool magic in terms of intercepting runtime calls to content resolvers and
forwarding them to the "shadow" verison, to deal with final/package private/etc methods.
However, as a side effect, the `ShadowContentProvider` _is not a `ContentProvider` as
far as the Java compiler is concerned.

By utilising Mockito + `delegatesTo` method, we are able to achieve what is required:
 * An actual `ContentProvider` instance.
 * It forwards calls to the `ShadowContentProvider` provided by Robolectric.
2016-06-09 10:44:40 +10:00
Peter Serwylo
09fd3d188c Robolectric testing support + InstallAppProvider testing now run in JVM.
Robolectric provides testing support for Android via the JVM, including testing
of content providers. In order to get these tests to work, we need to avoid
the default behaviour of starting up FDroidApp.onCreate(). This method has a lot
of static state which fails if set multiple times. Instead of trying to ensure
we correctly zero out that state each test, it is preferable to instead never
bother with that in the first place. Expecially when that is not what is under
test (as is the case with content provider tests).
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í
4c7217d796 Add Tamil (ta) to the languages list 2016-06-08 23:32:44 +01:00