1374 Commits

Author SHA1 Message Date
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
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
Daniel Martí
b7feebddf9 Also use jmdns like a java library in ant 2014-05-20 18:52:19 +02:00
Daniel Martí
0f98042520 Remove broken support for repo and Android.mk
* The repo instructions are just a duplicate of the simple git submodules
* The Android.mk build instructions don't work and will never support what
  e.g. gradle does

Anyone wanting to bundle F-Droid in a ROM can build it with git and gradle,
and then including the resulting apk.
2014-05-20 18:39:26 +02:00
Daniel Martí
67c7c9b8b5 Don't try to use nanohttpd as an android library either 2014-05-20 18:37:20 +02:00
Daniel Martí
319e1faf3b Add zipsigner as a submodule 2014-05-20 18:22:24 +02:00
Daniel Martí
4d44f3fce8 Build support-v4 from source with gradle
v7-appcompat can be enabled/used in gradle by changing :support-v4 with
:support-appcompat-v7 in build.gradle and bumping minSdk from 5 to 7
2014-05-19 11:56:45 +02:00
Daniel Martí
9d6cabe737 Update nanohttpd 2014-05-19 08:49:56 +02:00
Daniel Martí
cdbbb9d580 Add jmdns as a submodule 2014-05-18 14:04:07 +02:00
Daniel Martí
aa52516a41 Forgot to rollback the ant-prepare nanohttp path 2014-05-18 13:44:44 +02:00
Daniel Martí
b3107eb6b2 Fix gradle support while keeping ant support
Most of this was done by pserwylo on his branch feature/gradle. The only thing
left is merging the fixes into nanohttpd.
2014-05-18 12:55:30 +02:00
Daniel Martí
d68b959856 Update UIL 2014-05-18 12:33:42 +02:00
Daniel Martí
a8f9483684 Merge branch 'master' into 'master'
UI bug fixes

This fixes a couple of crasher issues with the UI. And also a small change to allow Eclipse to find the reference files for Android Support.
2014-05-15 21:11:19 +00:00
Hans-Christoph Steiner
c819d56f18 add link to SDK references for android-support jar
I tried lots of things to make it more general, but the implementation of
this jar properties file is just too simple, so no variables can be used.

I renamed the other files related to android-support to match the naming
scheme.
2014-05-15 14:32:16 -04:00