From aa093a02ab82a6599bbcd159c41db237be016720 Mon Sep 17 00:00:00 2001
From: Anton Sarukhanov <code@ant.sr>
Date: Wed, 23 Oct 2019 15:57:22 -0400
Subject: [PATCH] Add Thunderbird 68 support (legacy mode).

---
 icon.png      | Bin 1165 -> 1518 bytes
 icon64.png    | Bin 1518 -> 0 bytes
 install.rdf   |  18 ------------------
 manifest.json |  23 +++++++++++++++++++++++
 4 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 icon64.png
 delete mode 100644 install.rdf
 create mode 100644 manifest.json

diff --git a/icon.png b/icon.png
index a54dd9498002d8d1ed7bf5abe171c167a21b7787..e790a17eb4ceb7b07ceb405f9953d39a5031322c 100644
GIT binary patch
literal 1518
zcmV<K1rhp*P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm001!?001!?0RjIGCjbBd8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11#3w}K~#90)tg&v6-5}wf2|d5gY*WX76Dr^(FX<b7EDY;c_2}r
zOhg}m77~IFLJ%+U8WZ)!C;^oi72~reqQ<BZf~g5r(Sq07YNS?TBg#dL3Eq0@!<<cy
z%g*=B&d$!!e=-m4neX!d@9gf(H?s}=KX4MT7`O(w444OW04=~V;3r@h7y#Y^KCMrh
z;V~U}2>210%+WpvRsmDuryK^2z-_=$@)1wB5nxH=+zVp{u!Ca6Yg+|)9B6V0J|EbG
zxdQdTT;OZMk*{s91I<$K`M{xS=NE`C!W>{f<&aO>8(2odLf~+!^ETp%&<%{?PGksp
z8+aM$2Y$$5`&c^oCBP9&=NKZml0OJ+0A^+QXaE)fPXT`@ek#DVwZ`u#24#xiO8!}3
zY7U<tDgM5q<`vln>`@HL5W$6f1z7LlyBXN7`0lMWXhT;mqzJC$*A$4+jLhk?v_ZRK
z5K4p?<P-D&e+qFfOdGTVA1lcf5#b!-kx%fn5bLfigR(@Z2YG;tg?O*oj6#c0FY;hs
zk>i$_!;)br5#~}q@(KDaagS++?ZBYL*j0q-nDu$R$b*?NX2t&7#n@$@psgKdU|u^}
z<ZsQ(#sjw1<!`PIIw(F8PRA4~VqW<KBV_0NT^=W)MEH`p<mX_|cSl}l9l&0}p^FGJ
zftwv-bpiJSTY(jrx}Xp45ORIQ$6*K&G%Vo6a@e~l1&s`x2K+4Kd9`nXos=tr?V<Zh
zPM_O^{KoMgRe%v;pAf)Tgj0YC!ROtMe%33wJ&-f6Oq3;pR0cl|oTu3LVIH(LABQow
zauAdu!aBv@cENTk@Rwr0Hb*W_2rWVb@RHzb0ytl=9}sNctojd*PR!IYlnBkh7lN-R
z1ltEKHpA6Cz0nO^CHyWuynIAhBKY}Muv?nZe+;uQ^F~t1St;~6E+p(Lg0zt8vDlo&
ziR8N-<7J|@jI~baH!39SE5f~kj~gsDjll0XkatO-8#4==UH$uPq3@7`zXW~2a}GJ|
z6@Hs%`F{nokMKQawzuErKntEG5Ar*BkK!*47ZC=q3oGpvjG&O$&_(u;9v5t+`dg9P
zVJ6vc1ZgqTDv{IBg8c9~*J9Uzxmsn2kgg|80=IkeQ}K+F>;}Phtzuh5gmh(TnGZP)
zi;(Bh6=1nwKLz+kun!?ZGCD8t;HTm}AvxDd&QfF%wF#3;p>-!EOldDy5_>p@ug!v=
zjlhRWEKLNbBQJTeRY+);l295aV-_B1KL;`M@mAmiA)bo}!C^aTQ2{RX@YjObn@gt1
zgP7AO30i^oEit2u&?6+VyP)qT%>F_arXeq1qls|6kbr9$$`{ixB1adY*5PbxuZ+V4
zf$=NwqSD88?cj|&v8%sOunU1((2FUh-wqpvpo_`~SjA1~HN12y<s9Q`A>fUngH^E{
z_bXreNLVZc+Z-}b6)VtZgwkv>xCos>z)=eBqNLD^PJRrtypDN#jZcI?D+9$?g&X;#
zj1~0=-+e-m1DKUq5v(R3`2^8Kn1y`SwjckmFxH^o(^3I5nh4U4Y9d0Ok<bV{N-^>Y
zqKI%NW@aV@Ie>X4Xb;9Ku%FP%OFlsq5&9gGp2VE7*@BrTT!~pRUWcjWYfD`p@(H3G
z@YZgH5Ut3LP3a;u0k1lc@NJ_M+^!;$2+u14eA*!9SrY<LZiimXvC^W%Cx9n`Q;Q^%
zfhZ!Jfmx4h-{jcZF8s=Bu5b}yQ;0xaz&)5vOP5*Q7R-lPF(8R>2=i&+zfiQU-T_>M
zIe5^CnHT(mnI{a9^C)T{v|&C3s~v4eFkg!8t3y6@L2b$XDCORI|5+p>LA?F`0q53d
UH`(zXb^rhX07*qoM6N<$f(SLP;s5{u

literal 1165
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0
z-33Sk!B6Mi^+1ZVz$3C4NPB>>+sSM@1_ow7PZ!6KjC*fqp7j<DlsHy@uhmQU3XgO5
zo|W70xXdmSymO-Ue}fA*caOq`s2}oMy36vSX2k7%Ew)zs!VBhKF<ZKrjJL)dF+JjB
zq7gmE*mQ64xid5Q-@ESM=Q%vH^1S8w;%7B`-dhK_%a*>$GP$zie%b?*3%pyHMIQ)%
z5V^7H>w=br>>AAW4Y`NE%4#tFj1o3Y<oS`QsJCACLDsBuR*jYm?3o`~KIl^}tn5{P
zxq-W4y>x`9rV{&^h!ba-Cm--lkc!xHqxaa`5<im(AuYW%tP)B)8lN;ICivdSUnI8M
znCrmvDM~p{rZ?>C*may&Y1yN`IL0570$e11${qjL?s~U$f#JH2#hflFj`y<N*L4~f
zvK|qgC|b#XdC^?K*_RAzE}ROlId9b%+1z2<mVVkn@W%{?1L1*r{uhqL%N%~|y@g5N
z)BKa1*P{L2nJh;{3(q_KV<>2Pp?{x2XTm`#53NHjjtS1!D;tVl<XHF@h-aO0YEVy7
zZR}`Y<aaaaI{O-~+d*MZE_dwkEohe#F?*}AJ<6)==Ni@pCyxnU<k}<r?R?AGIG|68
zZM6?sGVhFT3*;3p6#Ak1rn>cP^8MYM;z8@4cptF*SaUcb+ghC=F1x8t#P#ReebXDY
zBRM{th-dlMS^jyNRie_oj!h-+!c2b(KG@E@-{VK~ME6H`6`O)JvaGf;uCFmO%6M5W
z6QSP2=`>qo`oaF2EJ{(0;=lg(t~ufLMW82fdc)sC>m(Eps4Zfx=(E~V#**r|sL57h
zV)Y;CJ57tkf~+#lOoV-Ed0KCnGkxEBm(5_oQ9bL98-hF?ea}1nnw|#qMYX?=)X%yV
z8ha%5;>(n-ZCyLocDiiH4bNQ^<9Xv>;u*%u8<rD08}b+35xhEq@$QP^!(vxb)DE?5
z{`3E&cxU;JC!B05w-3Z#TAnlKLW|dyU)EA(YpPooc)$7i-*VGQYfHytOR`ri36|iR
z5!@nIx&Llo_X*)IXRkMKvn&s0e&sTC;uSNkt4Xu!LIn%YI-H0WHvZ#%Mla$`&Xd(z
zNq3y|Ud=j?`!L+~h{h@5QpJ6)e+)KgDeVeuzqG5h;?{j<HNoP*sgwRZ$!77(TqL_f
z<bjfwga7a5bqhS@kIcDtNA!bB$<<jNzy!|rhf$X6euUx!>y^MPrdr|}QIe8al4_M)
zlnSI6j0_CTbq&mQ4Glt!jI2xytc(q`4GgRd402;sfa;Mn<mRVjrd8tBAj3Fk4^V>!
z$cEywbgQJq;#A$zqD+Rg%$!s!eSQ6s+yedF#PrPMY~9GJ;zFN@q|8k(<~f6G@pScb
JS?83{1ON~-<nRCh

diff --git a/icon64.png b/icon64.png
deleted file mode 100644
index e790a17eb4ceb7b07ceb405f9953d39a5031322c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1518
zcmV<K1rhp*P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm001!?001!?0RjIGCjbBd8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11#3w}K~#90)tg&v6-5}wf2|d5gY*WX76Dr^(FX<b7EDY;c_2}r
zOhg}m77~IFLJ%+U8WZ)!C;^oi72~reqQ<BZf~g5r(Sq07YNS?TBg#dL3Eq0@!<<cy
z%g*=B&d$!!e=-m4neX!d@9gf(H?s}=KX4MT7`O(w444OW04=~V;3r@h7y#Y^KCMrh
z;V~U}2>210%+WpvRsmDuryK^2z-_=$@)1wB5nxH=+zVp{u!Ca6Yg+|)9B6V0J|EbG
zxdQdTT;OZMk*{s91I<$K`M{xS=NE`C!W>{f<&aO>8(2odLf~+!^ETp%&<%{?PGksp
z8+aM$2Y$$5`&c^oCBP9&=NKZml0OJ+0A^+QXaE)fPXT`@ek#DVwZ`u#24#xiO8!}3
zY7U<tDgM5q<`vln>`@HL5W$6f1z7LlyBXN7`0lMWXhT;mqzJC$*A$4+jLhk?v_ZRK
z5K4p?<P-D&e+qFfOdGTVA1lcf5#b!-kx%fn5bLfigR(@Z2YG;tg?O*oj6#c0FY;hs
zk>i$_!;)br5#~}q@(KDaagS++?ZBYL*j0q-nDu$R$b*?NX2t&7#n@$@psgKdU|u^}
z<ZsQ(#sjw1<!`PIIw(F8PRA4~VqW<KBV_0NT^=W)MEH`p<mX_|cSl}l9l&0}p^FGJ
zftwv-bpiJSTY(jrx}Xp45ORIQ$6*K&G%Vo6a@e~l1&s`x2K+4Kd9`nXos=tr?V<Zh
zPM_O^{KoMgRe%v;pAf)Tgj0YC!ROtMe%33wJ&-f6Oq3;pR0cl|oTu3LVIH(LABQow
zauAdu!aBv@cENTk@Rwr0Hb*W_2rWVb@RHzb0ytl=9}sNctojd*PR!IYlnBkh7lN-R
z1ltEKHpA6Cz0nO^CHyWuynIAhBKY}Muv?nZe+;uQ^F~t1St;~6E+p(Lg0zt8vDlo&
ziR8N-<7J|@jI~baH!39SE5f~kj~gsDjll0XkatO-8#4==UH$uPq3@7`zXW~2a}GJ|
z6@Hs%`F{nokMKQawzuErKntEG5Ar*BkK!*47ZC=q3oGpvjG&O$&_(u;9v5t+`dg9P
zVJ6vc1ZgqTDv{IBg8c9~*J9Uzxmsn2kgg|80=IkeQ}K+F>;}Phtzuh5gmh(TnGZP)
zi;(Bh6=1nwKLz+kun!?ZGCD8t;HTm}AvxDd&QfF%wF#3;p>-!EOldDy5_>p@ug!v=
zjlhRWEKLNbBQJTeRY+);l295aV-_B1KL;`M@mAmiA)bo}!C^aTQ2{RX@YjObn@gt1
zgP7AO30i^oEit2u&?6+VyP)qT%>F_arXeq1qls|6kbr9$$`{ixB1adY*5PbxuZ+V4
zf$=NwqSD88?cj|&v8%sOunU1((2FUh-wqpvpo_`~SjA1~HN12y<s9Q`A>fUngH^E{
z_bXreNLVZc+Z-}b6)VtZgwkv>xCos>z)=eBqNLD^PJRrtypDN#jZcI?D+9$?g&X;#
zj1~0=-+e-m1DKUq5v(R3`2^8Kn1y`SwjckmFxH^o(^3I5nh4U4Y9d0Ok<bV{N-^>Y
zqKI%NW@aV@Ie>X4Xb;9Ku%FP%OFlsq5&9gGp2VE7*@BrTT!~pRUWcjWYfD`p@(H3G
z@YZgH5Ut3LP3a;u0k1lc@NJ_M+^!;$2+u14eA*!9SrY<LZiimXvC^W%Cx9n`Q;Q^%
zfhZ!Jfmx4h-{jcZF8s=Bu5b}yQ;0xaz&)5vOP5*Q7R-lPF(8R>2=i&+zfiQU-T_>M
zIe5^CnHT(mnI{a9^C)T{v|&C3s~v4eFkg!8t3y6@L2b$XDCORI|5+p>LA?F`0q53d
UH`(zXb^rhX07*qoM6N<$f(SLP;s5{u

diff --git a/install.rdf b/install.rdf
deleted file mode 100644
index e8ff0c8..0000000
--- a/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>unsafelinks@ant.sr</em:id>
-    <em:name>Un-Safelinks</em:name>
-    <em:description>Replace URLs which have been rewritten by Office 365 Advanced Threat Protection with the original URL.</em:description>
-    <em:version>1.2</em:version>
-	<em:homepageURL>https://ant.sr/unsafelinks</em:homepageURL>
-    <em:targetApplication>
-      <Description>
-        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>45.8.0</em:minVersion>
-        <em:maxVersion>60.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-  </Description>
-</RDF>
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..58a43fd
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,23 @@
+{
+    "manifest_version": 2,
+    "name": "Un-Safelinks",
+    "description": "Replace URLs which have been rewritten by Office 365 Advanced Threat Protection with the original URL.",
+    "version": "1.3",
+    "author": "Anton Sarukhanov",
+    "homepage_url": "https://github.com/antsar/unsafelinks",
+    "applications": {
+        "gecko": {
+            "id": "unsafelinks@ant.sr",
+            "strict_min_version": "68.0"
+        }
+    },
+    "permissions": [
+        "messagesRead"
+    ],
+    "icons": {
+        "64": "icon.png"
+    },
+    "legacy": {
+        "type": "xul"
+    }
+}
-- 
GitLab