[taler-taler-ios] branch master updated (b6ba537 -> 1a3d88d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a change to branch master
in repository taler-ios.

    from b6ba537  Use App group for sharing data between our apps
     new 1f3d848  move Transaction.swift
     new 1a3d88d  !!! Temporarily add back old cases to ExchangeTosStatus to be 
able to run with older wallet-core version !!! Fixed missing cases - now 
Exchanges can be shown again

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 TalerWallet.xcodeproj/project.pbxproj             |  2 +-
 TalerWallet1/Model/Model+Exchange.swift           | 14 ++++++++------
 TalerWallet1/Model/Model+Withdraw.swift           | 16 ++++++++--------
 TalerWallet1/{Backend => Model}/Transaction.swift |  0
 4 files changed, 17 insertions(+), 15 deletions(-)
 rename TalerWallet1/{Backend => Model}/Transaction.swift (100%)

diff --git a/TalerWallet.xcodeproj/project.pbxproj 
b/TalerWallet.xcodeproj/project.pbxproj
index b552588..efac9bd 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -599,6 +599,7 @@
                                4EB095102989CBB00043A8A1 /* 
Model+Settings.swift */,
                                4EB095322989CBFE0043A8A1 /* 
Model+Transactions.swift */,
                                4EB0953D2989CBFE0043A8A1 /* 
Model+Withdraw.swift */,
+                               4EB0951E2989CBCB0043A8A1 /* Transaction.swift 
*/,
                        );
                        path = Model;
                        sourceTree = "<group>";
@@ -609,7 +610,6 @@
                                4EB0951B2989CBCB0043A8A1 /* 
WalletBackendRequest.swift */,
                                4EB0951C2989CBCB0043A8A1 /* WalletCore.swift */,
                                4EB0951D2989CBCB0043A8A1 /* 
WalletBackendError.swift */,
-                               4EB0951E2989CBCB0043A8A1 /* Transaction.swift 
*/,
                        );
                        path = Backend;
                        sourceTree = "<group>";
diff --git a/TalerWallet1/Model/Model+Exchange.swift 
b/TalerWallet1/Model/Model+Exchange.swift
index 304ef06..b5d6641 100644
--- a/TalerWallet1/Model/Model+Exchange.swift
+++ b/TalerWallet1/Model/Model+Exchange.swift
@@ -26,18 +26,20 @@ enum ExchangeUpdateStatus: String, Codable {
 /// The result from wallet-core's ListExchanges
 struct Exchange: Codable, Hashable, Identifiable {
     static func == (lhs: Exchange, rhs: Exchange) -> Bool {
-        return lhs.exchangeBaseUrl == rhs.exchangeBaseUrl &&
-        lhs.tosStatus == rhs.tosStatus &&
-        lhs.exchangeEntryStatus == rhs.exchangeEntryStatus &&
-        lhs.exchangeUpdateStatus == rhs.exchangeUpdateStatus
+        return lhs.exchangeBaseUrl == rhs.exchangeBaseUrl
+        &&     lhs.tosStatus == rhs.tosStatus
+        &&     lhs.exchangeStatus == rhs.exchangeStatus                        
 // deprecated
+        &&     lhs.exchangeEntryStatus == rhs.exchangeEntryStatus
+        &&     lhs.exchangeUpdateStatus == rhs.exchangeUpdateStatus
     }
 
     var exchangeBaseUrl: String
     var currency: String?
     var paytoUris: [String]
     var tosStatus: ExchangeTosStatus
-    var exchangeEntryStatus: ExchangeEntryStatus
-    var exchangeUpdateStatus: ExchangeUpdateStatus
+    var exchangeStatus: String?                                                
 // deprecated
+    var exchangeEntryStatus: ExchangeEntryStatus?                   // new, 
but not yet deployed in demo.taler.net
+    var exchangeUpdateStatus: ExchangeUpdateStatus?                 // new, 
but not yet deployed in demo.taler.net
     var ageRestrictionOptions: [Int]
     var lastUpdateErrorInfo: ExchangeError?
 
diff --git a/TalerWallet1/Model/Model+Withdraw.swift 
b/TalerWallet1/Model/Model+Withdraw.swift
index 7b8124c..f0084eb 100644
--- a/TalerWallet1/Model/Model+Withdraw.swift
+++ b/TalerWallet1/Model/Model+Withdraw.swift
@@ -67,14 +67,14 @@ fileprivate struct GetWithdrawalDetailsForAmount: 
WalletBackendFormattedRequest
 }
 // MARK: -
 enum ExchangeTosStatus: String, Codable {
-    case new = "new"
-    case accepted = "accepted"
-    case changed = "changed"
-    case notFound = "not-found"
-    case unknown = "unknown"
-    case pending
-    case proposed
-//    case accepted
+    case new = "new"                                                           
 // deprecated
+//    case accepted = "accepted"                                               
   // old == new
+    case changed = "changed"                                                   
 // deprecated
+    case notFound = "not-found"                                                
 // deprecated
+    case unknown = "unknown"                                                   
 // deprecated
+    case pending                                                // new, but 
not yet deployed in demo.taler.net
+    case proposed                                               // new, but 
not yet deployed in demo.taler.net
+    case accepted                                               // new == old
 }
 struct ExchangeTermsOfService: Decodable {
     var currentEtag: String
diff --git a/TalerWallet1/Backend/Transaction.swift 
b/TalerWallet1/Model/Transaction.swift
similarity index 100%
rename from TalerWallet1/Backend/Transaction.swift
rename to TalerWallet1/Model/Transaction.swift

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.