GitLab

Merge branch 'bug/if-you-don't-trust-this-application-it-still-tries-to-connect-(android)-#6115' into develop

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.

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).

That way we can publish the bitmask branch.

ics-openvpn is now officially on GitHub, and they track openssl and
openvpn as submodules, so it's easier to update everything. Just a git
submodule update --recursive.

I've also set up soft links to native modules from ics-openvpn in app,
so that we don't copy files in Gradle (which was causing problems with
the submodules .git* files, not being copied). That makes the repo
cleaner.

Merge branch 'feature/simplify-user-session-layout-and-update-dependencies' into feature/Look-for-a-better-solution-to-the-VPN-slider-#6863

Merge branch 'bug/pass-tests-for-0.9.4-#7078' into feature/Put-an-icon-in-the-user-status-FabButton-#6923

Sometimes, the emulator is so slow (I wish genymotion was open
source...) that even though everything's going OK tests fail because
they don't wait enough.

testVpnButtonIsDisplayed and testVpnIconIsDisplayed fail because calyx in testVpnEveryProvider fails, but if you run them alone they pass.

Give more time to provider details fragment to appear, because debugging makes the code run slowly.

Updated butterknife, dagger, renderers, fabbuton and gson, as well as
gradle plugin.

The FabButton doesn't scale the icon as big as I want it to be, and it
doesn't let me set the size to "wrap_content" because the library sets
the sizes to match_parent.
I'm going to try to modify my fork of FabButton to see if I can obtain
what I want in its demo: just an icon and the progress indicator, the
icon as big as possible.