Calyx/main #3
Open
Calyx/main #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Assets obtained from https://0xacab.org/leap/leap_assets/commit/94cb62034126129260011e21a7483fef7bc6dc70 * build.gradle: Drop calyx/ from tag name, so that we can have _1.0.3 in the apk name
Change-Id: I439a1d2ed259cba975102a92c3e018002b2a4544
Change-Id: Ib9468a0acbd9f5fb1efd5445ac877d2861d120da
Change-Id: Ia71a18d383369406b315ae05b86f1fb0e3780bdd
Change-Id: Ie905fa95a8dda6d0a7a9edbc8ab94611b67aae04
* No idea why this didn't get updated with the tag pulls * Matches: https://0xacab.org/leap/bitmask_android/-/commit/761c936e4f8b929c97f0ae65bc4867883f8da444 Change-Id: I98a4f41d616d1445cb78dd6394d8d120ce2dfae8
* Needed because of the fixup having created and -1 tag, and this eventually becoming -2 :( * Still better than force-pushing tags IMO Change-Id: I081c9e6964641bf5492bccee069ada7f92ef5ca3
Change-Id: Iadf4d3f3197a3af3134ce78398fd3498f8210e66
Change-Id: Ie43566f0ba591a948ed234f3ea06eb1e95820f2a Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Weblate <[email protected]>
Change-Id: I7b2016932048057d3ca1f8a964e17d8f35ddd425
Change-Id: I8ee4d305243a858dad0444cfe2afa3880e6caac6
This reverts commit be2cc5d. Reason for revert: Temporary, as promised. Change-Id: I7c6f5eec3f0ca41c4864bf357faa31b12604abdf
* Making changes this way will cause conflicts with translations * Reset the strings to upstream, and let's use our own file and string names Change-Id: I0c2a9c11813fbc664ebbc97948d57ee2e0886b1f
* tag '1.1.2' of https://0xacab.org/leap/bitmask_android: (334 commits) Adds another build task called double release to build more time efficiently multiple flavors. Adapting prepareForDistribution.sh accordingly build web apks and aabs in CI's release task remove unused and deprecated gradle tasks remove duplicated strings update version to 1.1.2 update translations always show 'show connection details' if connection details have been visible and are going to be hidden fix NPE in GatewaysManager remove insecure hint in EipFragment if VPN is connecting or reconnecting improve gateway connection setup animation avoid short animation when turning off the VPN fix Bitmask background image used in EipFragment don't show donation button in Bitmask for now build and enable snowflake feature minor update of obfs4 copyright string remove (shapeshifter) Dispatcher and Binary-Installer class, they're deprected and unused update License strings and AboutFragment fix insecure builds add missing import in DownloadNotificationManager ignore ProviderApiManager test case for insecure flavor ... # Conflicts: # app/src/custom/assets/calyx.net.json # app/src/custom/assets/riseup.net.pem # app/src/custom/res/values/custom-theme.xml Change-Id: I0d08a9febc3ca70a770a4192f9ed6c7939cea30f
* We used to modify strings.xml but that causes conflicts with translations * Let's use our own file like we do in other projects, and rename the string so that both versions can co-exist without conflicts * Copy our strings to the main variant as well to make sure builds keep working Also includes: custom: Update URLs * New URL for ToS * Remove period after URL TODO: Make them clickable, <a href= Change-Id: Ic7fb5b00f4a0067006aaa47f0d0fc4fd6415abb6 custom: Reword string slightly Change-Id: Ide955518062c75e5bbaad5725ca5b301def813fe Change-Id: I9cd9239326051cf10dfbfa7b767056f45c0d4eaa
* Copied from app/src/normal/assets * https://0xacab.org/leap/bitmask_android/-/merge_requests/166 Issue: calyxos#895 Change-Id: Ibf3583b962d3ad49d173389670d019f432e497ae
Change-Id: If9384e62d790c1e46cda9f60972e295df51ae532 Co-authored-by: Atrate <[email protected]> Co-authored-by: Bail Adnan Farid <[email protected]> Co-authored-by: Baptiste H <[email protected]> Co-authored-by: Dan <[email protected]> Co-authored-by: Denham McLaren <[email protected]> Co-authored-by: Doan Quan Tien <[email protected]> Co-authored-by: Gabriel Cardoso <[email protected]> Co-authored-by: Gediminas Murauskas <[email protected]> Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Jeffree Romero <[email protected]> Co-authored-by: Me0wzz <[email protected]> Co-authored-by: Michael Bestas <[email protected]> Co-authored-by: Micovec <[email protected]> Co-authored-by: Oğuz Ersen <[email protected]> Co-authored-by: Pander <[email protected]> Co-authored-by: Prachi Joshi <[email protected]> Co-authored-by: Temuri Doghonadze <[email protected]> Co-authored-by: Tom Sawyer <[email protected]> Co-authored-by: Translator-3000 <[email protected]> Co-authored-by: Weblate <[email protected]> Co-authored-by: Yaron Shahrabani <[email protected]> Co-authored-by: blueline <[email protected]> Co-authored-by: fawaz006 <[email protected]> Co-authored-by: gallegonovato <[email protected]> Co-authored-by: kbci_wcn <[email protected]> Co-authored-by: killerqu33n <[email protected]> Co-authored-by: lx3k <[email protected]> Co-authored-by: nautilusx <[email protected]> Co-authored-by: Егор Ермаков <[email protected]> Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ar/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ca/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/cs/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/de/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/el/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/en_AU/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/es/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/fr/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/fr_CA/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/gl/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/he/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/id/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/it/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ja/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ka/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ko/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/lt/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/mr/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ne/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/nl/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/pl/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ru/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/sv/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/tr/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/uk/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/vi/ Translation: CalyxOS/CalyxVPN
Change-Id: Iff7e973a2ea7546ebede4b98a1d510f2e7b75c42
* For the old infra, previous cert expired * SHA256 fingerprint 4bba0f918fa4be8ec4dde420b7d0ba98a351c1f5866d783d377c6bac40fd187a * New infra cert untouched Change-Id: I3c85c3758ce1d78b8253b0b1191b28d567d99390
* For the old infra, previous cert expired * SHA256 fingerprint 4bba0f918fa4be8ec4dde420b7d0ba98a351c1f5866d783d377c6bac40fd187a * New infra cert untouched * Same as I3c85c3758ce1d78b8253b0b1191b28d567d99390 Change-Id: I9b360fefc48f2721240d4f8bd3d6f92837fbe557
Change-Id: I060c7553d11eef7c12d4394e2e848cf17c3a5631
Change-Id: I598675726ad7c414308df7fca788cbe472edff0a Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Milo Ivir <[email protected]> Co-authored-by: Ram <[email protected]> Co-authored-by: Tsz Wai LAM <[email protected]> Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/hr/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ml/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/zh_Hant_HK/ Translation: CalyxOS/CalyxVPN
… HEAD # By cyBerta (227) and others # Via cyberta (62) and others * 'master' of https://0xacab.org/leap/bitmask_android: (301 commits) Updated README.md don't build openvpn3, openssl speed test and rsapss fix tests using mocked okhttpclient update DoH DNS Servers for API communication always try the complementary DNS resolution strategy if the primary one failed try tls 1.3 during bootstrapping draft DoH for bootstrapping update okhttp update bitmaskcore - improve build steps update bitmaskcore - update to latest obfsvpn only take experimental transports into consideration in case the user switched the experimental transport toggle fix missing domain name of manually added providers in provider selection adding tests add required extra options for obfs4-hop pt improve sanity check for obfs4 pts defined in eip-service.json Assume port hopping only in case of a missing endpoints json for obfs4-hop. The gateway IP and the cert json field in options substitute the missing endpoints json set correct proxy port for obfs4-hop pt proxy obfs4-hop enum value - improve handling of disallowed dashes in enums fix sanity checks for the case of decoupled bridges update bitmaskcore, obfsvpn ... # Conflicts: # app/build.gradle # app/src/custom/assets/calyx.net.json # app/src/custom/res/drawable-ldpi/logo.png # app/src/custom/res/drawable-mdpi/logo.png Change-Id: Icbfcc5d0758520e985497823e0d76cb846305382
Signed-off-by: Aayush Gupta <[email protected]> Change-Id: I4adf59bd9be89dbc0206f6127306225bb1f9ee98
* 1.1.8 was built by F-Droid, but from an outdated 3 month old tag which ended up on gitlab accidentailly (likely when trying to figure out build issues) * As such, it doesn't have the new IP and cert, and also has old resources * Retag and rebuild to get it all working Change-Id: I111fc2e6ecafb018a29aa0cd8647e4de2c085da3
Change-Id: I861b2187a73aa5295d3e6b78083b8f5dbc88105a Co-authored-by: Smarita-New <[email protected]> Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/zh_Hans/ Translation: CalyxOS/CalyxVPN
Change-Id: Ic40db42c6e2b6e66e28ff04adc14c49cdf87652d Co-authored-by: 0que <[email protected]> Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Mother is a Gambler <[email protected]> Co-authored-by: Parms <[email protected]> Co-authored-by: ShareASmile <[email protected]> Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/id/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/pa/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ro/ Translate-URL: https://hosted.weblate.org/projects/calyxos/bitmask_android/ru/ Translation: CalyxOS/CalyxVPN
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.