Commit 9966f80
committed
Fix: don't request MediaProjection permission for text-only WebView models
sendMessageFromWebView checked GenerativeAiViewModelFactory.getCurrentModel()
.supportsScreenshot directly, which always reports true for ONLINE_MODEL (the
placeholder used for every JS-only model selected from the WebView dropdown).
This caused a MediaProjection permission prompt before sending a message even
when a text-only model (e.g. a Groq/Cerebras text-only model) was selected.
Extracted the existing, correct capability-resolution logic from
ScreenOperatorAccessibilityService.currentModelSupportsScreenshot() into a
shared util/ActiveModelCapabilities.kt so both the accessibility service and
MainActivity.sendMessageFromWebView resolve the model's real screenshot
support the same way (custom JSON model -> JS-only WebView model via the
persisted js_only_supports_screenshot flag -> native model enum).1 parent da93462 commit 9966f80
3 files changed
Lines changed: 62 additions & 28 deletions
File tree
- app/src/main/kotlin/com/google/ai/sample
- util
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| 72 | + | |
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| |||
1396 | 1397 | | |
1397 | 1398 | | |
1398 | 1399 | | |
| 1400 | + | |
| 1401 | + | |
| 1402 | + | |
| 1403 | + | |
| 1404 | + | |
| 1405 | + | |
| 1406 | + | |
1399 | 1407 | | |
1400 | 1408 | | |
1401 | | - | |
| 1409 | + | |
| 1410 | + | |
1402 | 1411 | | |
1403 | 1412 | | |
1404 | 1413 | | |
| |||
Lines changed: 3 additions & 27 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
515 | 516 | | |
516 | 517 | | |
517 | 518 | | |
518 | | - | |
519 | | - | |
520 | | - | |
521 | | - | |
522 | | - | |
523 | | - | |
524 | | - | |
525 | | - | |
526 | | - | |
527 | | - | |
528 | | - | |
529 | | - | |
530 | | - | |
531 | | - | |
532 | | - | |
533 | | - | |
534 | | - | |
535 | | - | |
536 | | - | |
537 | | - | |
538 | | - | |
539 | | - | |
540 | | - | |
541 | | - | |
542 | | - | |
543 | | - | |
544 | | - | |
| 519 | + | |
| 520 | + | |
545 | 521 | | |
546 | 522 | | |
547 | 523 | | |
| |||
Lines changed: 49 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
0 commit comments