summaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Collapse)Author
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-06Merge branch '8828_memory_leap_eip' into '0.9.8'cyberta
8828 - fix EipFragment leak See merge request leap/bitmask_android!32
2018-02-06Merge branch 'leap_0.9.8' into 8828_memory_leap_eipFup Duck
2018-02-068827 - remove UserStatus referencesFup Duck
2018-02-068827 add EipCommandFup Duck
2018-02-068827 - handle switch provider correctlyFup Duck
* ProviderAPI no longer stores values in SharedPreferences * use EipCommand to start / stop EIP * update NavigationDrawer after changing provider * use Broadcasts for ProviderAPI * parse more properties from definition into Provider * ProviderApi no longer uses static variables * no more static Context in ProviderApiCommand
2018-02-06Merge branch 'origin_0.9.8' into fupduck_8826_custom_providercyBerta
2018-02-06fix build after reenabling copy classes from ics-openvpn build jobcyBerta
2018-02-06#8832 more upsteam changescyBerta
2018-02-058832 custom build script that builds first :ics-openvpn:main and afterwards :appcyBerta
2018-02-02#8832 add missing resource referencescyBerta
2018-02-01Merge branch '#8818_tests_for_drawer' into #8832_update_ics-openvpncyBerta
2018-02-01#8832 update resources and set to latest submodule commitscyBerta
2018-02-01#8832 add all ics-openvpn code changescyBerta
2018-02-01#8832 add missing resources for nowcyBerta
2018-01-308828 - fix EipFragment leakFup Duck
2018-01-30#8779 remove unused strings that even don't have a default translationcyBerta
2018-01-29#8818 test NavigationDrawer with espresso test and update sdk thereforecyBerta
2018-01-28Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_providerFup Duck
2018-01-28Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_designcyBerta
2018-01-27fix comments for mergerequestFup Duck
2018-01-27resolve comments on merge requestFup Duck
2018-01-27fix first comments on merge requestFup Duck
2018-01-258819 - fix using anonymous loginFup Duck
2018-01-25add custom provider optionFup Duck
2018-01-23Merge branch '8819_config_wizard_design' into 8826_custom_providerFup Duck
2018-01-23check for correct providerFup Duck
2018-01-23add custom provider optionFup Duck
2018-01-23new UI for EipFragmentFup Duck
2018-01-21handle startActivityForResultFup Duck
2018-01-21Merge remote-tracking branch '0xacab/0.9.8' into 8819_config_wizard_designFup Duck
2018-01-21make password verification visibleFup Duck
2018-01-19Merge branch '0.9.8' into '8811_rename_vpn_to_provider_name'fupduck
# Conflicts: # app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
2018-01-19improve layoutFup Duck
* improve layout * gracefully handle orientation changes * respect small devices * set correct colors for buttons, error messages...
2018-01-19#8822 adds leakCanary library to Bitmask for analyzing memory leakscyBerta
2018-01-19#8799 fix confusing cancel dialogcyBerta
2018-01-18WizardConfiguration themeFup Duck
* download VPN certificate after loging in (#8813) * get the new design up to date (#8819) * fix crash when pressing login (#8817) * add a loading screen according to design (#8816)
2018-01-17#8811 set vpn option to top of navigation drawer, minor ux improvementscyBerta
2018-01-17reverted can → mustAllan Nordhøy
2018-01-17Spelling: Marked nouns, whitespace, upgrade, : BigversalAllan Nordhøy
2018-01-178788 fix image resolution for blocking icon in hdpicyBerta
2018-01-17#8788 implement VpnNotificationManager to handle notifications from VoidVPN ↵cyBerta
and OpenVPN
2018-01-16corretly handle dialog on orientation changeFup Duck
2018-01-16resolve commented issuesFup Duck
* recreate activity correctly after changing orientation * replace getApplicationActivity
2018-01-14update insecure configuration wizard as wellFup Duck
2018-01-13Merge remote-tracking branch '0xacab/0.9.8' into 8802_drawerFup Duck
2018-01-13allow rotation of ConfigWizardFup Duck
2018-01-13use variable instead of functionFup Duck