Merge back Release 2.6.1

CHANGELOG.md

@@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased] - XXXX-XX-XX
 
+
+
+## [2.6.1] - 2021-06-17
+
+### Changed
+
+- Add shareExpire-param to indicate if a share was removed due to its expiry - [#944](https://github.com/owncloud/activity/issues/944)
+- Automations in activity stream - [#942](https://github.com/owncloud/activity/issues/942)
+
+### Fixed
+
+- Expired public share has wrong activity message - [#965](https://github.com/owncloud/activity/issues/965)
+
+
 ## [2.6.0] - 2020-10-16
 
 ### Added
@@ -117,7 +131,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Show displayName instead of group id - [#582](https://github.com/owncloud/activity/issues/582)
 - Catch mail exceptions and still remove sent emails from queue - [#574](https://github.com/owncloud/activity/issues/574)
 
-[Unreleased]: https://github.com/owncloud/activity/compare/v2.6.0...master
+
+[Unreleased]: https://github.com/owncloud/activity/compare/v2.6.1...master
+[2.6.1]: https://github.com/owncloud/activity/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/owncloud/activity/compare/v2.5.4...v2.6.0
 [2.5.4]: https://github.com/owncloud/activity/compare/v2.5.3...v2.5.4
 [2.5.3]: https://github.com/owncloud/activity/compare/v2.5.2...v2.5.3

appinfo/info.xml

@@ -15,7 +15,7 @@ Never again miss an important event related to content in ownCloud and always be
   </description>
   <licence>AGPL</licence>
   <author>Thomas Müller, Frank Karlitschek, Joas Schilling, Tom Needham, Vincent Petry</author>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
   <default_enable/>
   <types>
     <filesystem/>
@@ -30,7 +30,7 @@ Never again miss an important event related to content in ownCloud and always be
   <screenshot>https://raw.githubusercontent.com/owncloud/screenshots/68550c2b7c53e6309132ca1c7b177adca976db0b/activity/activity.png</screenshot>
   <category>tools</category>
   <dependencies>
-    <owncloud min-version="10.7.1" max-version="10"/>
+    <owncloud min-version="10.8.0" max-version="10"/>
   </dependencies>
   <background-jobs>
     <job>OCA\Activity\BackgroundJob\EmailNotification</job>

lib/FilesHooks.php

@@ -436,7 +436,7 @@ protected function shareFileOrFolderByLink($fileSource, $itemType, $linkOwner, $
 		if ($isSharing) {
 			$actionSharer = 'shared_link_self';
 			$actionOwner = 'reshared_link_by';
-		} elseif ($this->currentUser !== $linkOwner) {
+		} elseif ($shareExpired === true) {
 			// Link expired
 			$actionSharer = 'link_expired';
 			$actionOwner = 'link_by_expired';

sonar-project.properties

@@ -1,7 +1,7 @@
 # Organization and project keys are displayed in the right sidebar of the project homepage
 sonar.organization=owncloud-1
 sonar.projectKey=owncloud_activity
-sonar.projectVersion=1.0
+sonar.projectVersion=2.6.1
 sonar.host.url=https://sonarcloud.io
 
 # =====================================================