Both - Hot fix, History api parsing key update (time & timestamp)

cosmostation · Sep 3, 2020 · b5f6402 · b5f6402
1 parent f9af2c3
commit b5f6402
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Cosmos-Android/app/src/main/java/wannabit/io/cosmostaion/base/BaseConstant.java b/Cosmos-Android/app/src/main/java/wannabit/io/cosmostaion/base/BaseConstant.java
@@ -1,7 +1,7 @@
 package wannabit.io.cosmostaion.base;
 
 public class BaseConstant {
-    public final static boolean IS_SHOWLOG              = true;
+    public final static boolean IS_SHOWLOG              = false;
     public final static boolean IS_TEST                 = false;
     public final static boolean IS_FEE_FREE             = false;
     public final static boolean SUPPORT_MOONPAY         = true;

diff --git a/Cosmos-Android/app/src/main/java/wannabit/io/cosmostaion/network/res/ResApiTxList.java b/Cosmos-Android/app/src/main/java/wannabit/io/cosmostaion/network/res/ResApiTxList.java
@@ -37,7 +37,7 @@ public class Data {
         @SerializedName("memo")
         public String memo;
 
-        @SerializedName("time")
+        @SerializedName(value="time", alternate={"timestamp"})
         public String time;
 
         @SerializedName("logs")

diff --git a/Cosmos-IOS/Cosmostation/Cosmostation/Model/ApiHistory.swift b/Cosmos-IOS/Cosmostation/Cosmostation/Model/ApiHistory.swift
@@ -39,7 +39,14 @@ public class ApiHistory {
             self.height = dictionary["height"] as? Int64 ?? -1
             self.tx_hash = dictionary["tx_hash"] as? String ?? ""
             self.memo = dictionary["memo"] as? String ?? ""
-            self.time = dictionary["time"] as? String ?? ""
+            self.time = dictionary["timestamp"] as? String ?? ""
+
+            if let rawTime = dictionary["time"] as? String {
+                self.time = rawTime
+            }
+            if let rawTime = dictionary["timestamp"] as? String {
+                self.time = rawTime
+            }
 
             if let feedata = dictionary["fee"] as? [String : Any] {
                 self.fee = Fee.init(feedata)