allow 'Nextcloud' in the user agent string of Android

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years ago · f0202245ee
parent 134bd51fe6
commit f0202245ee
2 changed files with 15 additions and 1 deletions
--- a/lib/public/IRequest.php
+++ b/lib/public/IRequest.php
@ -67,7 +67,7 @@ interface IRequest {
 	/**
 	 * @since 9.1.0
 	 */
-	const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) ownCloud\-android.*$/';
+	const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/';

 	/**
 	 * @since 13.0.0
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@ -859,6 +859,20 @@ class RequestTest extends \Test\TestCase {
 				],
 				false,
 			],
+			[
+				'Mozilla/5.0 (Android) ownCloud-android/2.0.0',
+				[
+					Request::USER_AGENT_CLIENT_ANDROID
+				],
+				true,
+			],
+			[
+				'Mozilla/5.0 (Android) Nextcloud-android/2.0.0',
+				[
+					Request::USER_AGENT_CLIENT_ANDROID
+				],
+				true,
+			],
 		];
 	}