summaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Collapse)Author
2018-02-18#8852 fix api urls for signup and logoutcyBerta
2018-02-18#8852 improve signup error handling for backend error messagescyBerta
2018-02-18#8852 pass provider to signup method as parametercyBerta
2018-02-18Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expirationcyBerta
* fix merge conflicts in: app/src/main/java/se/leap/bitmaskclient/EipFragment.java app/src/main/java/se/leap/bitmaskclient/eip/EIP.java app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
2018-02-18handle intent action in MainActivitys onCreatecyBerta
2018-02-18#8857 fix recreation / restore of ConfigurationWizard error dialogscyBerta
2018-02-17#8797 fix recreation / restore of MainActivityErrorDialogscyBerta
2018-02-16#8857 fix dialog recreation in EipFragmentcyBerta
2018-02-16#8797 change javadoc header in MainActivityErrorDialogcyBerta
2018-02-16Merge branch '#8831_progress_animation_when_connecting' into '0.9.8'cyberta
#8831 progress animation when connecting See merge request leap/bitmask_android!43
2018-02-16#8852 code review changescyBerta
2018-02-16Merge branch 'leap_0.9.8' into #8797_certificate_expirationFup Duck
2018-02-16Merge branch '#8846_remove_Dashboard' into '0.9.8'fupduck
#8846 remove legacy code and files: Dashboard, LogWindow, UserStatusFragment,… See merge request leap/bitmask_android!44
2018-02-158797 - pair programming effortFup Duck
2018-02-14#8854 set Provider as argument for EipFragmentcyBerta
2018-02-14#8846 remove legacy code and files: Dashboard, LogWindow, ↵cyBerta
UserStatusFragment, FabButton library etc.
2018-02-13#8831 add a fadeout animation for the progressbarcyBerta
2018-02-13Merge branch 'origin_0.9.8' into #8831_progress_animation_when_connectingcyBerta
* added new EipCommand in StartActivity * added option to add intent extras to EipCommand * resolved merge conflicts and minor refactorings in: app/src/main/java/se/leap/bitmaskclient/EipFragment.java app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
2018-02-13update targetSdkFup Duck
2018-02-138827 - add mockConfigHelpperFup Duck
2018-02-13Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-13#8831 smoothing progressbar a little bitcyBerta
2018-02-13#8831 add a progress animation to EipFragment and don't start blocking vpn ↵cyBerta
when user triggered vpn start from UI
2018-02-128827 - remove caCertificate from ProviderFup Duck
It's already represented by CertificatePin & CertificatePinEncoding
2018-02-128827 - fix equals for ProviderFup Duck
2018-02-12#8837 update tests and fix VPN_Paused implementation for EipStatuscyBerta
2018-02-118827 - refactoringFup Duck
* remove unused functions * refactor reading stored credentials from preferences
2018-02-118827 - merge request discussionsFup Duck
* add deleteProviderDetailsFromPreferences to ConfigHelper * validate every field in Provider.equals * add reset() method to Provider
2018-02-118827 - discussionFup Duck
* validate urls before changing anything in Provider.define() * save private key and vpn cert after login/signup
2018-02-11Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-10#8837 new handling of connection state LEVEL_VPNPAUSED - don't throw an ↵cyBerta
illegal state exception
2018-02-10Merge branch '8554_error_array' into '0.9.8'cyberta
#8554 See merge request leap/bitmask_android!41
2018-02-098554 - show Loading screen on bigger screensFup Duck
2018-02-098827 - save privatekey and vpncertFup Duck
2018-02-098827 - resolve discussionsFup Duck
* use LocalBroadcastManager for broadcasts * add NullPointer checks to EipFragment * store VpnCertificate & private key in Provider not preferences * EipFragment uses provider instead of reading from preferences * use switch in ProviderApiManager
2018-02-098827 - resolve discussionsFup Duck
* remove stop for providerApi * enable retrySetUpProvider * renamed PROVIDER_KEY for EIP_JSON to PROVIDER_EIP_DEFINITION
2018-02-098827 - merge request discussionsFup Duck
* add NullPointer checks to EipFragment * add Provider to DownloadFailedDialog * remove unused code * store certificates for pinning in SharedPreferences
2018-02-08Merge branch '8833_drawer_click' into '0.9.8'cyberta
8833 - consume click in drawer See merge request leap/bitmask_android!40
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-08\#8554Fup Duck
* show only first error of error array * show loading screenin credentials activities * render link in error message correctly
2018-02-088833 - consume click in drawerFup Duck
2018-02-08Merge branch 'mirror_0xacab_0.9.8' into #8830_onBoot_alwaysOncyBerta
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-08Merge branch '8823_cw_tablet_layout' into '0.9.8'fupduck
8823 cw tablet layout See merge request leap/bitmask_android!36
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-088827 - add null checkFup Duck
2018-02-088827 - fix testsFup Duck
2018-02-08automatically start vpn after a successful configuration of a new providercyBerta
2018-02-08#8830 fix onBoot behavior after ui changescyBerta
2018-02-07#8841 fixes multidex issue on Android devices with API < 20cyBerta