880 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
d2e32631d0 fix incorrect lazy initialization of the list of HTTPS pins
findbugs tells us:

Incorrect lazy initialization and update of static field org.fdroid.fdroid.
FDroidCertPins.PINLIST in org.fdroid.fdroid.FDroidCertPins.getPinList().
This method contains an unsynchronized lazy initialization of a static
field. After the field is set, the object stored into that location is
further updated or accessed. The setting of the field is visible to other
threads as soon as it is set. If the futher accesses in the method that set
the field serve to initialize the object, then you have a very serious
multithreading bug, unless something else prevents any other thread from
accessing the stored object until it is fully initialized.

Even if you feel confident that the method is never called by multiple
threads, it might be better to not set the static field until the value you
are setting it to is fully populated/initialized.
2014-08-02 00:30:46 -04:00
Hans-Christoph Steiner
df3ba4c751 only provide AndroidPinning TrustManager to MemorizingTrustManager
The third parameter in the MemorizingTrustManager constructor was not good
apparently. Here's the email from Ge0rg, the MemorizingTrustManager author:

As you added MTM into the f-droid client, I'm writing to inform you that
the MTM constructor API was incorrect, and has been changed in current
git master:

When using the three-parameter constructor, the second parameter, a
trustmanager, was only used until the user stored a certificate into
MTM, and was overwritten after that.

Please use the new MTM constructor, and pass it the pinMgr as the only
trust manager parameter.
2014-08-02 00:30:46 -04:00
Hans-Christoph Steiner
4f7f87be0a assign static var FDroidApp.selectedApps only after HashSet is built
This should help is there is ever multithreaded access to this variable.
This is an unlikely scenario, but the fix is easy.

findbugs reported this issue like this:

Incorrect lazy initialization and update of static field org.fdroid.fdroid.
FDroidApp.selectedApps in org.fdroid.fdroid.views.fragments.
SelectLocalAppsFragment.onActivityCreated(Bundle)

This method contains an unsynchronized lazy initialization of a static
field. After the field is set, the object stored into that location is
further updated or accessed. The setting of the field is visible to other
threads as soon as it is set. If the futher accesses in the method that set
the field serve to initialize the object, then you have a very serious
multithreading bug, unless something else prevents any other thread from
accessing the stored object until it is fully initialized.
2014-07-30 00:07:02 -04:00
Hans-Christoph Steiner
af3a6369cc LocalRepoManager: fix null check when copying APKs
findbugs found this problem and reported it like this:

Nullcheck of org.fdroid.fdroid.data.App.installedApk at line 191 of value
previously dereferenced in org.fdroid.fdroid.localrepo.LocalRepoManager.copyApksToRepo(List)

A value is checked here to see whether it is null, but this value can't be
null because it was previously dereferenced and if it were null a null
pointer exception would have occurred at the earlier dereference.
Essentially, this code and the previous dereference disagree as to whether
this value is allowed to be null. Either the check is redundant or the
previous dereference is erroneous.
2014-07-30 00:07:02 -04:00
Hans-Christoph Steiner
be3f7900e8 rename default repo variables for clarity
default_repo_count is not used at all, and the numbering scheme is just a
vestige of that.  This switches all the variables to have clear names of
what they are representing.
2014-07-29 17:49:23 -04:00
Hans-Christoph Steiner
14824daa21 include Guardian Project official repo, disabled by default
This pre-configures the official Guardian Project repo to make it very easy
for people to use that repo without having to verify keys.

fixes #63 https://gitlab.com/fdroid/fdroidclient/issues/63
fixes #2604 https://dev.guardianproject.info/issues/2604
2014-07-29 17:49:23 -04:00
Hans-Christoph Steiner
78558ca86e make method for inserting default repo name/description
Instead of copy-pasting a block of code, use a method! :-D.  This will be
useful when adding more default repos... (coming soon!).
2014-07-29 17:49:22 -04:00
Hans-Christoph Steiner
aa877fd85a Category Spinner should always look like a dropdown menu
On Android 4.x, the category menu is showing up as pure black, and looks
very much like an app list item.  I've personally witnessed many new users
struggle to find an app because the category is on "What's New" by default
and the app they are looking for is not new.  Some even had troubles
remembering about the category menu after I told them.  This small change
makes the category dropdown look the same on all Android versions, and
makes it a lot more apparent on newer Android releases.

This is a temporary usability fix until we can do something much better
than the category dropdown menu.
2014-07-29 17:49:22 -04:00
Hans-Christoph Steiner
bbb91e8eca fix bug where "app repo" dialog gets created twice for an incoming Intent
onNewIntent() is called because ManageReposActivity is set to "singleTask"
launchMode, but it is only called if ManageReposActivity is already
running.  onResume() is always called, and called after onNewIntent() if it
is called, so use onNewIntent() only to set the current Intent, then parse
the Intent only in onResume().

Here is how to reproduce the original bug:

1. Close F-Droid properly and start it again.
2. Click on https://guardianproject.info/fdroid/repo in a browser (and tell
   it to open with F-Droid)
3. Hit cancel on the add repo dialog
4. Leave F-Droid open and switch back to the browser
5. Open that link again.

This should result in two dialogs on top of one another. Happened from both
Firefox, Chrome, and Android browsers.
2014-07-15 12:28:41 -04:00
Hans-Christoph Steiner
13f52e1b50 change title to "F-Droid" for VIEW Intent receiver chooser
When someone clicks on a URL that F-Droid can accept, i.e. a repo URL, then
Android puts up a chooser where the user can select which app to VIEW the
URL with.  That was showing up with the title "Repositories", which is the
title used for that Activity when viewing it.  This keeps the Activity
title the same while changing the title in the chooser.
2014-07-15 12:28:41 -04:00
Hans-Christoph Steiner
56933cdbd6 sanitize URL from clipboard and parse fingerprint (fixes #50)
Instead of just sticking whatever URL is in the clipboard into the "Add
Repo" dialog, this attempts to sanitize the URL in case it has some garbage
or came from a QR Code, and therefore was all uppercase (that makes for
smaller QR Codes).  It also checks if there is a fingerprint in the query
string of the URL, and sticks that into the fingerprint box.

fixes #50 https://gitlab.com/fdroid/fdroidclient/issues/50
2014-07-15 12:28:41 -04:00
Hans-Christoph Steiner
a525bca1cf split out new, incoming repo configs into a separate class: NewRepoConfig
The swap stuff will also need to handle incoming Intents that represent
new repos, so the parsing logic is now its own class NewRepoConfig, which
is something like the Repo class, but using getters instead of properties.
Since the new repo data does not change once FDroid receives it, the only
way to set the values of a NewRepoConfig is via the constructor.

This is based on some incomplete work from @pserwylo:
71cb12ef5c (diff-6)
and
71cb12ef5c (diff-7)
2014-07-15 12:28:41 -04:00
Hans-Christoph Steiner
c1e5e287b7 rename AppListFragmentPagerAdapter to fix typo
AppListFragmentPageAdapter is a subclass of FragmentPagerAdapter, so it
should include the same spelling to make that clear and easy to trace,
grep for, etc.
2014-07-15 12:28:40 -04:00
Hans-Christoph Steiner
0945661c9d ManageReposActivity: move as much out of the Fragment; use appcompat menu
Now that the Fragment is embedded in the Activity, and the menu has been
moved to the Activity in ActionBar style, most of the utility functions and
the Dialogs can be based out of the Activity, which is how they are
designed to work.  This makes things work a lot easier.

fixes #3 https://gitlab.com/fdroid/fdroidclient/issues/3
2014-07-15 12:28:40 -04:00
Hans-Christoph Steiner
d41499d656 move RepoListFragment into ManageReposActivity
This will make it a lot easier to deal with the ActionBar menu and handling
rotations when the "add repo" dialog is showing.
2014-07-15 12:28:40 -04:00
Hans-Christoph Steiner
7a08ab532f run code formatter on ManageReposActivity and RepoListActivity
This should ease future comparisons after these two files are merged into
one.
2014-07-15 12:28:40 -04:00
Hans-Christoph Steiner
83072bc2c4 rename ManageRepo.java to be with all the rest of the Activity files
This moves it to the org.fdroid.fdroid.views package and names it in the
same style as the Activities in that package.
2014-07-15 12:28:40 -04:00
Hans-Christoph Steiner
cba8f3b68f convert main menu to appcompat ActionBar style
This allows the main menu to act like a proper ActionBar using appcompat.
It also allows for making the search happen live on the ListView, rather
than having to launch a separate Activity to show the results.
2014-07-15 12:28:40 -04:00
Hans-Christoph Steiner
b06792524e port everything to appcompat-v7 (#42, #51)
I went through all of the source code replacing anything that is now
possible using appcompat-v7.  appcompat-v7 is the official way to handle
backwards compatibility, and it is supported by Google and others. Using it
as much as possible should make the code more maintainable and readable by
others since they'll be used to seeing the appcompat-v7 patterns from other
projects.

fixes #51 https://gitlab.com/fdroid/fdroidclient/issues/51
fixes #42 https://gitlab.com/fdroid/fdroidclient/issues/42
2014-07-15 12:28:23 -04:00
Daniel Martí
8af69afba6 Merge branch 'fix/issue-51-search-action-compat' of https://gitlab.com/pserwylo/fdroidclient 2014-07-06 11:22:59 +02:00
Peter Serwylo
c6e86392ff Fix issue #51. Made SearchView stuff use appcompat-v7.
Previously, it was using the native android.widget.SearchView.
Now it uses the widget from appcompat. For good measure, I also
made it so that the search button is always in the action bar,
rather than being hidden behind a menu sometimes.
2014-07-06 01:11:14 +09:30
Peter Serwylo
5ff0ef8de7 Fix issue #3: Retain progress dialog for repo update during orientation change
Do so by:

 - Making RepoDetailsFragment/RepoListFragment retain their instances
 - Move the management of the update repo dialog to UpdateReceiver
 - Let the fragments tell the UpdateReceiver when to show/hide
2014-07-05 22:45:15 +09:30
Peter Serwylo
1d4581a78e Reverted layout of app details to what it was before. 2014-06-24 08:30:25 +09:30
Hans-Christoph Steiner
b7f0195234 add "HTTP Proxy" preference to support Tor, I2P, or any other proxy
This is the most basic support for channeling all downloads through Tor or
I2P.  This does not include Orbot integration, so the use will have to know
to start Orbot before using this.  I don't know anything about I2P.

closes #2367 https://dev.guardianproject.info/issues/2367
https://f-droid.org/repository/issues/?do=view_issue&issue=404
https://f-droid.org/repository/issues/?do=view_issue&issue=424
2014-06-05 17:23:44 -04:00
Peter Serwylo
b82be525b9 Rotation of app details with fragments implemented.
This was a bit more complex than all the other views, because it supports
rotation, and different views for when it is rotated. The end result is
that the way in which the views were constructed needed to be completely
redone.

In the process, I also moved the layout of the app summary to a Relative
Layout. This adds more flexibility, and is also the suggested layout
for complex views (as apposed to nested linear layouts). I believe this
is due to the performance of relative vs linear layotus.

It was aprticularly hard to figure out what was going on
when rotating an Activity which had a list fragment
that had another fragment as a header. I don't think fragments
were designed to work like this, but I believe it is all working
as expected now.

Conflicts:
	src/org/fdroid/fdroid/Preferences.java
2014-06-04 23:19:54 -04:00
Peter Serwylo
659b46fd4e Fix to sdkLoc in build. Added light (without dark action bar) theme.
NOTE: I don't know how android will go with adding a new property
to a string-array resource, but not having it translated everywhere.
Will it struggle because the EN version has three values for "theme",
but other translations only have two?
2014-06-04 23:19:54 -04:00
Peter Serwylo
3050e3dbc5 Migrating activities to appcompat-v7
The only remaining activity is the AppDetails acvitity, which will require
a little more than just making it extend ActionBarActivity. Currently,
it extends ListActivity. To support appcompat-v7, it really should have
two fragments - the details one and the list one. Then, when the orientation
is changed, it should load a different layout with the fragments side by side.

Although Google is encouraging people to make old devices run apps
with the action bar (via appcompat-v7), they haven't provided a way
for people to create preference/setting screens with an action bar.

There are plenty of issues in the Android issue tracker relating
to this, but it doesn't yet seem to be on the radar of the Android
devs.

Until there is a native implementation of PreferenceFragment in
the appcompat-v7 support library, this submodule provides is a 3rd
party solution. It is actually a fork of the first repo in github,
though that was a bit of an upload and dump, without accepting MR's.
This fork includes gradle support.
2014-06-04 23:19:37 -04:00
Peter Serwylo
92421bac05 WIP: Migrating activities to appcompat-v7.
Conflicts:
	src/org/fdroid/fdroid/FDroidApp.java
	src/org/fdroid/fdroid/views/LocalRepoActivity.java
	src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java
2014-06-03 08:13:53 +09:30
Hans-Christoph Steiner
c1b5bf5279 implemented IconDownloader for UIL downloads with FDroid classes
This lets UniversalImageLoader (UIL) use FDroid's generic Downloader
infrastucture so that connection configuration all happens based on the URL
in DownloaderFactory.

refs #2598 https://dev.guardianproject.info/issues/2598
refs #2367 https://dev.guardianproject.info/issues/2367
2014-05-30 15:23:33 -04:00
Hans-Christoph Steiner
d19e77049a rename Downloader.inputStream() to getInputStream()
This follows:
URLConnection.getInputStream()
BaseImageDownloader.getStream()
2014-05-30 15:23:33 -04:00
Hans-Christoph Steiner
b619716669 add TorHttpDownloader for handling repos on Tor Hidden Services
Tor Hidden Services are on domain names that always end in .onion, so there
is a URL pattern matcher that chooses which Downloader subclass to use
based on testing for .onion.  This is a quick, dumb implementation.  It
does make any attempt to see if Tor is running or even installed.  That
can come once NetCipher is easy to handle in the context of FDroid.

refs #2367 https://dev.guardianproject.info/issues/2367
2014-05-30 15:23:33 -04:00
Hans-Christoph Steiner
910f9a68a6 make DownloaderFactory for creating any kind of Downloader
This will ultimately be used to create the right Downloader subclass
instance based on the URL of the file to download (i.e. rfcomm://, .onion
address, ssh://, new socket protocols, etc).

Also delete unused constructors, they can trivially be readded if they are
ever used, and they are currently just clutter.
2014-05-30 15:23:33 -04:00
Hans-Christoph Steiner
91e06b8496 new Wifi event cancels active processing of previous event
If a new "wifi connected" event comes in while a previous one is still
being processed, then cancel the current one as soon as possible.  This
prevents the events from being processed in an interleaved manner, causing
chaos and crashes.  Hopefully this will fix the jmdns crashes, since that
is triggered by onPostExecute() via FDroidApp.restartLocalRepoService().

java.lang.IllegalStateException: A service information can only be registered with a single instamce of JmDNS.
   at javax.jmdns.impl.JmDNSImpl.registerService(JmDNSImpl.java:1005)
   at org.fdroid.fdroid.localrepo.LocalRepoService$5.run(LocalRepoService.java:239)
   at java.lang.Thread.run(Thread.java:856)
2014-05-30 15:23:33 -04:00
Hans-Christoph Steiner
f51d192e13 move all mDNS service creation into the Thread
Upon looking at this, ServiceInfo.create() also might take a while to run
so might as well run it in the Thread with the other JmDNS stuff.
2014-05-30 15:23:33 -04:00
Hans-Christoph Steiner
ba028408a1 registerMDNSService() overwrites any existing registration
There is only ever a single service to advertise via mDNS, so when a new
registration is requested, remove any existing ones.  This should eliminate
these stacktraces:

java.lang.IllegalStateException: A service information can only be registered with a single instamce of JmDNS.
    at javax.jmdns.impl.JmDNSImpl.registerService(JmDNSImpl.java:1005)
    at org.fdroid.fdroid.localrepo.LocalRepoService$5.run(LocalRepoService.java:239)
    at java.lang.Thread.run(Thread.java:856)
2014-05-30 15:23:32 -04:00
Hans-Christoph Steiner
fdaa2ad106 update IP-related settings whenever the HTTPS pref changes
WifiStateChangeService handles updating lots of IP-related things, then
things that depend on it listen to the broadcast from that Service. The
most straightforward way to update HTTPS or HTTP throughout the app is to
trigger this Service.  It runs its stuff in an AsyncTask so it is all low
priority.
2014-05-30 15:23:32 -04:00
Hans-Christoph Steiner
c4b059502c better LocalRepoService singleton enforcement
We only ever want a single LocalRepoService.  Use the values returned by
the standard methods for start/stop and bind/unbind as the test for whether
the Service is indeed running.
2014-05-30 15:23:32 -04:00
Daniel Martí
a08963f0e5 Merge branch 'feature/refactor-downloaders-async' of https://gitlab.com/pserwylo/fdroidclient 2014-05-27 19:20:10 +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
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