diff --git a/.re-natal b/.re-natal index 5d64a66c9d..9a3660acfb 100644 --- a/.re-natal +++ b/.re-natal @@ -1,7 +1,7 @@ { "name": "SyngIm", "interface": "reagent", - "androidHost": "10.0.3.2", + "androidHost": "localhost", "modules": [ "react-native-contacts", "react-native-invertible-scroll-view", @@ -18,5 +18,6 @@ ], "imageDirs": [ "images" - ] + ], + "iosHost": "localhost" } \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 9f152c2e9b..272a943769 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -128,7 +128,7 @@ dependencies { compile project(':react-native-contacts') compile project(':react-native-i18n') // compile(name:'geth', ext:'aar') - compile(group: 'syng-im', name: 'android-geth', version: '1.4.0-201603131817-92d65cf', ext: 'aar') + compile(group: 'status-im', name: 'android-geth', version: '1.4.0-201604110816-a97a114', ext: 'aar') compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"]) } diff --git a/android/build.gradle b/android/build.gradle index f05bf1a9b7..038456b6b5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ allprojects { dirs 'libs' } maven { - url "http://85.90.244.96:8081/artifactory/libs-release-local" + url "http://185.90.37.89:8081/artifactory/libs-release-local" } } } diff --git a/env/dev/env/android/main.cljs b/env/dev/env/android/main.cljs index 2348604c4a..801573955b 100644 --- a/env/dev/env/android/main.cljs +++ b/env/dev/env/android/main.cljs @@ -1,17 +1,16 @@ (ns ^:figwheel-no-load env.android.main - (:require [reagent.core :as r] - [syng-im.android.core :refer [app-root]] - [figwheel.client :as figwheel :include-macros true] - [syng-im.android.core :as core])) + (:require [reagent.core :as r] + [syng-im.android.core :as core] + [figwheel.client :as figwheel :include-macros true])) (enable-console-print!) (def cnt (r/atom 0)) -(defn reloader [] @cnt [app-root]) +(defn reloader [] @cnt [core/app-root]) (def root-el (r/as-element [reloader])) (figwheel/watch-and-reload - :websocket-url "ws://10.0.3.2:3449/figwheel-ws" + :websocket-url "ws://localhost:3449/figwheel-ws" :heads-up-display true :jsload-callback #(swap! cnt inc)) diff --git a/ios/Messenger/AppDelegate.h b/ios/SyngIm/AppDelegate.h similarity index 100% rename from ios/Messenger/AppDelegate.h rename to ios/SyngIm/AppDelegate.h diff --git a/ios/Messenger/AppDelegate.m b/ios/SyngIm/AppDelegate.m similarity index 100% rename from ios/Messenger/AppDelegate.m rename to ios/SyngIm/AppDelegate.m diff --git a/ios/Messenger/Base.lproj/LaunchScreen.xib b/ios/SyngIm/Base.lproj/LaunchScreen.xib similarity index 100% rename from ios/Messenger/Base.lproj/LaunchScreen.xib rename to ios/SyngIm/Base.lproj/LaunchScreen.xib diff --git a/ios/Messenger/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/SyngIm/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ios/Messenger/Images.xcassets/AppIcon.appiconset/Contents.json rename to ios/SyngIm/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/ios/Messenger/Info.plist b/ios/SyngIm/Info.plist similarity index 100% rename from ios/Messenger/Info.plist rename to ios/SyngIm/Info.plist diff --git a/ios/Messenger/main.m b/ios/SyngIm/main.m similarity index 100% rename from ios/Messenger/main.m rename to ios/SyngIm/main.m diff --git a/src/syng_im/models/contacts.cljs b/src/syng_im/models/contacts.cljs index 478f1a5e0e..845a15f2e0 100644 --- a/src/syng_im/models/contacts.cljs +++ b/src/syng_im/models/contacts.cljs @@ -113,22 +113,22 @@ (comment (r/write #(create-contact {:phone-number "0543072333" - :whisper-identity "0x043e3a8344049fb48fef030084212a9d41577a5dea18aeb4c8f285c16f783aa84e43f84c32eb8601e22827b12d5f93f14e545f9023034a0521dc18484bbbc44704" + :whisper-identity "0x041e1a37a0317a66f8d826e6779d808a9f39b88c2f896c5d3c08c4ded259719be256e4e6d6f49dab2324993ec822b588f2c0591b7a723cb0be659f2eccf48b5fed" :name "Mr. Bean" :photo-path ""})) (r/write #(create-contact {:phone-number "0544828649" - :whisper-identity "0x04e9b01298dd12c4d8f0393d7890302b25762966d825158d1fdffe124703c0efcd7f23a6cf71c466ca50b2af3d54264ea5f224a19ba7775779c1ddbcb237258c5c" + :whisper-identity "0x04dcbf434bbf6925f251b7f43337f66a5a3f943e8983284045af703551cab39684d8c838e73f0234169f26fe126d7ef1ea3b8c1013e7dad1d4c5a82c7a651647fd" :name "Mr. Batman" :photo-path ""})) (r/write #(create-contact {:phone-number "0522222222" - :whisper-identity "0x0487954e7fa746d8cf787403c2c491aadad540b9bb1f0f7b8184792e91c33b6a394079295f5777ec6d4af9ad5ba24794b3ff1ec8be9ff6a708c85a163733192665" + :whisper-identity "0x0407c278af94e0b4599645023f5bec03cbdb3973bd0ae33b94c6a5885d9d20e82ff3f3c3584a637ba016af40bac2f711fd6028045756f561e36e4b07d0c2b4e623" :name "Mr. Eagle" :photo-path ""})) (r/write #(create-contact {:phone-number "0533333333" - :whisper-identity "0x04e43e861a6dd99ad9eee7bd58af89dcaa430188ebec8698de7b7bad54573324fff4ac5cb9bb277af317efd7abfc917b91bf48cc41e40bf70062fd79400016a1f9" + :whisper-identity "0x04512f852558ea09d09419019f3f443ec03ff2c1913c48e567723d70e5abf239ed87fb62486b90b85e12de5d327501c1993c9905a69f2ca7e1bfbaab12dd033313" :name "Mr. PiggyBear" :photo-path ""}))