From 1619c7f46ce5b10cb3c22631c54da3ab914e5065 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Thu, 28 Nov 2019 11:42:23 +0100
Subject: [PATCH] Use placeholder when provider logo is missing

So far it's what happens for dynamically added providers, because
there is no local asset.
---
 Passepartout-iOS/Global/SwiftGen+Assets.swift |   1 +
 Passepartout-iOS/Global/Theme.swift           |   2 +-
 .../placeholder.imageset/Contents.json        |  22 ++++++++++++++++++
 .../placeholder.imageset/placeholder@2x.png   | Bin 0 -> 2362 bytes
 .../placeholder.imageset/placeholder@3x.png   | Bin 0 -> 3468 bytes
 .../Organizer/OrganizerViewController.swift   |  11 ++++++---
 6 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 Passepartout-iOS/Providers.xcassets/placeholder.imageset/Contents.json
 create mode 100644 Passepartout-iOS/Providers.xcassets/placeholder.imageset/placeholder@2x.png
 create mode 100644 Passepartout-iOS/Providers.xcassets/placeholder.imageset/placeholder@3x.png

diff --git a/Passepartout-iOS/Global/SwiftGen+Assets.swift b/Passepartout-iOS/Global/SwiftGen+Assets.swift
index dc5ead11..5f14a848 100644
--- a/Passepartout-iOS/Global/SwiftGen+Assets.swift
+++ b/Passepartout-iOS/Global/SwiftGen+Assets.swift
@@ -284,6 +284,7 @@ internal enum Asset {
     internal static let mullvad = ImageAsset(name: "mullvad")
     internal static let nordvpn = ImageAsset(name: "nordvpn")
     internal static let pia = ImageAsset(name: "pia")
+    internal static let placeholder = ImageAsset(name: "placeholder")
     internal static let protonvpn = ImageAsset(name: "protonvpn")
     internal static let tunnelbear = ImageAsset(name: "tunnelbear")
     internal static let vyprvpn = ImageAsset(name: "vyprvpn")
diff --git a/Passepartout-iOS/Global/Theme.swift b/Passepartout-iOS/Global/Theme.swift
index 936089cb..bd894edc 100644
--- a/Passepartout-iOS/Global/Theme.swift
+++ b/Passepartout-iOS/Global/Theme.swift
@@ -191,7 +191,7 @@ extension MFMailComposeViewController {
 
 // FIXME: load from index JSON
 extension Infrastructure.Metadata {
-    var logo: UIImage? {
+    var logo: UIImage {
         return ImageAsset(name: name.lowercased()).image
     }
 }
diff --git a/Passepartout-iOS/Providers.xcassets/placeholder.imageset/Contents.json b/Passepartout-iOS/Providers.xcassets/placeholder.imageset/Contents.json
new file mode 100644
index 00000000..13f500e4
--- /dev/null
+++ b/Passepartout-iOS/Providers.xcassets/placeholder.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "placeholder@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "placeholder@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Passepartout-iOS/Providers.xcassets/placeholder.imageset/placeholder@2x.png b/Passepartout-iOS/Providers.xcassets/placeholder.imageset/placeholder@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3117a66223f054a915dc42dc25c60d7b80ccbe48
GIT binary patch
literal 2362
zcmZ`*X;jjS690pOfPuMnUCOQ0v`i4MTY3}11r$qj&k%7B*Tg*)z2uULxZLu(rsj32
z#HGw76Ror|w+u5w#g?nytT10{+RaBF--mbR%=~8N%x~tL`7md4PCMBl5h@4(0FXp`
zf{Pd}e<}<rwie%CT@Zt0Fpi7^fVKkZ?|u+*tl@9(LI!{&9ROgm0AO33VlD$fEE)j*
zp^90h0PssxMUV5(Mo^lA9Rb+=DcAZMip3dtl)YCB0IZt*R8aJhr(y??Vi3tTQg0E`
zGLl-!@2l4U047N!;9NuI-<OAH`*<i1r!5Ko?2d_#k1I+c-X+slt~_>c3#F@uoOeCF
zKG2-rsWH1ztWl5fE|a;Bo0Q4OaBs|L<WCa_O{D~|cT;vJ9O^=D9&8`YHHjS6`LnXJ
zax-~s?Ljv-IXLdG%3f?o$IY~^<HzI2tTw+@FPV=gj+u|kGIFd6etY##9AXA4fD0f3
z=sgJ~smydGDigtxI3^LyOal+6%k$DQ7C!9drKc>ckSLQUYftjxsHUO;=DP&zV+az@
zMySqHPd@>QVWNJq=pwx-gx}S$KwVVWGLACjP{I#(4s<iOQiY1we0FdSTXXA^*>+k2
zf(gVDu!IW846>~aYRgI_A>^`*)oflLkey$DT>Q0&sHvyiC%t7P^3#|Pt{r_0>@XYB
zJDiFA28%kk*x+iZ`!L5A%w$l7WEB`Ci+k-P**?X?@|Ku|pkhcD>cerG=QssY`YKhu
zL$`pSD<Et{2pf2I%Yz-8pkpEs6=4Qe0D?ZvJXy`DtCWw>N>&$Pg=}00T_XL!hlcci
zATflyqF8k&XB8#X<vqLR70b+OP5BlrY|f{<*Ww=Zs?Vv$b$@<Xw)W9^z8MJvv4K~Q
z0`ajnyxz8Go&)nlM~ZHTt}3~=riT+}DlrbK&YpcXRp<7p>?rnAGk-Hq!ea!*9qX;2
z<XQgnjrWon$&X-J#h<&r*9&y<V8Y?cc>;6iziZB3ohg|J-_sleqt<98F1~=J^}n$V
z@1^q|%veJf52GwMt$={s!QM9i@I&n@te{OY<T*UwXnKEdcS-0?EKPz9@|B7J(C53C
zNFfuS%tVURGlvGDoe7r>s_;@p%9^KLOnkgs!hGjkZHYN>ixw20UR(YQC5)DTc<5L5
zC}rD^>hZ2Qon>s_cGT?&*+pbIScLFbI`>re3<6k)_S{e8!)NgsH8feS>unX;OqNfq
z)VDnAANy2GJqI;E&ciNVQG@Jr5@;@Vv$CXWkhPpFW-F(NwL}Zp`U5=7ogvaTO9!1I
z)FfUEt0#&VD?^)0+C*nE^q)*jGk(`osefz`w06V|5Oh6w__Yoe++6?%U0Qd$oZJ1_
z-$iv5lnUE_6+c}$tt4uy;vh9HS(9=O+AJ5P|ErV?k1Bg=uUFWo>HXl4=t+;yz*65$
z;&O<^y_Ye9Q^GbnIrW6e-i5}QOgDYGXGq=-)WEq~R_eFwEhU_pOLxyg4JK8nS=hpg
z5>Gd77CfatTDp}?)7{*aQG(1LY@6c6LZ;Nm4@k^w!v$Ywtr?6{FkH2J(O>?|mjz|{
z(@MT=mSc$9+zc*ASz^`$ho)MSB!%n-S@y}bQF<d@dwb-yfAfjlCH(20qWbpI$n%iX
z^`uI!zME&oaVcir@jQX$rD8{6SM<Fm46SP9PWO7Bv52t{C(Yp7Nnv6dwN;MtL-MN)
z{qhFpEHfNg?xuN~RbR4YbiGCetw_O-hysS3eAetWw>3&H_eW?KpS8fOQ`DL$J$ER|
z+WI$-p@1)8YNz<BTFK_aE;<E!>-yww2uugHUuswH$4_(toU!-Wdg_4of%YZ^TN2`t
ze(<Sti+|US>loVVl`lR2b0lwwV0a+T1gfy|djngSmUmqMEm!b9DD6O9+O@YsTdvZs
zKU5_NeMe)qeKH9(**-qBhxv<%6vL0(E_=EF!R(pNA&y$Kav8}KMlaDS_u?6z4Zf0X
z?nt?N4`_{bxE$8v_;>%+$)3UGC@rPp<jg4ywR4FDN{6wKH%ceK%zu5e1A`R{%pKXt
zw~Cp1C6_g<zmA>U;q`0RKw7>6^2YA!`=ISSx||u}D6(u>MR*jg+op^Sh8m2j2ura|
zOWH#|07dP#af+>C0&&zKK!`!fKV`pSmOhA^+ird@8%B9y`^axql)I<4bdP8R=fKx}
zCeh!VQmFZPS5@enl6<Ri*X!HKv<_R8O9!Q{ux9j446k5$5@`GbfAvPA@cDcFW|uo>
zGw#3$s;>1twH2t1swAevO!z)XRMhU&ksybD-X~1oiSwh1kXhJ%zjX!Dy0oiNcc#(M
zOyUJ{U1}3PZX;iD3jgs&(pG)`wf3YR<D_@d`7NJMTL9w2W+c8cGdT}!g#Om;Z_h(q
zQ%1wfN5V)@9oin-6-5uM_Z9dcQBOEnBphEVcFmLLe<=VZBXy*r4!6E@R|X8h3k5D6
zKzrc8;+djLMdXkbou>MY?|3+>x+q|T_N$)EDcOV|yW`0A=}EFnE+&%{owG8jzv&ZM
zs$?|x?sn824YN4ss3eTjplXg0{YyGm#qYjBUW!h|i{}$rxiCvQN11Bas+bU|8!3z5
z8*fGNMc=D(HanL@2?Q2}Nt73QZ#sC`TaWR%pc*~QM>XLR!QK(;UGrVv`-78uC|pn5
z=_s4yR5F}Ow!++stqmRdi(Z(t<sX*0lQbkfvs!05u-$iZ$3rgS)kRG%QUn#5t{!`v
z|9cQ0tWu8Ik~C?~FbQ}q7lGRbZ>$cu-%R9Q&6~9mmU|XdAiFxXcdoF`a>jr(UeJws
zwpFE(eFbozNlv}>d3b+Px#Zdy8(?kUW<M%Sjr~QW9roitLl)o(wwdZT&hS}I<{k5)
zbuE*zNVB1X*B5!~3;C{IhBD_9XI?ajaJMkE<=?k08u_5;kQ9Z_I#h6ShJn+Ex&$tW
z`+VbY)gteHh)Vd-E^u{6PH*{I4paOhXftd)83BHbKnwp1fnorR&=_+A4B7yLam8RQ
z(8d;6<0EJz3pCo#r$_652;q?dp+SlNpRgAMt`ZZJe@-|P8N`V9yATM($HyNFjiAT)
b`$YvFi@XqA{>f5BTm%qpoCqy=YQ}#7#ds?1

literal 0
HcmV?d00001

diff --git a/Passepartout-iOS/Providers.xcassets/placeholder.imageset/placeholder@3x.png b/Passepartout-iOS/Providers.xcassets/placeholder.imageset/placeholder@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dc8aed71d220bc60830ad8a04efaa44ce362982
GIT binary patch
literal 3468
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

literal 0
HcmV?d00001

diff --git a/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift b/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
index f87c65a4..6ed2570a 100644
--- a/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
+++ b/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
@@ -473,9 +473,14 @@ extension OrganizerViewController {
         case .profile:
             let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
             let rowProfile = profileKey(at: indexPath)
-            if rowProfile.context == .provider, let metadata = InfrastructureFactory.shared.metadata(forName: rowProfile.id) {
-                cell.imageView?.image = metadata.logo
-                cell.leftText = metadata.description
+            if rowProfile.context == .provider {
+                if let metadata = InfrastructureFactory.shared.metadata(forName: rowProfile.id) {
+                    cell.imageView?.image = metadata.logo
+                    cell.leftText = metadata.description
+                } else {
+                    cell.imageView?.image = Asset.Providers.placeholder.image
+                    cell.leftText = rowProfile.id
+                }
             } else {
                 cell.imageView?.image = nil
                 cell.leftText = rowProfile.id