summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-07Bump build and version number for RC2Sean Leonard
2014-02-07Bump build and version number for RCSean Leonard
2014-02-07Merge branch 'bug/login-logout-messages' into developSean Leonard
2014-02-07bugfix for #4664 and #4668 (login/logout messages)Sean Leonard
Conflicts: src/se/leap/bitmaskclient/ProviderAPI.java res/values/strings.xml (Re-add lines removed in 7297632a01d5fb606b901d8c54e190e28b95716e )
2014-02-04Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' ↵Sean Leonard
into develop Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop
2014-02-04Remove launch log function and click listener from EIP status line.Sean Leonard
Log window Activity is gone with ics-openvpn purge. We will want it back, but we will bring back only what's needed.
2014-02-04Forgot to refactor string name in real code.Parménides GV
2014-02-04No more references to ics openvpn.Parménides GV
I've refactored a string name and the content of that string so that no references to legacy ics-openvpn user interface are present in there.
2014-02-04Lint performance: completely cleanSean Leonard
That means there is no unnecessary file, nor resource, in the project right now. Conflicts: res/values-ca/strings.xml res/values-cs/strings.xml res/values-de/strings.xml res/values-es/strings.xml res/values-et/strings.xml res/values-fr/strings.xml res/values-id/strings.xml res/values-it/strings.xml res/values-ja/strings.xml res/values-ko/strings.xml res/values-nl/strings.xml res/values-no/strings.xml res/values-ro/strings.xml res/values-ru/strings.xml res/values-uk/strings.xml res/values-zh-rCN/strings.xml res/values-zh-rTW/strings.xml res/values/strings.xml res/values/untranslatable.xml res/xml/main_headers.xml
2014-02-04Concordant AndroidManifest.Parménides GV
2014-02-04More unused classes wiped.Parménides GV
2014-02-04Deleted unused classes from ics-openvpn.Sean Leonard
This classes were an obvious choice, there may be more unused classes around there. Conflicts: src/se/leap/bitmaskclient/ProviderListFragment.java
2013-12-21there's no about fragment anymorecyBerta
2013-12-21Merge branch 'feature/move-the-settings-button-to-the-overflow-menu' into ↵cyBerta
develop
2013-12-21Merge branch 'bug/more-detailed-response-to-CW-errors' into developcyBerta
2013-12-20Merge branch 'feature/token-based-auth' into developcyBerta
Conflicts: src/se/leap/bitmaskclient/ConfigurationWizard.java src/se/leap/bitmaskclient/Dashboard.java src/se/leap/bitmaskclient/ProviderAPI.java src/se/leap/bitmaskclient/ProviderListFragment.java
2013-12-20Merge branch 'develop' of ssh://leap.se:22/bitmask_android into developcyBerta
2013-12-19Merge branch 'feature/UI_improvements' into developParménides GV
2013-12-19Merge branch 'bug/translation_Bitmask_instead_of_Leap_Android' into developParménides GV
2013-12-16Correct the location name in the notification (Bug #4660)cyBerta
2013-12-16remove 'Assigning IP address' from the progress notification (#4661)cyBerta
2013-12-12About is now an Activity.Parménides GV
I've also removed some spaces from the text.
2013-12-10Merge branch 'bug/configuring-progressbar-overlaps-provider-items' into developSean Leonard
2013-12-10Merge branch 'bug/strong-cert-pinning-to-using-downloaded-CA-cert' into developSean Leonard
2013-12-10Fixed algorithm to hide all but one provider.Parménides GV
2013-12-10Removed icon from settings overflow menu.Parménides GV
2013-12-10Rebased onto 0.2.3.Parménides GV
2013-12-10Rebased onto 0.2.2Parménides GV
2013-12-10Rebased onto current develop.Parménides GV
2013-12-10New provider dialog remembers previous data.Parménides GV
It also (supposedly, I didn't test because Bitmask is working ok from our client point of view) distinguishes between cancelling a new custom provider and cancelling a preseeded provider.
2013-12-10Retry button prompts new provider dialog.Parménides GV
The user can change the new provider's data entered before failing.
2013-12-10JavaDoc for pickErrorMessageParménides GV
2013-12-10Cleaner error message.Parménides GV
2013-12-10Not added item is removed after canceling dialog.Parménides GV
2013-12-10Retry button on failed downloads.Parménides GV
Next step: remove the provider from the list (big security hole, since all providers present on the list are assumed to be secure).
2013-12-10Save my work until nowParménides GV
2013-12-10Download results stored in static variables.Parménides GV
ProviderAPI has now 3 different static variables, each one for the 3 files that have to be downloaded to set up a provider.
2013-12-10Successfully rebased onto 0.2.2Parménides GV
2013-12-10CA cert saved correctly in SharedPreferences.Parménides GV
I/O error at login phase fixed.
2013-12-10ProviderAPI broadcasts progress to CW.Parménides GV
Setting up a provider makes the progressbar move according to the number of files downloaded (1/3, 2/3, 3/3). Next step: recover from download errors individually. That means that if a download fails but the others went OK, the user will be prompted to retry that individual failing download.
2013-12-10A bit of cleaning.Parménides GV
2013-12-10Provider setup: One method downloads everything.Parménides GV
This method uses another 3 to download each file. Next step: broadcast progress and remove unnecessary methods.
2013-12-10Successfully rebased onto progress-bars.Parménides GV
2013-12-10Simplified the methods to add a new provider.Parménides GV
Adding a new provider is the same that selecting a new one, using the same methods and following the same workflow.
2013-12-10Preseeded providers only have provider.json urlParménides GV
I've refactored everything to be able to remove all but provider.json url at urls files.
2013-12-10Removing unnecessary fields from ProviderItem.Parménides GV
I'm targeting to refactor the whole ProviderItem class because I've not used the Provider class so far and I should not duplicate information from "Provider" into "ProviderItem".
2013-12-10Settings button moved to overflow.Parménides GV
Icon resource left, just in case we need it in the future (overflow items with icon? google?).
2013-12-10Setting up a provider w/o connection doesn't fail.Parménides GV
There was a nullpointer already fixed in another branch which completely complements this one. The message shown to the user is empty, but that belongs to bug/more-detailed-response-to-CW-errors.
2013-12-09Rebased onto 0.2.3Parménides GV
2013-12-09Successfully rebased onto 0.2.2Parménides GV