summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-19Merge branch 'bug/long-provider-names-get-cut-off-on-smaller-screens-#5606' ↵Parménides GV
into develop
2014-06-19Reordered introduced lines in textviewsParménides GV
2014-06-19Provider name in Dashboard is ellipsized correctlyParménides GV
2014-06-17Merge branch 'bug/crash-if-chosen-provider-doesn't-offer-eip-#5402-reopened' ↵Parménides GV
into develop
2014-06-17Progressbar can be null if there is no EIP serviceParménides GV
This happens when you've used a eip enabled provider, and then you switch to a non eip enabled one (e.g., choosing demo.bitmask.net and then switching to cdev.bitmask.net in their current configurations). I've also disabled the build task dependency on updating ics-openvpn. It's causing problems, while not fixing anything.
2014-06-16Bump version code for hotfix.Parménides GV
2014-06-16Merge branch 'hotfix/start-eip-null-pointer' into developParménides GV
2014-06-16Check if there is an active gateway selected.Parménides GV
The active gateway cannot be null.
2014-06-16Merge branch 'develop'Parménides GV
2014-06-16Merge branch 'feature/update-icsopenvpn-0.6.15' into developParménides GV
2014-06-16Succesfully updated.Parménides GV
2014-06-13Merge branch 'develop'Parménides GV
2014-06-13Merge branch 'release-0.5.2' into developParménides GV
2014-06-13Changelog for the 0.5.2 releaseParménides GV
2014-06-13Bump build number and version - 0.5.2Parménides GV
2014-06-13Merge branch 'develop' into release-0.5.2Parménides GV
2014-06-13Merge branch ↵Parménides GV
'feature/establish-an-upstream-relationship-with-ics-openvpn-codebase-#5381' into develop
2014-06-13Disconnect works, eip status receiver.Parménides GV
Disconnect uses the ics-openvpn activity, and the dialog prompting the user to confirm the disconnection is only shown when eip is connected or is trying to connect.
2014-06-12Notification heads to Dashboard.Parménides GV
Previously, it drived the user to the LogWindow.
2014-06-12Notify the user we're waiting for a server replyParménides GV
2014-06-12Disconnect from log window works.Parménides GV
2014-06-12Menu option to show the log window.Parménides GV
In case there is an error, user will not be prompted with a strange log window, but the app will provide it if s/he really wants to see it.
2014-06-12Hide logwindow by default.Parménides GV
Next step: show it when an error occurs.
2014-06-11Correctly connects to millipede.Parménides GV
Location keyword on android.cfg isn't supported, EIP corresponding code has been commented out. I think we should support it in ics-openvpn, so that we can show the location instead of the server name. I've updated all opensssl, openvpn, etc. subprojects from rev 813 of ics-openvpn, and jni too.
2014-06-10Grabs eip authentication data correctly.Parménides GV
Merged updated ics-openvpn-upstream (e7803cc8efcd1794e18b4e30a43d814c2834552d).
2014-06-09Updated to build tools 19.1.Parménides GV
2014-06-04LogWindow declared in AndroidManifest.Parménides GV
2014-05-29ics-openvpn receives ifconfig from the server.Parménides GV
Refactored AndroidManifest to include launchvpn and openvpnservice. Imported changes from ics-openvpn-upstream
2014-05-29Thread management has changed. Updated.Parménides GV
Now the thread managment doesn't happen statically, but through the binded openvpn service.
2014-05-29Last ics-openvpn compilation problem fixed.Parménides GV
Forgot to add the menu for the log. Now we'll strive to fix se.leap.bitmaskclient problems: first compilation, then functionality.
2014-05-29No AIDL nor api, logfragment related xml filesParménides GV
api folder and aidl files aren't needed for us. They are used for external apps that want to use ics-openvpn as an already installed package, while what we want is to avoid the installation of ics-openvpn including it (refactored) in bitmask android.
2014-05-28Resources merge correctly.Parménides GV
2014-05-21We need mercurial to fetch ics-openvpn.Parménides GV
2014-05-19Copy necessary activities and fragments.Parménides GV
Now we need to decide what's our relationship with LogWindow and LaunchVPN, refactor its classes and fix ours so that we use the currently supported methods.
2014-05-19bitmaskclient.R in de.blinkt.openvpn top levelParménides GV
2014-05-15Copy some necessary icons from ics-openvpn.Parménides GV
I'm hardcoding their values based on the compilation errors (i.e., the drawables referenced by de.blinkt.openvpn.core.OpenVpnService). If a new drawable were introduced, build.gradle should be updated accordingly.
2014-05-15Merge branch 'develop'Parménides GV
2014-05-15LICENSE file restore: GPLv3.Parménides GV
2014-05-15remove ics-openvpn strings from strings.xmlParménides GV
I privilege ics-openvpn translation to ours. If we need to change something, we can introduce a new xml element without any future compatibility problem with ics-openvpn.
2014-05-14Filter R and BuildConfig to use ours.Parménides GV
2014-05-14Copy aidl too.Parménides GV
WARNING: there are still compiling errors, related to BuildConfig and R classes in de.blinkt.openvpn
2014-05-14Copy all java files from ics-openvpn.Parménides GV
imports from se.leap.bitmaskclient java files have also been updated. WARNING: compiling errors for de.blinkt.openvpn.R, aidl.de.blinkt.openvpn.
2014-05-14clone ics-openvpn up-to-date if its folder existsParménides GV
2014-05-14Pull before updating ics-openvpn hg repositoryParménides GV
2014-05-14update ics-openvpn code gradle taskParménides GV
2014-05-14Clone ics-openvpn repository with gradle hg pluginParménides GV
2014-05-09Bump build number and version to 0.5.2RC1Parménides GV
2014-05-09Merge branch 'feature/signup-support-#5586' into developParménides GV
2014-05-08Signup option in login dialog.Parménides GV
2014-05-08Cancelling a failed signup/login stops progressbarParménides GV