From 73d5eb52b5b395d0d800018f81abf5a56b93b62e Mon Sep 17 00:00:00 2001 From: tatanka987 Date: Fri, 24 Nov 2017 17:25:55 +0200 Subject: [PATCH 1/6] - prepare for building with Jenkins CI; --- sample-chat/src/main/AndroidManifest.xml | 4 ---- sample-content/build.gradle | 11 +++++++++++ sample-core/src/main/AndroidManifest.xml | 9 +++++++-- sample-custom-objects/build.gradle | 11 +++++++++++ sample-pushnotifications/build.gradle | 11 +++++++++++ sample-users/build.gradle | 11 +++++++++++ sample-videochat-webrtc/src/main/AndroidManifest.xml | 3 --- snippets/src/main/AndroidManifest.xml | 4 +++- 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/sample-chat/src/main/AndroidManifest.xml b/sample-chat/src/main/AndroidManifest.xml index 1b5633672..5baa3a028 100644 --- a/sample-chat/src/main/AndroidManifest.xml +++ b/sample-chat/src/main/AndroidManifest.xml @@ -98,10 +98,6 @@ android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> - - + - + + + \ No newline at end of file diff --git a/sample-custom-objects/build.gradle b/sample-custom-objects/build.gradle index dde7d7e38..4c55e9243 100644 --- a/sample-custom-objects/build.gradle +++ b/sample-custom-objects/build.gradle @@ -1,4 +1,15 @@ +buildscript { + repositories { + maven { url 'https://maven.fabric.io/public' } + } + + dependencies { + classpath 'io.fabric.tools:gradle:1.20.1' + } +} + apply plugin: 'com.android.application' +apply plugin: 'io.fabric' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/sample-pushnotifications/build.gradle b/sample-pushnotifications/build.gradle index 00d1d551c..63cf89047 100644 --- a/sample-pushnotifications/build.gradle +++ b/sample-pushnotifications/build.gradle @@ -1,4 +1,15 @@ +buildscript { + repositories { + maven { url 'https://maven.fabric.io/public' } + } + + dependencies { + classpath 'io.fabric.tools:gradle:1.20.1' + } +} + apply plugin: 'com.android.application' +apply plugin: 'io.fabric' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/sample-users/build.gradle b/sample-users/build.gradle index 53265f9a1..28f477ed4 100644 --- a/sample-users/build.gradle +++ b/sample-users/build.gradle @@ -1,4 +1,15 @@ +buildscript { + repositories { + maven { url 'https://maven.fabric.io/public' } + } + + dependencies { + classpath 'io.fabric.tools:gradle:1.20.1' + } +} + apply plugin: 'com.android.application' +apply plugin: 'io.fabric' android { compileSdkVersion rootProject.compileSdkVersion diff --git a/sample-videochat-webrtc/src/main/AndroidManifest.xml b/sample-videochat-webrtc/src/main/AndroidManifest.xml index 9ee47c367..f1a91ed8a 100755 --- a/sample-videochat-webrtc/src/main/AndroidManifest.xml +++ b/sample-videochat-webrtc/src/main/AndroidManifest.xml @@ -92,9 +92,6 @@ android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> - diff --git a/snippets/src/main/AndroidManifest.xml b/snippets/src/main/AndroidManifest.xml index 4e15b1d73..5e9a7b703 100644 --- a/snippets/src/main/AndroidManifest.xml +++ b/snippets/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + android:value="06afe5b32890416c317e719380d755a99dd2d5ba" + tools:replace="android:value"/> From 1244df0fab4ec992e3bd596709273ca00b518e34 Mon Sep 17 00:00:00 2001 From: tatanka987 Date: Mon, 11 Dec 2017 15:22:23 +0200 Subject: [PATCH 2/6] - update SDT to 3.5.2; - fixed ANDSAMPLES-344; --- build.gradle | 4 ++-- sample-chat/build.gradle | 4 ++-- .../sample/chat/ui/adapter/DialogsAdapter.java | 2 +- .../quickblox/sample/chat/utils/chat/ChatHelper.java | 12 +++++++----- sample-chat/src/main/res/values/styles_widgets.xml | 8 +++++++- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 98e57307d..ac06ec275 100644 --- a/build.gradle +++ b/build.gradle @@ -35,9 +35,9 @@ ext { lintAbortOnError = false // QuickBlox SDK version - qbSdkVersion = '3.4.1' + qbSdkVersion = '3.5.2' - versionName = '3.4.1' + versionName = '3.5.2' testRunnerVersion = "0.4.1" diff --git a/sample-chat/build.gradle b/sample-chat/build.gradle index dc04d8c6a..5f540ff87 100644 --- a/sample-chat/build.gradle +++ b/sample-chat/build.gradle @@ -26,8 +26,8 @@ android { applicationId "com.quickblox.sample.chat" minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion - versionCode 202 - versionName "3.2" + versionCode 352 + versionName "3.5.2" } productFlavors { diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java b/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java index 92bbd1275..e76ed4d87 100644 --- a/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java +++ b/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java @@ -60,7 +60,7 @@ public View getView(int position, View convertView, ViewGroup parent) { holder.unreadCounterTextView.setVisibility(View.GONE); } else { holder.unreadCounterTextView.setVisibility(View.VISIBLE); - holder.unreadCounterTextView.setText(String.valueOf(unreadMessagesCount > 99 ? 99 : unreadMessagesCount)); + holder.unreadCounterTextView.setText(String.valueOf(unreadMessagesCount > 99 ? "99+" : unreadMessagesCount)); } holder.rootLayout.setBackgroundColor(isItemSelected(position) ? ResourceUtils.getColor(R.color.selected_list_item_color) : diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java b/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java index fbf48fd06..22dffa0d6 100644 --- a/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java +++ b/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java @@ -12,6 +12,7 @@ import com.quickblox.chat.model.QBChatMessage; import com.quickblox.chat.model.QBDialogType; import com.quickblox.chat.request.QBDialogRequestBuilder; +import com.quickblox.chat.request.QBMessageGetBuilder; import com.quickblox.chat.utils.DialogUtils; import com.quickblox.content.QBContent; import com.quickblox.content.model.QBFile; @@ -235,12 +236,13 @@ public void onSuccess(QBChatDialog qbDialog, Bundle bundle) { public void loadChatHistory(QBChatDialog dialog, int skipPagination, final QBEntityCallback> callback) { - QBRequestGetBuilder customObjectRequestBuilder = new QBRequestGetBuilder(); - customObjectRequestBuilder.setSkip(skipPagination); - customObjectRequestBuilder.setLimit(CHAT_HISTORY_ITEMS_PER_PAGE); - customObjectRequestBuilder.sortDesc(CHAT_HISTORY_ITEMS_SORT_FIELD); + QBMessageGetBuilder messageGetBuilder = new QBMessageGetBuilder(); + messageGetBuilder.setSkip(skipPagination); + messageGetBuilder.setLimit(CHAT_HISTORY_ITEMS_PER_PAGE); + messageGetBuilder.sortDesc(CHAT_HISTORY_ITEMS_SORT_FIELD); + messageGetBuilder.markAsRead(false); - QBRestChatService.getDialogMessages(dialog, customObjectRequestBuilder).performAsync( + QBRestChatService.getDialogMessages(dialog, messageGetBuilder).performAsync( new QbEntityCallbackWrapper>(callback) { @Override public void onSuccess(ArrayList qbChatMessages, Bundle bundle) { diff --git a/sample-chat/src/main/res/values/styles_widgets.xml b/sample-chat/src/main/res/values/styles_widgets.xml index 9d0efdbe7..15aebfd08 100644 --- a/sample-chat/src/main/res/values/styles_widgets.xml +++ b/sample-chat/src/main/res/values/styles_widgets.xml @@ -43,8 +43,14 @@