From 003c709d25e17e76f1c4a8c0268b360ca803f245 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 12 Dec 2017 12:16:01 +0100 Subject: [PATCH] allow 'Nextcloud' in the user agent string of Android Signed-off-by: Bjoern Schiessle --- lib/public/IRequest.php | 2 +- tests/lib/AppFramework/Http/RequestTest.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/public/IRequest.php b/lib/public/IRequest.php index 98d8f5bb83..83cf4c6914 100644 --- a/lib/public/IRequest.php +++ b/lib/public/IRequest.php @@ -66,7 +66,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 9.1.0 diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index f80bffcb48..40a9193dc9 100644 --- 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, + ], ]; }