Commit 722b921
fix: complete backport of shared trashbin objects access
Restore the hunks missing from the original backport of #60648:
- replace the legacy owned-calendars result loop in
collectDeletedCalendarObjectsForPrincipal() which clobbered the
by-reference accumulator and skipped the delegated-calendar URI logic
- add the missing canModify()/isShared() permission helpers and the
getSourceCalendarUri()/getCalendarPrincipalUri()/getDelegator()
getters used by the trashbin plugin
Also adapt fetchAssociative() to fetch() since IResult on stable32
does not expose fetchAssociative().
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>1 parent 848c0c9 commit 722b921
2 files changed
Lines changed: 35 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1228 | 1228 | | |
1229 | 1229 | | |
1230 | 1230 | | |
1231 | | - | |
1232 | | - | |
1233 | 1231 | | |
1234 | | - | |
1235 | | - | |
1236 | | - | |
1237 | | - | |
1238 | | - | |
1239 | | - | |
1240 | | - | |
1241 | | - | |
1242 | | - | |
1243 | | - | |
1244 | | - | |
1245 | | - | |
| 1232 | + | |
| 1233 | + | |
| 1234 | + | |
| 1235 | + | |
| 1236 | + | |
| 1237 | + | |
| 1238 | + | |
1246 | 1239 | | |
1247 | 1240 | | |
1248 | 1241 | | |
| |||
1260 | 1253 | | |
1261 | 1254 | | |
1262 | 1255 | | |
1263 | | - | |
| 1256 | + | |
1264 | 1257 | | |
1265 | 1258 | | |
1266 | 1259 | | |
| |||
2710 | 2703 | | |
2711 | 2704 | | |
2712 | 2705 | | |
2713 | | - | |
| 2706 | + | |
2714 | 2707 | | |
2715 | 2708 | | |
2716 | 2709 | | |
| |||
2735 | 2728 | | |
2736 | 2729 | | |
2737 | 2730 | | |
2738 | | - | |
| 2731 | + | |
2739 | 2732 | | |
2740 | 2733 | | |
2741 | 2734 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
43 | 56 | | |
44 | 57 | | |
45 | 58 | | |
| |||
92 | 105 | | |
93 | 106 | | |
94 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
95 | 120 | | |
96 | 121 | | |
97 | 122 | | |
| |||
0 commit comments