Merge pull request #27648 from owncloud/update-from-market

Dispatch upgradeAppStoreApps event
owncloud · Apr 18, 2017 · 39c01cc · 39c01cc
2 parents 3e670cd + e9734b0
commit 39c01cc
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
@@ -344,7 +344,9 @@ private function checkAppsRequirements() {
 			$info = OC_App::getAppInfo($app);
 			if(!OC_App::isAppCompatible($version, $info)) {
 				OC_App::disable($app);
+				$disabledApps[]= $app;
 				$this->emit('\OC\Updater', 'incompatibleAppDisabled', [$app]);
+				continue;
 			}
 			// no need to disable any app in case this is a non-core upgrade
 			if (!$isCoreUpgrade) {
@@ -386,23 +388,18 @@ private function isCodeUpgrade() {
 	 * @throws \Exception
 	 */
 	private function upgradeAppStoreApps(array $disabledApps) {
-
-		//
-		// TODO: integrate market app in here
-		//
-
-//		foreach($disabledApps as $app) {
-//			try {
-//				if (Installer::isUpdateAvailable($app)) {
-//					$ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
-//
-//					$this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
-//					Installer::updateAppByOCSId($ocsId);
-//				}
-//			} catch (\Exception $ex) {
-//				$this->log->logException($ex, ['app' => 'core']);
-//			}
-//		}
+		$dispatcher = \OC::$server->getEventDispatcher();
+		foreach($disabledApps as $app) {
+			try {
+				$this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
+				$dispatcher->dispatch(
+					self::class . '::upgradeAppStoreApps',
+					new GenericEvent($app)
+				);
+			} catch (\Exception $ex) {
+				$this->log->logException($ex, ['app' => 'core']);
+			}
+		}
 	}
 
 	/**