-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
fix(apps-store): Remove apps from force-enabled state when uninstalled #48855
Open
susnux
wants to merge
1
commit into
master
Choose a base branch
from
fix/app-store-remove-force-enable
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+34
−35
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
susnux
requested review from
a team,
icewind1991,
nfebe,
sorbaugh and
artonge
and removed request for
a team
October 23, 2024 11:41
susnux
force-pushed
the
fix/app-store-remove-force-enable
branch
from
October 23, 2024 13:27
d7fcbc2
to
cb45a3b
Compare
susnux
requested review from
provokateurin and
come-nc
and removed request for
icewind1991 and
sorbaugh
October 23, 2024 15:42
susnux
force-pushed
the
fix/app-store-remove-force-enable
branch
from
October 29, 2024 12:44
cb45a3b
to
430bdc7
Compare
provokateurin
requested changes
Oct 29, 2024
provokateurin
approved these changes
Oct 29, 2024
come-nc
reviewed
Nov 4, 2024
susnux
force-pushed
the
fix/app-store-remove-force-enable
branch
from
November 11, 2024 20:15
430bdc7
to
64bd769
Compare
skjnldsv
approved these changes
Nov 11, 2024
susnux
force-pushed
the
fix/app-store-remove-force-enable
branch
from
November 11, 2024 20:51
64bd769
to
f185c67
Compare
If an app is force-enabled and then uninstalled the force-enabled state was kept. This is now removed, so when the app should be re-installed the compatibility should be reevaluated. Signed-off-by: Ferdinand Thiessen <[email protected]>
susnux
force-pushed
the
fix/app-store-remove-force-enable
branch
from
November 11, 2024 20:52
f185c67
to
1cf2bbc
Compare
come-nc
requested changes
Nov 12, 2024
Comment on lines
+595
to
+598
$appManager = $this->appManager; | ||
// If this app was force enabled, remove the force-enabled-state | ||
$appManager->removeOverwriteNextcloudRequirement($appId); | ||
$appManager->clearAppsCache(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
$appManager = $this->appManager; | |
// If this app was force enabled, remove the force-enabled-state | |
$appManager->removeOverwriteNextcloudRequirement($appId); | |
$appManager->clearAppsCache(); | |
// If this app was force enabled, remove the force-enabled-state | |
$this->appManager->removeOverwriteNextcloudRequirement($appId); | |
$this->appManager->clearAppsCache(); |
Comment on lines
+636
to
+640
/** @var \OC\App\AppManager $appManager */ | ||
$appManager = $this->appManager; | ||
|
||
$appId = $appManager->cleanAppId($appId); | ||
$appManager->overwriteNextcloudRequirement($appId); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
/** @var \OC\App\AppManager $appManager */ | |
$appManager = $this->appManager; | |
$appId = $appManager->cleanAppId($appId); | |
$appManager->overwriteNextcloudRequirement($appId); | |
$appId = $this->appManager->cleanAppId($appId); | |
$this->appManager->overwriteNextcloudRequirement($appId); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
If an app is force-enabled and then uninstalled the force-enabled state was kept. This is now removed, so when the app should be re-installed the compatibility should be reevaluated.
Checklist