fix: Refactor AnkiServer for future HTTPS support (Issue #15991) by mixelas · Pull Request #20885 · ankidroid/Anki-Android

mixelas · 2026-04-28T19:25:35Z

Purpose / Description

This PR prepares the codebase for HTTPS support by refactoring AnkiServer to support SSL/TLS configuration, while maintaining backward compatibility.

Fixes

Fixes [BUG]: Restricting cleartext network traffic breaks import and statistics pages #15991

Approach

Added Context parameter to AnkiServer constructor to enable SSL setup when needed

Created SslUtil as a placeholder for future certificate generation
Updated all AnkiServer instantiations to pass context where available
Added unit tests for AnkiServer and SslUtil to verify basic functionality
Maintained full backward compatibility

How Has This Been Tested?

Full gradle build was successful
Kotlin compilation was successful
Unit tests created for:
AnkiServer baseUrl() returning HTTP when context not provided
AnkiServer baseUrl() containing localhost address
SslUtil placeholder initialization

Tested on:

Android Gradle Plugin 9.3.1
Kotlin 1.9.x
Java 21

Learning (optional, can help others)

While i was working with Android SDK, i noticed that it doesn't include sun.security internal APIs in modern versions. The proper approach for self-signed certificate generation on Android involves either:

Using BouncyCastle library
Using Android's KeyStore and KeyGenParameterSpec APIs

Checklist

Please, go through these checks before submitting the PR.

You have a descriptive commit message with a short title (first line, max 50 chars).
You have commented your code, particularly in hard-to-understand areas
You have performed a self-review of your own code
UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
UI Changes: You have tested your change using the Google Accessibility Scanner

)

david-allison

Are you planning on adding an implementation? Otherwise this PR doesn't feel mergeable on its own

BrayanDSO

Have you used AI on this PR?

BrayanDSO · 2026-04-29T15:35:53Z

@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2024 AnkiDroid Contributors


copyright is wrong

I just copied this from another file in the codebase. I wanted it to look like the other files in there. I also didn't add my name because i didn't think that this would get merged.

BrayanDSO · 2026-04-29T15:36:19Z

+    private const val KEYSTORE_FILENAME = "anki_keystore.bks"
+    private const val KEYSTORE_PASSWORD = "ankidroid"
+    private const val KEY_PASSWORD = "ankidroid"


I guess that hardcoding these values isn't safe

Their purpose was strictly as a placeholder. I didn't think that you would entrust me to do the whole thing so i made this instead.

BrayanDSO · 2026-04-29T15:36:31Z

+
+        // TODO: Generate self-signed X.509 certificate
+        // Currently creates empty keystore. Future implementations should use:
+        // - Android KeyStore API (preferred), or


we probably should be doing that now

I acknowledge this is incomplete. I didn't know which architecture you preferred.

BrayanDSO · 2026-04-29T15:36:55Z

    val statesMutationEvalFlow = MutableSharedFlow<String>()

-    override val server: AnkiServer = AnkiServer(this, repository.getServerPort()).also { it.start() }
+    override val server: AnkiServer = AnkiServer(this, null, repository.getServerPort()).also { it.start() }


this means the issue still isn't fixed on the new study screen

I see the concern, if I passed null as the context, HTTPS wouldn't be enabled on the new study screen, which defeats the purpose of this PR.

BrayanDSO · 2026-04-29T15:37:48Z

+ * Ignores any matching test defined with `@Flaky` in CI
+ * @see Flaky
+ */
+class IgnoreFlakyTestsInCIRule : TestRule {


idk why are you copying this file

These files aren't in my commits.

BrayanDSO · 2026-04-29T15:38:18Z

+ * @param runnable a function that is expected to throw an exception when executed
+ * @return the exception thrown by [runnable]
+ */
+inline fun <reified T : Throwable> assertThrows(


idk why you are copying this file

These files aren't in my commits. they appear to be pre-existing in the repository or from the base branch

mixelas · 2026-04-29T17:17:07Z

This was initially a placeholder as i didn't think that I had to make the complete HTTPS support. That is why it looks bad and AI generated, as I tried to do a simple fix. I will get on with pushing a PR with complete HTTPS support and give it my best.

mixelas · 2026-05-02T15:59:03Z

@david-allison can you please review again.

david-allison · 2026-05-03T13:49:41Z

The emulator tests are broken (and please remove the merge commit and rebase/force push onto main)

https://github.com/ankidroid/Anki-Android/blob/main/CONTRIBUTING.md#:~:text=AnkiDroid%20expects%20use%20of%20git%20rebase%20and%20git%20push%20%2D%2Dforce%20to%20PR%20branches.%20PRs%20with%20merge%20commits%20will%20not%20be%20merged.

david-allison · 2026-05-03T17:11:01Z

@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2024 David Allison <davidallisongithub@gmail.com>


Please remove these files, they shouldn't have been committed. testutils and testlib have been replaced with test fixtures

mixelas added 2 commits April 28, 2026 21:32

fix: Refactor AnkiServer for future HTTPS support (Issue ankidroid#15991

f757daf

)

fix: Simplify unit tests to match placeholder implementation

2e16da8

david-allison reviewed Apr 28, 2026

View reviewed changes

mixelas added 2 commits April 28, 2026 23:56

feat: Added implementation

a8b1515

fix: Remove Robolectric dependency from unit tests

739549b

BrayanDSO reviewed Apr 29, 2026

View reviewed changes

BrayanDSO added the Needs Author Reply Waiting for a reply from the original author label Apr 29, 2026

Fix HTTPS implementation for Issue ankidroid#15991

ffb28ba

mixelas force-pushed the fix/issue-15991-https-support branch from ba113ab to ffb28ba Compare May 3, 2026 14:09

github-actions Bot added the Has Conflicts label May 3, 2026

Fixed code for emulator tests

cdf361f

david-allison reviewed May 3, 2026

View reviewed changes

		@@ -0,0 +1,78 @@
		/*
		* Copyright (c) 2024 AnkiDroid Contributors

		@@ -0,0 +1,36 @@
		/*
		* Copyright (c) 2024 David Allison <davidallisongithub@gmail.com>

Uh oh!

Conversation

mixelas commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose / Description

Fixes

Approach

How Has This Been Tested?

Learning (optional, can help others)

Checklist

Uh oh!

david-allison left a comment

Choose a reason for hiding this comment

Uh oh!

BrayanDSO left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mixelas commented Apr 29, 2026

Uh oh!

mixelas commented May 2, 2026

Uh oh!

david-allison commented May 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mixelas commented Apr 28, 2026 •

edited

Loading

david-allison commented May 3, 2026 •

edited

Loading