summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/Constants.java
AgeCommit message (Collapse)Author
2018-06-27Merge branch 'master' into add_providerlalottacontinua
2018-06-23Modified donation reminderJanak Amarasena
2018-06-18solved merge conflictlalottacontinua
2018-06-07Minor updates according to received feedbackJanak Amarasena
2018-06-03Added donation remindersJanak Amarasena
2018-05-31Added donation button to navigation drawerJanak Amarasena
2018-05-12added NewProviderActivity basicsl
2018-02-28#8808 add dialog for always-on vpn infoscyBerta
2018-02-23#8754 enable pause openvpn on device inactivity featurecyBerta
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-158797 - pair programming effortFup Duck
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-13#8831 add a progress animation to EipFragment and don't start blocking vpn ↵cyBerta
when user triggered vpn start from UI
2018-02-098827 - resolve discussionsFup Duck
* remove stop for providerApi * enable retrySetUpProvider * renamed PROVIDER_KEY for EIP_JSON to PROVIDER_EIP_DEFINITION
2018-02-08Merge branch 'leap_0.9.8' into 8827_handle_switch_providerFup Duck
2018-02-08#8830 fix onBoot behavior after ui changescyBerta
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
2017-12-19refactor dashboardFup Duck
2017-12-14Update constants renamingcyBerta
2017-12-12Add Splash StartActivityFup Duck
* added Splash StartActivity to handle updates and initialization * created global Constants * move EIPConstants to Constants * create update possibility * use VectorDrawable as background for StartActivity