From 32b10794d20d6ac149bb484d1d65dacff4cc84d7 Mon Sep 17 00:00:00 2001
From: Adrian Tiberius <adrian.tiberius@gmail.com>
Date: Thu, 26 May 2016 19:20:39 +0300
Subject: [PATCH 1/2] workaround for adding peer to geth

---
 .../src/main/java/com/statusim/MainActivity.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/statusim/MainActivity.java b/android/app/src/main/java/com/statusim/MainActivity.java
index 3d411d9213..f076461d8b 100644
--- a/android/app/src/main/java/com/statusim/MainActivity.java
+++ b/android/app/src/main/java/com/statusim/MainActivity.java
@@ -13,6 +13,9 @@ import com.bitgo.randombytes.RandomBytesPackage;
 import com.BV.LinearGradient.LinearGradientPackage;
 import com.centaurwarchief.smslistener.SmsListener;
 
+import android.os.Handler;
+import android.util.Log;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
@@ -23,6 +26,8 @@ import io.realm.react.RealmReactPackage;
 
 public class MainActivity extends ReactActivity {
 
+    final Handler handler = new Handler();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -43,11 +48,19 @@ public class MainActivity extends ReactActivity {
                 getApplicationInfo().dataDir;
 
         // Launch!
+        final Runnable addPeer = new Runnable() {
+            public void run() {
+                Log.w("Geth", "adding peer");
+                Geth.run("--exec admin.addPeer(\"enode://e2f28126720452aa82f7d3083e49e6b3945502cb94d9750a15e27ee310eed6991618199f878e5fbc7dfa0e20f0af9554b41f491dc8f1dbae8f0f2d37a3a613aa@139.162.13.89:55555\") attach http://localhost:8545");
+            }
+        };
         new Thread(new Runnable() {
             public void run() {
-                Geth.run("--bootnodes enode://e2f28126720452aa82f7d3083e49e6b3945502cb94d9750a15e27ee310eed6991618199f878e5fbc7dfa0e20f0af9554b41f491dc8f1dbae8f0f2d37a3a613aa@139.162.13.89:30303 --shh --ipcdisable --nodiscover --rpc --rpcapi db,eth,net,web3,shh,admin --fast --datadir=" + dataFolder);
+                Geth.run("--shh --ipcdisable --nodiscover --rpc --rpcapi db,eth,net,web3,shh,admin --fast --datadir=" + dataFolder);
+
             }
         }).start();
+        handler.postDelayed(addPeer, 5000);
     }
 
     /**

From b914493283e4b03415ba576533ff02f68c4ada81 Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <rasom@ukr.net>
Date: Mon, 30 May 2016 11:49:16 +0300
Subject: [PATCH 2/2] fix ids for chats created after receiving from unknown id

---
 src/status_im/chats_list/screen.cljs               |  2 +-
 src/status_im/chats_list/views/chat_list_item.cljs | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/status_im/chats_list/screen.cljs b/src/status_im/chats_list/screen.cljs
index a82849d7e6..572f0ac5a9 100644
--- a/src/status_im/chats_list/screen.cljs
+++ b/src/status_im/chats_list/screen.cljs
@@ -36,7 +36,7 @@
       [drawer-view
        [view st/chats-container
         [chats-list-toolbar]
-        [list-view {:dataSource (to-datasource (vals @chats))
+        [list-view {:dataSource (to-datasource @chats)
                     :renderRow  (fn [row _ _]
                                   (list-item [chat-list-item row]))
                     :style      st/list-container}]
diff --git a/src/status_im/chats_list/views/chat_list_item.cljs b/src/status_im/chats_list/views/chat_list_item.cljs
index 0c343f9b59..a7877e5e82 100644
--- a/src/status_im/chats_list/views/chat_list_item.cljs
+++ b/src/status_im/chats_list/views/chat_list_item.cljs
@@ -1,17 +1,18 @@
 (ns status-im.chats-list.views.chat-list-item
   (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
             [status-im.components.react :refer [view
-                                              text
-                                              image
-                                              touchable-highlight]]
+                                                text
+                                                image
+                                                touchable-highlight]]
             [status-im.components.styles :refer [font]]
             [status-im.chats-list.views.inner-item :refer
              [chat-list-item-inner-view]]))
 
-(defn chat-list-item [{:keys [chat-id] :as chat}]
+(defn chat-list-item [[chat-id chat]]
   [touchable-highlight
    {:on-press #(dispatch [:navigate-to :chat chat-id])}
    [view [chat-list-item-inner-view (merge chat
                                            ;; TODO stub data
-                                           {:new-messages-count 3
+                                           {:chat-id            chat-id
+                                            :new-messages-count 3
                                             :online             true})]]])