From bcd1546f7737a9be487a5ebcce759bf95e1786a4 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <rfc2822@users.noreply.github.com>
Date: Mon, 11 Jan 2021 19:31:58 +0100
Subject: [PATCH] Update DAVx5 in AuthToken.vue
1. It's named DAVx5 (only very old clients have DAVdroid in the User-Agent)
2. Use passive matching (?:droid|x5) because otherwise, "x5" is recognized and shown as operating system
3. Also include the version postfix which contains information like "-beta2", which is important for the user
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
---
.../js/vue-settings-personal-security.js | Bin 1390882 -> 1390870 bytes
.../js/vue-settings-personal-security.js.map | Bin 3680267 -> 3680263 bytes
apps/settings/src/components/AuthToken.vue | 8 ++++----
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
index 8c46fb1f001d538f246b9ad9d11686d13aa18dd3..436316e453aa5c519c510cf656f731da1a75899f 100644
GIT binary patch
delta 332
zcmZ4VDP-EGkcJk<7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NIS|{x><y
zEmJKM6VsBXCw6knPw&^~<)2<4!oea^k`kSgSdyq)rVCRMTRr{aTXxauG5^?wrysp3
z9IXVG(J4vMOU}tm%_~9EG~MZza1c9G-SpYFgw5cb8@Gft;2ieb!Zrw}7)rB=Oyl6-
zot|@BSOBi3`L?h+jMKjHw($0iw?#M=Br8m<^j#doH0-TXit;m4YAQ@MWArtm;}o`E
z`z_+c#0ivF0?JpIZdd;&62Zs>WVHMjsTYJ9wVg{)ltn|t%+M?)F(uK&*f`15z#`ee
IBr(Mj0DMAi^#A|>
delta 344
zcmbRCDP+;7kcJk<7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NIS|{x>;H
zO-wA!EmD)GCw6knPw&^~<)2<4!oea^k`kSgSdyq)rVCRMTRr{aTXxauG5^?wrysp3
z9IXVG(J4vMOU}tm%_~9EG~MZza1c9G-SpYFgw5cb8@Gft;2ieb!Zrw}7)rB=Oyl6-
zot|@BSOBi3`L?h+jMKjHw($0iw?#M=WL%2!GgGYeT^z$SQb5d_3RBG(eT`@XT}!>~
zmw$^mG4Vr`C;^p#Rcx30ClbNP3Krd7@n57~5N7Q5e*&T`8Y1Qf#%ZPo24<E9iDu@;
KX(oooW~Ko5fNb&r
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
index b02bb5017cc5fc91d53c059765396059132bf654..4cadb8ee50ca1e7e7a95341c5a9842ac79870b9f 100644
GIT binary patch
delta 763
zcmZ9|OK1~O6b4|X58Fg-Gi|k2t(m@T#%7+mliRe4R$MBGP&Y{nlT4aK)1=g)#77b7
zA`6L|Q0_uelL#)g514JJC>6SJSC@(_5nPFN>0fQ)1MUa+ockZRocr%SaCvyyVKu5z
zwOC5h;^m}kZPIFPXwpI<y?8GbM8{oxJhR>u*GAR7hHGg#kzY=5&;X6l1kJDyTA&qN
z;D-Hh01iSMw1dZ4PVj7qOEIayPjfL=DDYF<tn;P7za8ufYC+4iOcDr04Rti864MIh
zH&=P+fKKRwLvR?n;Ry7=Q8)(2p%+eo7X;{oei(p37=n{93_cLy6pVl$B#=P?6*SPD
z&DB8utDA=6A=8|RP2FaE)$8w$&x?z;6}C*<loq7=E1RqKiR^WWg!}6~zir8}bSj>)
z|BJKpWpbruFUKC1Nw8kLFB4zAXsM9Xe}90xG2mtC3h~qvOBFI)EAlH90*13v33mRt
zn=_Pv9FRw)Xxuh+DKVEeZwfwL)ip)M(Z>bLTp-sLX2*r>^`vdjDMSv*swhlktodxp
zQZzM^iP#9`j4?sEFmcs)cI?;7otz;?B8o3OEliDwihnnzD8i-etyDT~Du%2IzDeiI
zBl^72y*oRM*_`2gdqUT_hMd7ZKBb*bwM17vt+idTi{I%R=iD02wEgL2cc{ibzo1^W
iwL^P<-`F<o-@Uc7t!?`6d=GoJK|j^D;XHUn7p<R$)+;Um
delta 716
zcmZ9{zi$#@9LMn-KiYyn$^rhUNIhy>4lQ>F_iztb7fk;EHPHpCxo|+y3PvxDi8`nQ
zgA!v1c@m>Fz-}nk++vJPnlvuPt)q2yaB*?;Q>54E@EX3~?>kTO)W7a<Pod{GT(qcb
z%|{ijd2z|}?uy}dxQb~lGu(KatEF{k+91tKH|TEhq*boB${aYr2`+HM2#mrQc)$w>
z;2<1=!!Qm$t5xRN3|C|E27k>_yTG0`_(krn^`pUmo(@t)Eu|Di%P6`=)e=dlTB^R)
z=fMvF2*MFK3di6$Ouz{U!AS_iB%A^PA}|G~VH##&7NQ_R49>t=n1eV-AcF!4NLpKc
zwf@taA|yl8#lqr!w)R#Cw{Fe)gAYw3XXvILUy0jiR{Io*vCTHgP1(CS(~t_wm15QW
zFK5{fxjZ`T*vk&l>|wh@M0*(NlJg$>ImUgAMA&kdjN8HEE{X09^<I}i%IbBs!0+qE
zom$0^6H-zTlS)F96)G$0ykO`nM6V8x^Fr<Bl4;&nV?y@tM%E-nO603~6WPM<1Lp*J
zA$wIE^bhW(V)?u*=9G9wvcy+(!|5AFQAC5r`t^pcbMC>Ky=c>b^`TAszOlVeu$^r>
iVLk8D(EcaZHt3gsf)INjPJiEDtxl$2TjD1DR`>%dM-mnQ
diff --git a/apps/settings/src/components/AuthToken.vue b/apps/settings/src/components/AuthToken.vue
index c155a73b4fc..b819a0b35af 100644
--- 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',
}
--
GitLab