8 files changed, 94 insertions, 5 deletions
diff --git a/lib/public/App.php b/lib/public/App.php
index 06dde22b8d1..250d33bf01f 100644
--- a/lib/public/App.php
+++ b/lib/public/App.php
@@ -127,9 +127,10 @@ class App {
 	 *
 	 * This function checks whether or not an app is enabled.
 	 * @since 4.0.0
+	 * @deprecated 13.0.0 use \OC::$server->getAppManager()->isEnabledForUser($appId)
 	 */
 	public static function isEnabled( $app ) {
-		return \OC_App::isEnabled( $app );
+		return \OC::$server->getAppManager()->isEnabledForUser( $app );
 	}
 
 	/**
diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php
index 820e00ff963..cfc4bd494f2 100644
--- a/lib/public/AppFramework/Http/DataDisplayResponse.php
+++ b/lib/public/AppFramework/Http/DataDisplayResponse.php
@@ -35,7 +35,7 @@ class DataDisplayResponse extends Response {
 
 	/**
 	 * response data
-	 * @var string;
+	 * @var string
 	 */
 	protected $data;
 
diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php
index f0f21087bbe..0b90fb8fbf2 100644
--- a/lib/public/Files/FileInfo.php
+++ b/lib/public/Files/FileInfo.php
@@ -174,7 +174,7 @@ interface FileInfo {
 	/**
 	 * Check whether this is a file or a folder
 	 *
-	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 * @since 7.0.0
 	 */
 	public function getType();
diff --git a/lib/public/IRequest.php b/lib/public/IRequest.php
index 98d8f5bb83a..262b595acc7 100644
--- a/lib/public/IRequest.php
+++ b/lib/public/IRequest.php
@@ -69,6 +69,11 @@ interface IRequest {
 	const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/';
 
 	/**
+	 * @since 13.0.0
+	 */
+	const USER_AGENT_TALK_ANDROID = '/^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk v.*$/';
+
+	/**
 	 * @since 9.1.0
 	 */
 	const USER_AGENT_CLIENT_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/';
@@ -79,6 +84,11 @@ interface IRequest {
 	const USER_AGENT_CLIENT_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/';
 
 	/**
+	 * @since 13.0.0
+	 */
+	const USER_AGENT_TALK_IOS = '/^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk v.*$/';
+
+	/**
 	 * @param string $name
 	 *
 	 * @return string
diff --git a/lib/public/Mail/IAttachment.php b/lib/public/Mail/IAttachment.php
new file mode 100644
index 00000000000..32348e7a309
--- /dev/null
+++ b/lib/public/Mail/IAttachment.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Mail;
+
+/**
+ * Interface IAttachment
+ *
+ * @package OCP\Mail
+ * @since 13.0.0
+ */
+interface IAttachment {
+
+	/**
+	 * @param string $filename
+	 * @return $this
+	 * @since 13.0.0
+	 */
+	public function setFilename($filename);
+
+	/**
+	 * @param string $contentType
+	 * @return $this
+	 * @since 13.0.0
+	 */
+	public function setContentType($contentType);
+
+	/**
+	 * @param string $body
+	 * @return $this
+	 * @since 13.0.0
+	 */
+	public function setBody($body);
+
+}
diff --git a/lib/public/Mail/IMailer.php b/lib/public/Mail/IMailer.php
index 35189c22a69..10096548256 100644
--- a/lib/public/Mail/IMailer.php
+++ b/lib/public/Mail/IMailer.php
@@ -54,6 +54,23 @@ interface IMailer {
 	public function createMessage();
 
 	/**
+	 * @param string|null $data
+	 * @param string|null $filename
+	 * @param string|null $contentType
+	 * @return IAttachment
+	 * @since 13.0.0
+	 */
+	public function createAttachment($data = null, $filename = null, $contentType = null);
+
+	/**
+	 * @param string $path
+	 * @param string|null $contentType
+	 * @return IAttachment
+	 * @since 13.0.0
+	 */
+	public function createAttachmentFromPath($path, $contentType = null);
+
+	/**
 	 * Creates a new email template object
 	 *
 	 * @param string $emailId
diff --git a/lib/public/Mail/IMessage.php b/lib/public/Mail/IMessage.php
index 20e4ea19c4c..e82b4ff93a9 100644
--- a/lib/public/Mail/IMessage.php
+++ b/lib/public/Mail/IMessage.php
@@ -22,12 +22,20 @@
 namespace OCP\Mail;
 
 /**
- * Class Message
+ * Interface IMessage
  *
  * @package OCP\Mail
  * @since 13.0.0
  */
 interface IMessage {
+
+	/**
+	 * @param IAttachment $attachment
+	 * @return $this
+	 * @since 13.0.0
+	 */
+	public function attach(IAttachment $attachment);
+
 	/**
 	 * Set the from address of this message.
 	 *
diff --git a/lib/public/Util.php b/lib/public/Util.php
index e4ebdb5bfa7..04cdfe216d0 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -670,7 +670,7 @@ class Util {
 	 * Compare two strings to provide a natural sort
 	 * @param string $a first string to compare
 	 * @param string $b second string to compare
-	 * @return -1 if $b comes before $a, 1 if $a comes before $b
+	 * @return int -1 if $b comes before $a, 1 if $a comes before $b
 	 * or 0 if the strings are identical
 	 * @since 7.0.0
 	 */