Skip to content

Commit

Permalink
Merge pull request #536 from QuickBlox/development
Browse files Browse the repository at this point in the history
release 3.7.0 version
  • Loading branch information
tatanka987 authored Feb 8, 2018
2 parents 110f57e + 5ac9ce6 commit e324c24
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ ext {
lintAbortOnError = false

// QuickBlox SDK version
qbSdkVersion = '3.6.0'
qbSdkVersion = '3.7.0'

versionCode = 360
versionName = '3.6.0'
versionCode = 370
versionName = '3.7.0'

testRunnerVersion = "0.4.1"

Expand Down
19 changes: 17 additions & 2 deletions sample-videochat-webrtc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {

defaultConfig {
applicationId "com.quickblox.sample.groupchatwebrtc"
minSdkVersion rootProject.minSdkVersion
minSdkVersion 16
targetSdkVersion rootProject.targetSdkVersion
versionCode rootProject.versionCode
versionName rootProject.versionName
Expand All @@ -36,7 +36,7 @@ android {
}
dev {
dimension rootProject.dimensionDefault
minSdkVersion rootProject.minSdkVersion
minSdkVersion 16
}
}

Expand Down Expand Up @@ -65,6 +65,21 @@ android {
lintOptions {
abortOnError false
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

//There is code for excluding some native libs (it useful if you need reduce apk size and want
//build apk only for specific platform). This method allows you to achieve savings about 10MB
//of apk's size (but you need build 4 different apks).
// packagingOptions {
// exclude '**/armeabi-v7a/libjingle_peerconnection_so.so'
// exclude '**/arm64-v8a/libjingle_peerconnection_so.so'
// exclude '**/x86_64/libjingle_peerconnection_so.so'
// exclude '**/x86/libjingle_peerconnection_so.so'
// }
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.quickblox.chat.QBChatService;
import com.quickblox.chat.QBSignaling;
import com.quickblox.chat.QBWebRTCSignaling;
import com.quickblox.chat.connections.tcp.QBTcpChatConnectionFabric;
import com.quickblox.chat.connections.tcp.QBTcpConfigurationBuilder;
import com.quickblox.chat.listeners.QBVideoChatSignalingManagerListener;
import com.quickblox.core.QBEntityCallback;
import com.quickblox.core.exception.QBResponseException;
Expand Down Expand Up @@ -88,6 +90,10 @@ private void startSuitableActions() {

private void createChatService() {
if (chatService == null) {
QBTcpConfigurationBuilder configurationBuilder = new QBTcpConfigurationBuilder();
configurationBuilder.setSocketTimeout(0);
QBChatService.setConnectionFabric(new QBTcpChatConnectionFabric(configurationBuilder));

QBChatService.setDebugEnabled(true);
chatService = QBChatService.getInstance();
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit e324c24

Please sign in to comment.