Merge pull request #25084 from rfc2822/patch-2

Update DAVx5 in AuthToken.vue
nextcloud · Jan 14, 2021 · 5a141bd · 5a141bd
2 parents 6265383 + bcd1546
commit 5a141bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
diff --git a/apps/settings/src/components/AuthToken.vue b/apps/settings/src/components/AuthToken.vue
@@ -109,8 +109,8 @@ const userAgentMap = {
 	androidClient: /^Mozilla\/5\.0 \(Android\) ownCloud-android.*$/,
 	iosTalkClient: /^Mozilla\/5\.0 \(iOS\) Nextcloud-Talk.*$/,
 	androidTalkClient: /^Mozilla\/5\.0 \(Android\) Nextcloud-Talk.*$/,
-	// DAVdroid/1.2 (2016/07/03; dav4android; okhttp3) Android/6.0.1
-	davDroid: /DAV(droid|x5)\/([0-9.]+)/,
+	// DAVx5/3.3.8-beta2-gplay (2021/01/02; dav4jvm; okhttp/4.9.0) Android/10
+	davx5: /DAV(?:droid|x5)\/([^ ]+)/,
 	// Mozilla/5.0 (U; Linux; Maemo; Jolla; Sailfish; like Android 4.3) AppleWebKit/538.1 (KHTML, like Gecko) WebPirate/2.0 like Mobile Safari/538.1 (compatible)
 	webPirate: /(Sailfish).*WebPirate\/(\d+)/,
 	// Mozilla/5.0 (Maemo; Linux; U; Jolla; Sailfish; Mobile; rv:31.0) Gecko/31.0 Firefox/31.0 SailfishBrowser/1.0
@@ -129,7 +129,7 @@ const nameMap = {
 	androidClient: t('setting', 'Nextcloud Android app'),
 	iosTalkClient: t('setting', 'Nextcloud Talk for iOS'),
 	androidTalkClient: t('setting', 'Nextcloud Talk for Android'),
-	davDroid: 'DAVdroid',
+	davx5: 'DAVx5',
 	webPirate: 'WebPirate',
 	sailfishBrowser: 'SailfishBrowser',
 }
@@ -146,7 +146,7 @@ const iconMap = {
 	androidClient: 'icon-phone',
 	iosTalkClient: 'icon-phone',
 	androidTalkClient: 'icon-phone',
-	davDroid: 'icon-phone',
+	davx5: 'icon-phone',
 	webPirate: 'icon-link',
 	sailfishBrowser: 'icon-link',
 }