Age | Commit message (Collapse) | Author |
|
|
|
|
|
New provider button has been converted to an action item, shown at the
bottom of the screen.
|
|
If there is an error while downloading CA cert on downloadJsonFiles, false is returned and progress dialog is dismissed.
|
|
They have been relocated to the corresponding classes.
|
|
|
|
|
|
We no longer use BundleExtras named as the action ProviderAPI is
intended to perform, but we standardise this name
(ProviderAPI.PARAMETERS), and use setAction to pass that action string.
|
|
|
|
|
|
Feature #3023 first solution.
I don't like to tell anything to the user when s/he wants to exit
pressing the back button. I assume s/he is saying: "Wanna go out!!"
I've implemented the behaviour written in UI Rev II.
If a user selects a new provider when coming back from Switch Provider,
the previous provider is forgotten and we assume s/he wants to change of
provider but he is not sure to which. That means that previous provider
configuration will be removed (that means there is no provider selected
and Dashboard will not be launched before a new provider is selected).
|
|
It only contains the "About LEAP" option.
If the user clicks again that option while the About fragment is up, no
new fragment is added and pressing 1 time the back button drives him/her
to the ConfigurationWizard activity.
|
|
If the user selects a provider, gets into provider detail, discards it,
further trials of selecting a provider trigger the same ProgressDialogs
than the initial trials.
|
|
If the user decides not to choose any provider, the app quits. I'll
create another branch to handle this exit properly, warning the user
with an AlertDialog as suggested in #3023.
|
|
Once in the provider detail fragment, if the user presses the back
button, provider.json is removed from sharedpreferences (so that
Dashboard does not start as if the user had selected the canceled
provider) and ConfigurationWizard gets the focus.
|
|
I've set ProviderAPI to show its own toast depending on the exception
that getStringFromProvider issues. If the socket timeout reaches its
end, a toast different from when an IOException or a MalformedException
occur.
|
|
They are commented, just in case we decide to include any of them before
releasing 0.2.0.
|
|
I return an intent with ConfigHelper.LOG_IN extra present. Dashboard
looks for it, and if found, starts LogInDialog.
|
|
Tested with dev.bitmask.net, I use the previously downloaded certificate
(I should not do that, I'll file an issue because I should download it
once the user has requested to do so).
Next step: login button from ProviderDetailFragment.
|
|
Domain, name and description come from provider.json
Next step: code buttons to login or to use anonymously.
|
|
I've also removed a lot of finishes when things go wrong (so that it should be returning to the previous activity/fragment).
|
|
Some more constants added to ConfigHelper.
This solves #2908.
|
|
This resolves the first step from issue #2908.
Next step: Put user message strings into an appropiate place.
|
|
It's working against cdev.bitmask.net and bitmask.net. Look at #2840 for
further explanation about self signed certificates.
I've also removed some file dependant configuration (when a provider was
custom, ConfigurationWizard still tried to read from file a
provider.json that now I store in memory via ProviderItem class).
|
|
There was a problem on the assets file "bitmask.url". It had an error in
the eip-service url.
We should use this file only for main url, and proceed as if it were a
new provider but with a preseeded main url.
|
|
readability
|
|
|
|
|
|
return information
|
|
boolean, JSONObject)
|
|
I download the anon certificate only if allow_anonymous is true, and
before launching Dashboard.
I store it in SharedPreferences, with "cert" key, as a JSON object.
|
|
I've upper cased ConfigHelper constants.
I've created a new method in ConfigHelper, to send requests to a server,
that it's used when sending A and M1.
|
|
Allow registration is present in provider.json.
Provider.json is downloaded from both preseeded and custom providers.
Authentication success or fail is notified correctly to the user.
|
|
It is stored in SharedPrefs, with ConfigHelper.cert_key (="cert") key.
|
|
entered, so that if in the future the client tries to log in or
whatever, it can use the certificate downloaded when added.
Log in dialog works ok, showing a toast when authentication fails (by
this time, I have not managed to get a correct login due to
dev.bitmask.net problems).
dev.bitmask.net works perfectly, via adding it as a new provider
(MeanderingCode, this is for you ;) ).
All GET requests are done by default Android URL class, which means that
certificates trusted by Android are also trusted by us. If there are
problems when logging in due to certificates, the app is able to use
only the certificate associated to the provider in the moment it was
selected as the chosen provider.
|
|
|
|
I need to implement bypass for dev.bitmask.net, because bitmask.net is
down.
|
|
|
|
New provider dialog works OK.
|
|
Next step: understand why ca.cert from bitmask is not being downloaded
correctly.
|
|
Conflicts:
src/se/leap/leapclient/ConfigHelper.java
src/se/leap/leapclient/ConfigurationWizard.java
src/se/leap/leapclient/ProviderAPI.java
|
|
ConfigurationWizard works without problem for both new and preseeded
providers. I've added flow control for the activity to finish when all
files have been downloaded, managing errors with
setResult(RESULT_CANCELED).
|
|
can download eip-service.json and ca.crt without having the latter as a
predefined trusted certificate. It does not ask anything about trusting
the new certificate as far as selecting a custom provider means that the
user trusts that url.
Next step: make provider.json also downloadable from https address using
ca.cert not trusted.
|
|
custom provider is selected.
Tested using https://bitmask.net as url for custom provider.
|
|
M1 is not OK, because errors (with null description, awkward) are
received from posting M1 to the server instead of M2.
Next step: purge user database from leap_webapp and start testing again.
|
|
Refactored downloadJsonFiles in ProviderAPI, new method from block in
the intent identification.
|
|
The problem was that ProviderItem.custom was not being set by the
constructor, and when using this variable from ConfigurationWizard to
get providers.json from http or from assets file.
|
|
ProviderListFragment, and then the user can choose it.
|
|
the website, just as bitmask.net/provider.json), and writes it to a file
in ~/leap_android.
Next steps: parse that file and download eip-service and cert.
|
|
Trying to test cancel button from created new dialog.
|