1436 Commits

Author SHA1 Message Date
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
Daniel Martí
cbc28ea53a Bump gradle to 1.12 (plugin 0.10)
Also, android.plugin.sdkDirectory is gone, so use sdkLoc
2014-05-21 11:42:46 +02:00
Daniel Martí
2beee93e07 Replace nanohttpd with _hc's fork again for https 2014-05-21 08:58:42 +02:00
Daniel Martí
08efdaf135 Suppress some more proguard warnings that we don't care about 2014-05-21 08:53:59 +02:00
Daniel Martí
8e4ef71168 Also add ant src link for jmdns 2014-05-21 08:48:45 +02:00
Daniel Martí
ed4b9fa1d2 Don't make javax.naming normal warnings stop gradle 2014-05-21 08:48:17 +02:00
Daniel Martí
8c75c3694b Forgot to re-add jmdns as a dep 2014-05-21 08:48:13 +02:00
Peter Serwylo
4779b753e6 Merge branch 'find-local-repos-with-jmdns' into 'master'
Find local repos with jmdns

This enables users to find local repos on local wifi using mDNS.  Local repos can be advertized according to a preference, and you can find local repos by browsing via mDNS in `ManageRepos` under the "Find Local Repos".

This also includes fixes for the `SignedRepoUpdater` tests, and comments out other tests that have not yet worked.
2014-05-20 23:02:13 +00:00
Hans-Christoph Steiner
146046a1ff add description of app to manifest for p2p users
The local repo generation code will take the description from the manifest
and include it in the repo meta data.  So FDroid itself should also include
this description.  Indeed every app should... perhaps this should also be
an `fdroid lint` item.
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
0216de670c tests: try everything to find a folder to write to, otherwise skip
The tests of the jar signatures require working on files, but some
emulators make that very difficult.  So try all possible paths for writing
to, and otherwise just skip the tests.
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
e782730455 comment out incomplete, failing tests
These are tests that @pserwylo was working on, but hasn't had the time to
complete yet. As far as I know, they have never passed.
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
8ebce69d5d use mDNS TXT records to detect FDroid repos, path, etc.
FDroid repos are advertised via Bonjour as plain HTTP or HTTPS services,
since they are browseable with a standard Web Browser. The "Find Local
Repos" browser in FDroid should only show FDroid repos, not any website,
so that is detected using a "type" TXT record in the FDroid broadcasts.
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
30ecc1c9f6 use MulticastLock for better Bonjour/mDNS performance
Multicast transmission is subject to heavy power management on Android,
because it apparently can be a battery drain.  mDNS/Bonjour is based
entirely on multicast, so in order to have good Bonjour performance, there
needs to be good multicast performance.  MulticastLock provides that.

fixes #3381 https://dev.guardianproject.info/issues/3381
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
f2994b0764 replace Android NSD browsing with jmdns
Android's NSD is only included in Android >= 16, and seems to be buggy. So
This replaces the NSD code entirely with jmdns, which works on all Android
versions.

fixes #2900 https://dev.guardianproject.info/issues/2900
fixes #3379 https://dev.guardianproject.info/issues/3379
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
b5f7c0a481 preference for the "name" of the local repo
This name is used in the RepoList, the local repo website title, the
Bonjour broadcast, etc.  By default, a name is generated using the make and
model of the phone plus a random number.
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
248cefe1f3 fix notification launching LocalRepoActivity
It was not working on my Nexus 7 running stock 4.4.2.  This seems to be the
recommend fix:
https://code.google.com/p/android/issues/detail?id=61850
2014-05-20 18:44:47 -04:00
Hans-Christoph Steiner
d25a395936 broadcast local repo via Bonjour/mDNS to enable auto-discovery
This adds support for registering the local repo with Bonjour/mDNS so that
it is broadcast out to all devices on the local network.  This makes it
easy to discover and add local repos on the same wifi.

refs #2900 https://dev.guardianproject.info/issues/2900
2014-05-20 18:37:45 -04:00
Hans-Christoph Steiner
7ca966be05 in local repo, make relative links to the index.html page
This should make the local repo files portable, like if the app gets
moved to the SD card or things like that.
2014-05-20 18:37:44 -04:00
Hans-Christoph Steiner
54283b71fd add jmdns submodule to Eclipse config
So those of us stuck in Eclipse can built FDroid :)
2014-05-20 18:37:44 -04:00
Daniel Martí
29048a0c60 Include spongycastle 2014-05-20 19:12:29 +02:00
Daniel Martí
dd60f5cd3b Re-add nanohttpd, from upstream this time 2014-05-20 18:54:06 +02:00