Commit f9cac7b
fix(network): cancel in-flight OkHttp calls when kill switch is disabled (R2 round 7)
KillSwitchInterceptor only rejects NEW requests on chain entry; calls that have already passed the interceptors and are blocked on socket I/O (especially MapLibre online-tile fetches that go through the raw call factory) continued running for the full read timeout after the user toggled offline -- leaking cleartext metadata for up to 30 seconds.
DefaultNetworkGateway.setEnabled(false) now calls client.dispatcher.cancelAll() on the shared OkHttp Dispatcher. Per-request clients built via newBuilder() share that Dispatcher instance, so MapLibre's tile and style requests are cancelled too. The flip is idempotent and only fires on a true enabled->disabled transition.
Updated NetworkGateway.setEnabled KDoc to accurately describe both effects (reject future + cancel in-flight). Added test that enqueues a SocketPolicy.NO_RESPONSE response, launches a synchronous call on a worker thread, flips the switch off, and asserts the call is cancelled within 5s (would otherwise wait the 30s read timeout).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent 1335185 commit f9cac7b
3 files changed
Lines changed: 91 additions & 3 deletions
File tree
- network/src
- main/java/com/adsamcik/tracker/network
- test/java/com/adsamcik/tracker/network
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
| 222 | + | |
222 | 223 | | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
223 | 235 | | |
224 | 236 | | |
225 | 237 | | |
| |||
Lines changed: 18 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
75 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
76 | 91 | | |
77 | 92 | | |
78 | | - | |
| 93 | + | |
79 | 94 | | |
80 | 95 | | |
81 | 96 | | |
| |||
Lines changed: 61 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
113 | 174 | | |
114 | 175 | | |
115 | 176 | | |
| |||
0 commit comments