1606 Commits

Author SHA1 Message Date
Daniel Martí
ed630454a5 Update UIL 2014-05-28 22:17:38 +02:00
Daniel Martí
a085515b3d Add the rest of the srcDirs to UIL 2014-05-28 09:07:15 +02:00
Daniel Martí
9ea7959dc1 Fix typo in UIL config 2014-05-27 23:14:01 +02:00
Daniel Martí
a08963f0e5 Merge branch 'feature/refactor-downloaders-async' of https://gitlab.com/pserwylo/fdroidclient 2014-05-27 19:20:10 +02:00
Daniel Martí
bfb04648f8 Fix extra android namespaces in layout/about.xml 2014-05-27 17:59:19 +02:00
Daniel Martí
7351584697 Fix inconsistency in local_repo_https default state
+mvdan | _hc: you put https to default true in preferences.xml, but false in Preferences.java
   _hc | mvdan:  it should be off/false by default
2014-05-27 17:53:56 +02:00
Daniel Martí
4cbf97b499 Merge branch 'implement-signed-repos-and-https' of https://gitlab.com/eighthave/fdroidclient 2014-05-27 16:17:27 +02:00
Hans-Christoph Steiner
09db3524cf use getApplicationContext() when storing a passed in Context
getApplicationContext() returns the Context of the application, which is
guaranteed to have the same life as the app itself.  Other Contexts, like
an Activity, might go away during runtime.
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
09fb7969b4 do not include URL in index.xml because it will get out of date
As far as I can tell, the 'url' metadata in index.xml is not used at all by
the client.  In order to keep it up-to-date in the local repo, it would
have to regenerate index.xml and index.jar each time the IP address
changed.  That would mean a decent amount of work happening in the
background, all the update an unused field in index.xml.
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
0c039a6b5e make writeIndexJar() call writeIndexXML(): only create signed repos!
There is no longer a reason to expose writeIndexXML() since FDroid should
always generate a signed repo.  So make writeIndexXML() be called as part
of writeIndexJar().
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
91fc0f5383 generate HTTPS certificate after wifi change
Since the HTTPS certificate includes the current IP address in it, it needs
to be regenerated each time that the IP address changes.  It also can take
a long time to run, especially on the first time, since it had to do things
like create a key pair and make the certificate.  Therefore it should be in
a Service/AsyncTask.
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
b70986ef16 LocalRepoKeyStore.setupHTTPSCertificate() handles all exceptions itself
Since there is nothing happening with the Exceptions anyway, they should be
handled in this method so that this method is easy to use elsewhere.
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
d5488fc5f1 LocalRepoKeyStore move all creation logic to the constructor
This just makes the code clearer, and the get() method dead simple.
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
b7aad893a3 convert LocalRepoManager to a proper singleton
This gives us lazy initialization that happens the first time an instance
is needed.  And Peter asked to have this more this way :)
2014-05-25 22:53:19 -04:00
Hans-Christoph Steiner
ab165a4d7b omit unused spongycastle packages from eclipse/ant build
Many of the classes in spongycastle are entirely unused in FDroid and
dependencies.  So remove them from the Eclipse/Ant build to speed things up
and make the binaries smaller.
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
36de588497 add Bazaar/Kerplapp work to the changelog 2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
568e82c07e if LocalHTTPD fails to instantiate, log error and stop trying 2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
b7339e9423 support HTTPS:// for local repo in a preference
Allow the local repo to use HTTPS:// instead of HTTP://.  This is currently
default off since handling the self-signed certificate is not currently
graceful.  In the future, the SPKI that AndroidPinning uses should be
included in the repo meta data, then when someone marks a repo as trusted,
that local repo's SPKI should be added to the list of trusted keys in
AndroidPinning.

fixes #2960 https://dev.guardianproject.info/issues/2960
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
5f2efbb72a sign local repo based on key generated using spongycastle
This makes it so the local repo is always signed by a locally generated and
stored key.  That key will become the unique ID that represents a given
local repo.  It should seamlessly upgrade any existing unsigned local repo
next time that the user makes any changes to their local repo.

fixes #3380 https://dev.guardianproject.info/issues/3380
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
22fb0337b9 clean up LocalRepoKeyStore code format
Make it match standard Java style.
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
e41ae50812 make LocalRepoKeyStore into a proper singleton
Hopefully this makes Peter happy ;-)
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
544b924ab9 copy org.fdroid.fdroid.localrepo.LocalRepoKeystore from Kerplapp
This is the keystore used for both the index.jar signing key and the key
and certificate needed to support HTTPS connections.

https://github.com/guardianproject/Kerplapp

refs #3380 https://dev.guardianproject.info/issues/3380
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
b0c27869b6 new tricks to improve mDNS/Bonjour resolution
Before, it didn't seem to find anything unless I ran this on my laptop:
`avahi-browse -a -v`

So added two recommended practices from other jmdns code for Android:

* force full resolution on receiving serviceAdded()
* feed the WiFi's IP address to jmdns when creating an instance

fixes #3379 https://dev.guardianproject.info/issues/3379
2014-05-25 22:53:18 -04:00
Hans-Christoph Steiner
0ee5332c01 rename 'ant-src' to 'symlinks-for-ant-and-eclipse' for clarity
In order to make the codebase more self-documenting, rename it to more
clearly say what it is for.
2014-05-25 22:53:17 -04:00
Hans-Christoph Steiner
ed829fcfd6 make Eclipse use extern/ant-src
Eclipse can use the same symlink hack as ant, and they will both be happily
in sync.
2014-05-25 22:53:17 -04:00
Hans-Christoph Steiner
a688a029bf symlinks to build spongycastle with ant
This is all the symlinks to build what FDroid needs from spongycastle using
ant. The LDAP-related classes had to be removed because they depend on
Java 7's javax.naming, which Android does not provide. FDroid does not need
LDAP at all, so those classes can be entirely omitted.

refs #2540 https://dev.guardianproject.info/issues/2540
refs #3380 https://dev.guardianproject.info/issues/3380
2014-05-25 22:53:17 -04:00
Hans-Christoph Steiner
b95c93de59 restore symlink mistakenly deleted in 414c4e0c6768704fd5392a7db4c1fb38d9aab02f
Looks like this symlink got mistakenly deleted.  It is needed for eclipse
and ant to find the zipsigner stuff.
2014-05-25 22:52:38 -04:00
Daniel Martí
12868902e9 Forgot the ignore=dirty bits in .gitmodules 2014-05-25 13:52:17 +02:00
Daniel Martí
414c4e0c67 Use zxing-core from source in both ant and gradle
Also, temporarily remove zipsigner from ant until spongycastle is added to it
so that ant builds work
2014-05-25 13:39:56 +02:00
Peter Serwylo
b2c63c6dc7 More robust multi-threaded downloading.
ApkDownloaders keep track of a unique id. This id is passed through with
each event coming from the downloader. When progress events are received,
if they don't have the same id as the current downloader, they are ignored.

When returning to the app details screen after leaving, if a download
completed in the mean time, automatically show the install screen. Otherwise,
when you, e.g. return to your devices home screen during a download, the
download keeps occuring in the background, but we are unable to make use of
the resulting downloaded file.
2014-05-24 08:42:49 +09:30
Peter Serwylo
009c8a6be5 Don't show progress in AppDetails when using a cached download.
The ApkDownloader now returns true or false depending on whether it
is using a cached version on disk, or hitting the network.
I was also a little more defensive about checking for if downloadHandler
is null before deciding to show a progress dialog.
2014-05-24 07:20:41 +09:30
Peter Serwylo
2f7d6f6452 Made constructor of ApkDownloader public.
Previously it was in the org.fdroid.fdroid package, along with
most other things. As such, it only need a package-local constructor.
However, now it has moved to the .net subpackage, and needs to be
made public.
2014-05-24 07:20:41 +09:30
Peter Serwylo
d9e5b07054 Removed unneeded todo's, add docs. 2014-05-24 07:20:41 +09:30
Peter Serwylo
75586ec4e5 Moved ApkDownloader to .net package
This is where it belongs, along with the other downloader code.
2014-05-24 07:20:41 +09:30
Peter Serwylo
1e1be1e73b Support orientation changes during app download.
Keep track of the downloader after an orientation change, and
make sure that there is always UI feedback beeing shown.

Removed resetRequired after merge conflict (the content observer
now deals with this for us in a much nicer way).

Conflicts:
	src/org/fdroid/fdroid/AppDetails.java
2014-05-24 07:20:41 +09:30
Peter Serwylo
11ddf0478c Better handling of cancelling of downloads.
One thing that still annoys me is that indeterminate progress dialog
still shows "0/100" due to the number formatter being used to display
the values in the TextView. Solution (from http://stackoverflow.com/a/6784180)
is to either make a custom dialog, or at the very least, in API 11 or higher
we can set the number formatter to display nothing.

Don't show the full download path of repo.
The full path includes the path to the index.jar, as well as ?clientVersion=*.
This is undesirable, the main purpose of even showing where we are downloading
from is to differentiate between multiple repos being updated at once.
2014-05-24 07:20:40 +09:30
Peter Serwylo
3ed2cde207 Added AsyncDownloadWrapper and used it in AppDetails to download apks.
This has a very different interface to the Downloader class, because
a handful of operations need to be run off the main thread (not just
download, but also totalDownloadSize and perhaps cache tag related
stuff). The AsyncDownloadWrapper provides its own listener, more
specific than just the progress listener, which invokes functions
at different points in time (e.g. download failed, completed, cancelled).

Refactored progress events to use string types instead of ints.
This way, it is less likely that two different events from
different processes will clash with each other.

Conflicts:
	src/org/fdroid/fdroid/AppDetails.java
2014-05-24 07:20:40 +09:30
Peter Serwylo
0e0e042cd0 Change DownloadHandler from using runOnUiThread() to send/handleMessage().
It still executes the download on another thread, and receives progress
events on that thread. However it now posts those events to the main UI
thread for them to get handled.

Also refactored Downloader/HttpDownloader a tad further. Some caching
stuff was pushed down from HttpDownloader -> Downloader (renamed from
eTag to just cacheTag). HttpDownloader.download() was recursively calling
itself, so I made the base class download() method abstract, and instead
the stream downloading is done in "protected void downloadFromStream()"

Other minor stuff:
 * Prefixed some log TAGs with package names, to make them easier to grep.
 * Removed a little bit of unused code (parameter to DownloadHandler).
2014-05-24 07:20:40 +09:30
Hans-Christoph Steiner
91f2f1014e SKETCH - DOES NOT WORK: move HTTP code into HttpDownloader
This is the beginning of moving to a Downloader class and subclasses that
are used everywhere for downloading APKs, indexes, and icons.

I think that the ETag value can probably be used everywhere as the
unique ID for testing whether to download content, so I moved that to the
super class Downloader. But that's just a guess as of now...
2014-05-24 07:20:40 +09:30
Hans-Christoph Steiner
084a048740 ApkDownloader: rename remoteFile() to getRemoteAddress()
Since it doesn't return a java.io.File but a String with the remote address
2014-05-24 07:20:40 +09:30
Peter Serwylo
19e722a9d7 wire up ProgressListener to new ApkDownloader structure
Conflicts:
	src/org/fdroid/fdroid/AppDetails.java
2014-05-24 07:20:40 +09:30
Hans-Christoph Steiner
9588f30778 normalize null checks for ProgressListeners
This removes the RepoUpdater.isInteractive() method to normalize the code
used to check whether a ProgressListener is null throughout the project.
2014-05-24 07:20:40 +09:30
Hans-Christoph Steiner
d9f9b682d4 simplify ProgressListener.Event creation and use
This aims to simplify the creation and use of Event objects among classes
that implement the ProgressListener Interface.  This is also needed in
order to split out the downloading support from various places and put it
all into a centralized

refs #2598 https://dev.guardianproject.info/issues/2598
https://gitorious.org/f-droid/fdroidclient/merge_requests/29
2014-05-24 07:20:39 +09:30
Peter Serwylo
a44ce0e4e7 Rough guess at what ApkDownloader refactor could look like. 2014-05-24 07:20:39 +09:30
Hans-Christoph Steiner
c4b0eb9b51 .Downloader --> .ApkDownloader to distinguish from .net.Downloader
org.fdroid.froid.Downloader is only used for downloading APKs, so name it
appropriately.

refs #2598 https://dev.guardianproject.info/issues/2598
2014-05-24 07:20:39 +09:30
Peter Serwylo
2c80f1a758 Split net.Downloader into abstract Downloader and concrete HttpDownloader.
This will allow the more general, non HTTP related stuff (progress events,
stream copying) to occur in a separate base class. HTTP specific stuff
(HTTP status codes, etag cache checking) is done in the HTTPDownloader
base class.
2014-05-24 07:20:39 +09:30
Daniel Martí
d850ae2307 Start the next changelog entry 2014-05-23 11:13:58 +02:00
Daniel Martí
8b0f45f878 Fix gradle build by compiling spongycastle as a zipsigner dependency 2014-05-23 11:06:32 +02:00
Daniel Martí
e2c3811f4d Update zipsigner to include lib-optional 2014-05-23 09:10:21 +02:00
Daniel Martí
f841a179d1 spongycastle pgp is not used by kerplapp 2014-05-21 11:43:07 +02:00