Merge branch 'master' of https://github.com/QuickBlox/quickblox-andro…

…id-sdk
QuickBlox · Jun 14, 2016 · abaa198 · abaa198
2 parents b725c34 + 551ae4f
commit abaa198
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This project contains QuickBlox Android SDK, that includes
   * [Chat Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-chat)
   * [Video Chat WebRTC Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-videochat-webrtc)
   * [Users Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-users)
-  * [Push Notifications Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-messages)
+  * [Push Notifications Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-pushnotifications)
   * [Location Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-location)
   * [Custom Objects Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-custom-objects)
   * [Content Sample](https://github.com/QuickBlox/quickblox-android-sdk/tree/master/sample-content)

diff --git a/sample-chat/README.md b/sample-chat/README.md
@@ -4,4 +4,4 @@ Go to project page on QuickBlox Developers Section -- <http://quickblox.com/deve
 
 Or clone project here and start to work with the code.
 
-<img src="http://files.quickblox.com/android_chat2_1.png" width=180 />&nbsp;<img src="http://files.quickblox.com/android_chat2_4.png" width=180 />&nbsp;<img src="http://files.quickblox.com/android_chat2_2.png" width=180 />&nbsp;<img src="http://files.quickblox.com/android_chat2_3.png" width=180 />
+<img src="screenshots/Chat1.png" width=180 />&nbsp;<img src="screenshots/Chat2.png" width=180 />&nbsp;<img src="screenshots/Chat3.png" width=180 />&nbsp;<img src="screenshots/Chat4.png" width=180 />&nbsp;<img src="screenshots/Chat5.png" width=180 />&nbsp;<img src="screenshots/Chat6.png" width=180 />&nbsp;<img src="screenshots/Chat7.png" width=180 />
diff --git a/sample-content/README.md b/sample-content/README.md
@@ -15,4 +15,4 @@ Go to project page on QuickBlox Developers Section -- <http://quickblox.com/deve
 
 Or clone project here and start to work with the code.
 
-<img src="http://files.quickblox.com/Sample_Content_1.png" width=200 />&nbsp;<img src="http://files.quickblox.com/Sample_Content_2.png" width=200 />&nbsp;<img src="http://files.quickblox.com/Sample_Content_3.png" width=200 />&nbsp;
+<img src="screenshots/Content1.png" width=200 />&nbsp;<img src="screenshots/Content2.png" width=200 />&nbsp;<img src="screenshots/Content3.png" width=200 />&nbsp;<img src="screenshots/Content4.png" width=200 />&nbsp;
diff --git a/sample-content/screenshots/Content1.png b/sample-content/screenshots/Content1.png
diff --git a/sample-content/screenshots/Content2.png b/sample-content/screenshots/Content2.png
diff --git a/sample-content/screenshots/Content3.png b/sample-content/screenshots/Content3.png
diff --git a/sample-content/screenshots/Content4.png b/sample-content/screenshots/Content4.png
diff --git a/sample-custom-objects/README.md b/sample-custom-objects/README.md
@@ -15,4 +15,4 @@ Go to project page on QuickBlox Developers Section -- <http://quickblox.com/deve
 
 Or clone project here and start to work with the code.
 
-<img src="http://files.quickblox.com/Sample_CustomObjects_2.png" width=200 />&nbsp;<img src="http://files.quickblox.com/Sample_CustomObjects_3.png" width=200 />&nbsp;<img src="http://files.quickblox.com/Sample_CustomObjects_4.png" width=200 />
+<img src="screenshots/Custom1.png" width=200 />&nbsp;<img src="screenshots/Custom2.png" width=200 />&nbsp;<img src="screenshots/Custom3.png" width=200 />&nbsp;<img src="screenshots/Custom4.png" width=200 />
diff --git a/sample-custom-objects/screenshots/Custom1.png b/sample-custom-objects/screenshots/Custom1.png
diff --git a/sample-custom-objects/screenshots/Custom2.png b/sample-custom-objects/screenshots/Custom2.png
diff --git a/sample-custom-objects/screenshots/Custom3.png b/sample-custom-objects/screenshots/Custom3.png
diff --git a/sample-custom-objects/screenshots/Custom4.png b/sample-custom-objects/screenshots/Custom4.png
diff --git a/sample-pushnotifications/README.md b/sample-pushnotifications/README.md
@@ -15,4 +15,4 @@ Go to project page on QuickBlox Developers Section -- <http://quickblox.com/deve
 
 Or clone project here and start to work with the code.
 
-<img src="http://files.quickblox.com/Sample_Messages_1.png" width=200 />&nbsp;<img src="http://files.quickblox.com/android_messages_1.png" width=200 />
+<img src="screenshots/Push1.png" width=200 />&nbsp;<img src="screenshots/Push2.png" width=200 />&nbsp;<img src="screenshots/Push3.png" width=200 />&nbsp;<img src="screenshots/Push4.png" width=200 />
diff --git a/sample-pushnotifications/screenshots/Push1.png b/sample-pushnotifications/screenshots/Push1.png
diff --git a/sample-pushnotifications/screenshots/Push2.png b/sample-pushnotifications/screenshots/Push2.png
diff --git a/sample-pushnotifications/screenshots/Push3.png b/sample-pushnotifications/screenshots/Push3.png
diff --git a/sample-pushnotifications/screenshots/Push4.png b/sample-pushnotifications/screenshots/Push4.png
diff --git a/sample-users/README.md b/sample-users/README.md
@@ -17,4 +17,4 @@ Go to project page on QuickBlox Developers Section -- <http://quickblox.com/deve
 
 Or clone project here and start to work with the code.
 
-<img src="http://files.quickblox.com/Sample_Users_2.png" width=200 />&nbsp;<img src="http://files.quickblox.com/Sample_Users_3.png" width=200 />&nbsp;<img src="http://files.quickblox.com/Sample_Users_4.png" width=200 />&nbsp;
+<img src="screenshots/Users1.png" width=200 />&nbsp;<img src="screenshots/Users2.png" width=200 />&nbsp;<img src="screenshots/Users3.png" width=200 />&nbsp;<img src="screenshots/Users4.png" width=200 />&nbsp;
diff --git a/sample-users/screenshots/Users1.png b/sample-users/screenshots/Users1.png
diff --git a/sample-users/screenshots/Users2.png b/sample-users/screenshots/Users2.png
diff --git a/sample-users/screenshots/Users3.png b/sample-users/screenshots/Users3.png
diff --git a/sample-users/screenshots/Users4.png b/sample-users/screenshots/Users4.png
diff --git a/snippets/src/main/res/raw/servers.json b/snippets/src/main/res/raw/servers.json
@@ -14,38 +14,8 @@
             "test_user_login2": "igorquickblox712",
             "test_user_password2": "igorquickblox712",
             "dialog_id": "561cffc2a28f9a97ec0001d9"
-        },
-        "dekhdekh": {
-            "app_id": 1,
-            "auth_key": "L-DWNzHvUrcVYMW",
-            "auth_secret": "S2sYOsNC4GEFKYK",
-            "account_key": "",
-            "api_domain": "https://qbapi.dekhdekh.com",
-            "chat_domain": "qbchat.dekhdekh.com",
-            "test_user_id1": 15,
-            "test_user_login1": "test1",
-            "test_user_password1": "11111111",
-            "test_user_id2": 16,
-            "test_user_login2": "test2",
-            "test_user_password2": "11111111",
-            "dialog_id": "..."
-        },
-        "stage1": {
-            "app_id": 1,
-            "auth_key": "zUZXVVatAhfGjZB",
-            "auth_secret": "wqPafgpvOr-mC4u",
-            "account_key": "",
-            "api_domain": "https://apistage1.quickblox.com",
-            "chat_domain": "chatstage1.quickblox.com",
-            "test_user_id1": 2,
-            "test_user_login1": "igorquickblox711",
-            "test_user_password1": "igorquickblox711",
-            "test_user_id2": 3,
-            "test_user_login2": "igorquickblox712",
-            "test_user_password2": "igorquickblox712",
-            "dialog_id": "..."
         }
     },
     "active": "production",
     "use_first_user": false
-}
+}