summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-19bump Android SDK minor revision in READMEkwadronaut
2016-09-19Merge remote-tracking branch 'upstream/develop' into developkwadronaut
2016-04-03Merge branch 'bug/shows-log-on-error' into developParménides GV
2016-04-03Bitmask does not show the log if an error happens.Parménides GV
ics-openvpn already shows it if necessary. Our heuristic (just looking for an "error" keyword in the past N messages of the log) is very weak, and it returns an annoying false positive: turning off the VPN triggers the show log error.
2016-04-02Merge branch 'update-ics-openvpn' into developParménides GV
2016-04-02Update BuildTools to 23.0.3, and pluginsParménides GV
- Android gradle plugin to 1.5.0 - Gson to 2.4 - Support annotations to 23.2.1 - Robotium-solo to 5.5.4
2016-04-02VpnStatus.initLogCache must be called only once.Parménides GV
onCreate gets called when the activity is back on the screen. If the app was already launched, we should not set everything up again.
2016-04-02Update ics-openvpnParménides GV
2016-02-07Typo in README, ndk version in PATH additionParménides GV
2016-02-07Merge branch 'bug/update-readme-to-reflect-minimum-versions-#7885' into developParménides GV
2016-02-07Update README to reflect last versions of Android toolsParménides GV
2016-02-07Merge branch 'feature/update-ics-openvpn' into developParménides GV
2016-02-07Merge branch 'bug/include-git-submodules-update-in-README-#7879' into developParménides GV
2016-02-06Pause icon, init log file in DashboardParménides GV
2016-02-06Update ics-openvpnParménides GV
2016-02-06Update build tools and compile sdk version.Parménides GV
Warn about the needed libraries for 64 bit systems.
2016-02-06Init ics-openvpn submodulesParménides GV
2015-08-25Merge branch 'KwadroNaut-typo' into developParménides GV
2015-08-15Merge pull request #1 from KwadroNaut/KwadroNaut-typoKwadroNaut
A quote too much
2015-08-15A quote too muchKwadroNaut
This is also an open issue in Transifex: https://www.transifex.com/otf/bitmask-android/translate/#es/$/22692144?issue=yes You should double check if this is correct.
2015-06-29Merge branch 'feature/f-droid-verify-support-#6165' into develop0.9.4_FDROIDParménides GV
2015-06-24Write SD card permission needs to be turned on for tests onlyParménides GV
2015-06-24Remove mips architecture in ics-openvpn, and use fdroid's buildtools versionParménides GV
2015-06-24Use https to fetch submodulesParménides GV
2015-06-24Merge branch 'feature/update-play-store-screenshots-for-0.9.4-#7172' into ↵Parménides GV
develop
2015-06-24Tuned some times, refactoring testsParménides GV
2015-06-16Merge branch 'release-0.9.4' into developParménides GV
2015-06-16Final 0.9.4 - the "fabbutton" releaseParménides GV
2015-06-16Merge branch 'develop' into release-0.9.4Parménides GV
2015-06-16Merge branch 'feature/Put-an-icon-in-the-user-status-FabButton-#6923' into ↵Parménides GV
develop
2015-06-16Resized account icon according to vpn iconsParménides GV
2015-06-12Transparent background of the FabButton, yay!Parménides GV
2015-06-110.9.4RC4Parménides GV
2015-06-11Merge branch 'develop' into release-0.9.4Parménides GV
2015-06-11Merge branch 'feature/update-ics-openvpn-Jun-7th' into developParménides GV
2015-06-11Update java and xml filesParménides GV
2015-06-11Update ics-openvpn to Jun 7thParménides GV
2015-06-100.9.4RC3Parménides GV
2015-06-10Merge branch 'develop' into release-0.9.4Parménides GV
2015-06-10Merge branch ↵Parménides GV
'bug/if-you-don't-trust-this-application-it-still-tries-to-connect-(android)-#6115' into develop
2015-06-10Update ics-openvpn moduleParménides GV
It was already updated in bug/if-you-don't-trust-this-application-it-still-tries-to-connect-(android)-#6115, but git complains about merging a branch with dirty branches.
2015-06-10Handle "Cancel" button of the Android VPN permission dialogParménides GV
2015-06-08Merge branch 'bug/Riseup-provider-fails-to-get-configured-#7113' into developParménides GV
2015-06-08s/buildtype/flavor, changed riseup's pinParménides GV
Riseup's EE certificate expired (EE = End-Entity, the commercial certificate signed by the issuer), and we weren't able to fetch provider.json because the pin wasn't valid. This problem needs to be avoided in the future, using HKPK (https://tools.ietf.org/html/rfc7469), which Micah's implementing on Riseup. Switching from build types from flavors enables us to run tests against production apk, not just debug. I didn't detect this pinning problem because tests were run only against the debug apk, which trusted preseeded providers by default (thus bypassing pinning issue).
2015-06-080.9.4RC2 - ics-openvpn updatedParménides GV
2015-06-08Merge branch 'develop' into release-0.9.4Parménides GV
2015-06-05Merge branch 'feature/Update-ics-openvpn-from-GitHub-#7087' into developParménides GV
2015-06-04Update git submodules recursively from ./gradlew updateIcsParménides GV
2015-06-04Try to track "bitmask" branch from ics-openvpn forkParménides GV
2015-06-04Updated bitmask branch from ics-openvpn fork, second notificationParménides GV