summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
2013-12-09CA cert saved correctly in SharedPreferences.Parménides GV
I/O error at login phase fixed.
2013-12-09ProviderAPI 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-09A bit of cleaning.Parménides GV
2013-12-09Provider 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-09Successfully rebased onto progress-bars.Parménides GV
2013-12-09Simplified 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-09Preseeded 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-09Removing 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-04Merge branch 'release-0.2.3'0.2.3Sean Leonard
2013-12-04Bump build and versionSean Leonard
2013-12-04ChangelogSean Leonard
2013-12-04Merge branch 'develop' into release-0.2.3Sean Leonard
2013-12-04Bump build and versionSean Leonard
2013-12-04ChangelogSean Leonard
2013-12-05Turn the login icon into simple text (Bug #4659)cyBerta
2013-12-05Show location in openvpn notification message (Feature #4665)cyBerta
2013-12-04Merge branch 'develop' of ssh://leap.se:22/bitmask_android into developcyBerta
2013-12-04about bitmask instead of about LEAPcyBerta
2013-12-04remove translations for LEAP for AndroidcyBerta
2013-12-04Merge branch 'hotfix/vpn-routes-never-set' into developParménides GV
2013-12-04Merge branch 'bug/fix-switch-provider' into developParménides GV
2013-12-04Rebased and working fine.Parménides GV
I've restored use_anonymously() and login() methods from ConfigurationWizard, now everything works ok.
2013-12-04fix for notification message on state exitingcyBerta
2013-12-04logout simplified and logs removedcyBerta
2013-12-04Active gateway is updated every eip start.Parménides GV
2013-12-04Vpn profiles get updated after switching provider.Parménides GV
parsedEipSerial wasn't being reset after switching provider, so updating gateways thought there was no real update. After switching provider, we also remove all other vpn profiles.
2013-12-04bugfixes for switch toggle behaviorcyBerta
2013-12-04set key icon also on state EXITINGcyBerta
2013-12-04added FATAL as status for reconnection timoutcyBerta
2013-12-04switch provider part 1cyBerta
2013-12-03Revert "No new routes if openvpn is already running."Sean Leonard
This reverts commit 5b772c23c3f45405f30de4a180fe47dbcb2fdfc4.
2013-12-04Merge branch 'develop' of ssh://leap.se:22/bitmask_android into developcyBerta
2013-12-03Merge branch ↵Sean Leonard
'bug/login-button-from-Provider-Details-does-not-always-trigger-login-dialog-#4647' into develop Signed-off-by: Sean Leonard <meanderingcode@aetherislands.net>
2013-12-03Merge branch 'bug/logout-crashes-if-the-dashboard-goes-to-background-#4634' ↵Sean Leonard
into develop Signed-off-by: Sean Leonard <meanderingcode@aetherislands.net>
2013-12-03Login triggered if requested after provider switchParménides GV
Request code for switching provider was not being considered in onActivityResult.
2013-12-03NullPointer checks in logoutParménides GV
Check if eipStatus and mProgressBar are null in logout(), and if so fetch the objects with findViewById.
2013-11-30Merge branch 'develop' of ssh://leap.se:22/bitmask_android into developcyBerta
2013-11-29Merge branch 'bug/fix-url-check' into developSean Leonard