Skip to content

[stable32] revert #2454 #3040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Oct 13, 2026
Merged

[stable32] revert #2454 #3040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ Those groups of people can then be used by any other app for sharing purpose.
<step>OCA\Circles\Migration\Migration</step>
<step>OCA\Circles\Migration\SyncGroupCircles</step>
</post-migration>
<live-migration>
<step>OCA\Circles\Migration\RemoveShareTokens</step>
</live-migration>
</repair-steps>

<commands>
Expand Down
2 changes: 0 additions & 2 deletions lib/ConfigLexicon.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/
class ConfigLexicon implements ILexicon {
public const USER_SINGLE_ID = 'userSingleId';
public const REMOVE_SHARE_TOKENS_DONE = 'remove_share_tokens_done';

public function getStrictness(): Strictness {
return Strictness::IGNORE;
Expand All @@ -35,7 +34,6 @@ public function getAppConfigs(): array {
public function getUserConfigs(): array {
return [
new Entry(key: self::USER_SINGLE_ID, type: ValueType::STRING, defaultRaw: '', definition: 'caching singleId for each local account', lazy: false, flags: IUserConfig::FLAG_INDEXED),
new Entry(key: self::REMOVE_SHARE_TOKENS_DONE, type: ValueType::BOOL, defaultRaw: false, definition: 'whether the remove share tokens repair step has already been executed', lazy: true),
];
}
}
58 changes: 0 additions & 58 deletions lib/Migration/RemoveShareTokens.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/Model/ShareWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function setToken(string $token): self {
}

public function getToken(): string {
return $this->shareToken?->getToken() ?? '';
return $this->token;
}

public function setStatus(int $status): self {
Expand Down
1 change: 1 addition & 0 deletions lib/ShareByCircleProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public function create(IShare $share): IShare {
->add(DataProbe::INITIATOR, [DataProbe::BASED_ON]);

$circle = $this->circleService->probeCircle($share->getSharedWith(), $circleProbe, $dataProbe);
$share->setToken($this->token(15));
$share->setMailSend(true);
$owner = $circle->getInitiator();
$this->shareWrapperService->save($share);
Expand Down
Loading