summaryrefslogtreecommitdiff
path: root/src/se/leap/leapclient/ConfigurationWizard.java
AgeCommit message (Collapse)Author
2013-04-15Added one "else if" that I missed during merge.Parménides GV
Next step: understand why ca.cert from bitmask is not being downloaded correctly.
2013-04-15Merge branch 'wizard' into feature/wizardParménides GV
Conflicts: src/se/leap/leapclient/ConfigHelper.java src/se/leap/leapclient/ConfigurationWizard.java src/se/leap/leapclient/ProviderAPI.java
2013-03-18Refactored ProviderAPI code.Parménides GV
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).
2013-03-14After downloading provider.json successfully, ConfigurationWizard nowParménides GV
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.
2013-03-13ConfigurationWizard sets provider.json correctly for Dashboard once aParménides GV
custom provider is selected. Tested using https://bitmask.net as url for custom provider.
2013-03-05Registering method from ProviderAPI implemented and tested.Parménides GV
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.
2013-02-28Now, ProviderAPI sends result to ConfigurationWizard.Parménides GV
Refactored downloadJsonFiles in ProviderAPI, new method from block in the intent identification.
2013-02-13Solves Issue #1757.Parménides GV
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.
2013-02-12New custom provider dialog effectively adds the new provider to theparmegv
ProviderListFragment, and then the user can choose it.
2013-02-11Gets provider.json from custom url (assuming the file is at the root ofParménides GV
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.
2013-02-07Button not working from ConfigurationWizard.Parménides GV
Trying to test cancel button from created new dialog.
2013-02-07Change in Dashboard to startActivityForResult() ConfigurationWizardSean Leonard
2013-02-07Refactor ProviderListActivity.class into ConfigurationWizard.class,Sean Leonard
Moves towards our wizard flow; Addresses #1497 #1500