From 995118bcd20a55fda6545fb087a181b48a3d98ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael@poehn.at>
Date: Mon, 18 Dec 2023 13:35:06 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=94=20add=20strapped=20IPA=20file=20an?=
 =?UTF-8?q?d=20test=20for=20parse=5Fipa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fdroidserver/update.py                  |   1 -
 tests/com.fake.IpaApp_1000000000001.ipa | Bin 0 -> 1722 bytes
 tests/update.TestCase                   |  13 +++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/com.fake.IpaApp_1000000000001.ipa

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 7934ffa8..b5b956a2 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -563,7 +563,6 @@ def parse_ipa(ipa_path, file_size, sha256):
                     # https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring
                     ipa["versionCode"] = version_string_to_int(plist["CFBundleShortVersionString"])
                     ipa["versionName"] = plist["CFBundleShortVersionString"]
-                    ipa["usage"] = {k: v for k, v in plist.items() if 'Usage' in k}
     return ipa
 
 
diff --git a/tests/com.fake.IpaApp_1000000000001.ipa b/tests/com.fake.IpaApp_1000000000001.ipa
new file mode 100644
index 0000000000000000000000000000000000000000..d392cb940a8585307deb50d6f791ebc18fbd7a37
GIT binary patch
literal 1722
zcma)+c{J2(9L9fRY{wq5gvl}ySuVO)lCjJ%7ulN8SQ29i2{X2i%C#gSVT|QoGKiUs
zFry@K#buCPOlWLlzho&YijJF3sy}qjec$uG@Av(l_j#W8uaBJ-n3E6K9lVL@XTKC*
zH(o#lu){`N3c`A6IXDUcZVzByyXzfD9I*SW5(n?668qfTQ(54!CODiX7KhW?6YzeC
zLFZBDmpB0c&I<r?`wJ`rF9d1gF8PIo-auOj_Zy2-Zb;zEw<>B@58B};Ov)7%$t%tY
z*yzN7dp0iFzNeFUrtNp4{imKYa#iXV+h?a*e3`eDb7~kRl6f()H5<qCBG$(@>Q^IC
zVH!&xs7#c1t-QHsy6h_P-x1nQbj<aPf8g;#GBA&slINbSDKbV_kKq0pRn$G}eC?3;
zchDyvx=$u$-XAJ+&F-X))A7XWh?b;s^0Ig2P|{mc{hSG11><CUNz&zJPR9xOv7%-W
zr6dcE`~~qUhQD;U31&{BCc8CYUD-_aV*Rl6=Ds!t=<TKu!mwH=(=VRFQ(;w-dNF5O
z$(ctaph!v|#;zP!U5d@23iLQwO1yp*$C@0A%<D39FB*H2L>g(rP;?4QvU3<JT<6GT
z8Iv*G9SXu{me!KD>Tb&8rJ5AD454hlCDQfk1&U5}0WHjF!=0b;9<XmUPq6k<3bMUF
zSPQtwV(i`c72tIw$GB=x@&dXqHyOi=*-#BXWSHQ}k~=TZS#tL&iCn<O^ig!G9B{{?
zt-BQBXL&yPTGi-Q5gRz!3R%U$qh?#dnXYL}J1L!7u_jKq1U`VfA^A|bPRH3LcLVz4
z1=mFGu%<eLW`O|k+*@Ei<FfG!Q}xy2SV;O>^^<2<q&^3jG&Ug1Ep`_iKL|+|Y-}CG
zqolFETp}mv)U7xOP1M+b8Ip2r(M7wMF`KkKep|uyfWNw7g(t$vU$7i`JdYY%&A~H7
zm|qnza97if65@Mv(MAx(8QF~o8%4#zS5(uD;@#OHSrnb=9q>rg=&b|cbDNFAPguv>
z{13u>;}iZ?#5>B3yjvG4ZiAC7RTAtqaYv*}+tY^C+{M%Q;F4ELz2zz$d_ngLDc#Ij
zC+>pq@IsOUYG|$pHLr`3V&(T`NeT1Odq1wN0?qGmg0s);xi5C)!}%Mj5h67u(TnPn
z%pF7~zGwl{?-Vvk3J@}255&EHl#4v|G)PUxN`eDo$<e8ZBm$;05f=H-RARKU6V$~y
zAiLLk>g0qCge#>Neu`8fH%%3m@V=U7QrTUBbAo7|e-Nr4f~TRcRT&O`95<{Oob}%N
z6TPjKdos&<Ss+R@8zUWeHnBm8*x@6g{&Hj;BIWlhnW9CTxKXFo853n6tFgY*%5{cw
zTj(!nVY||4{_4_)-d6)%LbXv*NM&NL*FfeY@)@kp6)cR{j_!O$EtaHGgOxLXKc^aq
z;xrqTWTlYJPxrg-n0jBny(#In)7X4o##BaalJ7CpKI-Ntx<}b?d+S1K%IG0S*adh`
zK-a8Ppl|u?l_@4(sUYCtkrhlozhto}X1;X&usW-4X0&0u;{jN%P{Jowqi1EY3!UHj
zB7q*iXvhk-%}i_=V@+4RE}S6Hu=#zRw+)Th$d8C{^HRb9p_5QYP$3KvQk!ttBsyYP
z0Z<Up<kgG2+N3*KKa7;sq_o_rfmgMxPaS!awdr_GY*|K5)KyvoX=~n#)G}K|95ypT
zHnb{MI;tPYmDBZ5@xXWtdFpvSCdV<|a@4!ivaHOg(B<qjbaqa<5?8<9LRqLyt$bwK
zQ_G2&no$e{DojY|Xr3Xg`9_qTLcx^WGHC4^GxKZwAIRI5e`qvhPPFIGXyNr?M=KZ!
z3}mZM8>UT<p=aite-y!T(_I^o9BKgDS%EkXf`7(ifv;o+jF(Mz%RSCIIP!j@^R9yt
z_-AZ}esvIuUN-sd2ZtX>%?HSTc?1Ha0Kk#GB^>+`1o-&hE!AdyJHLnQ$Md}q`RL*p
bpZ!C=)BXR&adGed3H*6VfB+zcYxnjahOgOe

literal 0
HcmV?d00001

diff --git a/tests/update.TestCase b/tests/update.TestCase
index 0bc78462..9d1dea23 100755
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@@ -1922,6 +1922,19 @@ class UpdateTest(unittest.TestCase):
             index['repo'][CATEGORIES_CONFIG_NAME],
         )
 
+    def test_parse_ipa(self):
+        result = fdroidserver.update.parse_ipa('./com.fake.IpaApp_1000000000001.ipa', 'fake_size', 'fake_sha')
+        self.maxDiff = None
+        self.assertDictEqual(result, {
+            'apkName': 'com.fake.IpaApp_1000000000001.ipa',
+            'hash': 'fake_sha',
+            'hashType': 'sha256',
+            'packageName': 'org.onionshare.OnionShare',
+            'size': 'fake_size',
+            'versionCode': 1000000000001,
+            'versionName': '1.0.1',
+        })
+
 
 class TestUpdateVersionStringToInt(unittest.TestCase):