bump 2.6.1 sdk version

QuickBlox · Jul 22, 2016 · d358c80 · d358c80
1 parent abaa198
commit d358c80
Show file tree

Hide file tree

Showing 44 changed files with 1,458 additions and 779 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,7 @@ ext {
     lintAbortOnError = false
 
     // QuickBlox SDK version
-    qbSdkVersion = '2.6'
+    qbSdkVersion = '2.6.1'
 
     // Dependency versions
     playServicesVersion = '8.4.0'

diff --git a/sample-chat/build.gradle b/sample-chat/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.quickblox.sample.chat"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 200
-        versionName "2.0.0"
+        versionCode 201
+        versionName "2.0.3"
     }
 
     productFlavors {
@@ -35,17 +35,15 @@ android {
             keyPassword "android"
         }
     }
+
 }
 
+
 dependencies {
-    compile("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion@aar") {
-        transitive = true
-    }
-    compile "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion@aar"
+    compile("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion")
+    compile("com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion")
 
-    compile(project(":sample-core")) {
-        transitive = true;
-    }
+    compile(project(":sample-core"))
     compile 'com.github.orangegangsters:swipy:1.2.2@aar'
     compile "com.google.android.gms:play-services-gcm:${rootProject.playServicesVersion}"
     compile "com.github.bumptech.glide:glide:${rootProject.glideVersion}"

diff --git a/sample-content/build.gradle b/sample-content/build.gradle
@@ -38,10 +38,9 @@ android {
 }
 
 dependencies {
-    compile "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion@aar"
-    compile(project(":sample-core")) {
-        transitive = true;
-    }
+    compile "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion"
+
+    compile(project(":sample-core"))
 
     compile "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
 }

diff --git a/sample-core/build.gradle b/sample-core/build.gradle
@@ -13,8 +13,7 @@ android {
 }
 
 dependencies {
-    compile "com.quickblox:quickblox-android-sdk-core:$rootProject.qbSdkVersion@aar"
-    compile "com.quickblox:quickblox-android-sdk-messages:$rootProject.qbSdkVersion@aar"
+    compile ("com.quickblox:quickblox-android-sdk-messages:$rootProject.qbSdkVersion" )
 
     compile "com.google.android.gms:play-services-gcm:${rootProject.playServicesVersion}"
     compile "com.android.support:design:${rootProject.designVersion}"

diff --git a/sample-pushnotifications/build.gradle b/sample-pushnotifications/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         versionCode 200
-        versionName "2.0.0"
+        versionName "2.0.2"
     }
 
     productFlavors {

diff --git a/sample-videochat-webrtc/build.gradle b/sample-videochat-webrtc/build.gradle
@@ -23,9 +23,9 @@ android {
     defaultConfig {
         applicationId "com.quickblox.sample.groupchatwebrtc"
         minSdkVersion rootProject.minSdkVersion
-        targetSdkVersion rootProject.targetSdkVersion
+        targetSdkVersion 23
         versionCode 1
-        versionName "1.0"
+        versionName "1.4"
     }
 
     productFlavors {
@@ -52,19 +52,17 @@ android {
             keyPassword "android"
         }
     }
+
+    dexOptions {
+        preDexLibraries = false
+    }
 }
 
 dependencies {
 
-    compile "com.quickblox:quickblox-android-sdk-core:$rootProject.qbSdkVersion@aar"
-    compile ("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion@aar") {
-        transitive=true
-    }
-    compile "com.quickblox:quickblox-android-sdk-videochat-webrtc:$rootProject.qbSdkVersion@aar"
+    compile "com.quickblox:quickblox-android-sdk-videochat-webrtc:$rootProject.qbSdkVersion"
 
-    compile (project(":sample-core")) {
-        transitive = true;
-    }
+    compile (project(":sample-core"))
 
     compile "com.android.support:recyclerview-v7:${rootProject.recyclerviewV7Version}"
     compile "com.android.support:support-annotations:${rootProject.supportAnnotationsVersion}"

diff --git a/sample-videochat-webrtc/src/main/AndroidManifest.xml b/sample-videochat-webrtc/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/BaseAppTheme"
+        android:theme="@style/AppThemeVideo"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".activities.ListUsersActivity"
@@ -41,8 +41,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />

diff --git a/...c/main/java/com/quickblox/sample/groupchatwebrtc/activities/BaseLogginedUserActivity.java b/...c/main/java/com/quickblox/sample/groupchatwebrtc/activities/BaseLogginedUserActivity.java
@@ -1,24 +1,27 @@
 package com.quickblox.sample.groupchatwebrtc.activities;
 
-import android.app.ActionBar;
-import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.SystemClock;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Chronometer;
 import android.widget.TextView;
 
-import com.quickblox.sample.groupchatwebrtc.utils.Consts;
 import com.quickblox.sample.groupchatwebrtc.R;
+import com.quickblox.sample.groupchatwebrtc.utils.Consts;
 import com.quickblox.sample.groupchatwebrtc.holder.DataHolder;
 import com.quickblox.users.model.QBUser;
 
 
 /**
  * QuickBlox team
  */
-public class BaseLogginedUserActivity extends Activity {
+public class BaseLogginedUserActivity extends AppCompatActivity {
 
     private static final String APP_VERSION = "App version";
     private ActionBar mActionBar;
@@ -27,7 +30,7 @@ public class BaseLogginedUserActivity extends Activity {
 
     public void initActionBar() {
 
-        mActionBar = getActionBar();
+        mActionBar = getSupportActionBar();
         mActionBar.setDisplayShowHomeEnabled(false);
         mActionBar.setDisplayShowTitleEnabled(false);
 
@@ -37,37 +40,49 @@ public void initActionBar() {
 
         TextView numberOfListAB = (TextView) mCustomView.findViewById(R.id.numberOfListAB);
         QBUser loggedUser = DataHolder.getLoggedUser();
-        if (loggedUser != null) {
+        if (loggedUser != null ) {
             int number = DataHolder.getUserIndexByID(loggedUser.getId());
             numberOfListAB.setBackgroundResource(ListUsersActivity.resourceSelector(number));
-            numberOfListAB.setText(String.valueOf(number + 1));
+            numberOfListAB.setText(String.valueOf(number+1));
 
             TextView loginAsAB = (TextView) mCustomView.findViewById(R.id.loginAsAB);
             loginAsAB.setText(R.string.logged_in_as);
             //
             TextView userNameAB = (TextView) mCustomView.findViewById(R.id.userNameAB);
-            userNameAB.setText(String.valueOf(number + 1));
+            userNameAB.setText(String.valueOf(number+1));
         }
 
         numberOfListAB.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
                 AlertDialog.Builder dialog = new AlertDialog.Builder(BaseLogginedUserActivity.this);
                 dialog.setTitle(APP_VERSION);
-                dialog.setMessage(Consts.VERSION_NUMBER);
+                String appVersion = getAppVersion();
+                dialog.setMessage(appVersion != null ? appVersion : Consts.VERSION_NUMBER );
                 dialog.show();
                 return true;
-            }
-        });
+            }});
 
 
         mActionBar.setCustomView(mCustomView);
         mActionBar.setDisplayShowCustomEnabled(true);
 
     }
 
+    public  String getAppVersion() {
+        PackageInfo pinfo = null;
+        try {
+            pinfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+            return pinfo.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(BaseLogginedUserActivity.class.getSimpleName(), "Retriving versionName failed." + e.getLocalizedMessage());
+            return null;
+        }
+
+    }
+
     public void initActionBarWithTimer() {
-        mActionBar = getActionBar();
+        mActionBar = getSupportActionBar();
         mActionBar.setDisplayShowHomeEnabled(false);
         mActionBar.setDisplayShowTitleEnabled(false);
 
@@ -98,8 +113,8 @@ public void startTimer() {
         }
     }
 
-    public void stopTimer() {
-        if (timerABWithTimer != null) {
+    public void stopTimer(){
+        if (timerABWithTimer != null){
             timerABWithTimer.stop();
             isStarted = false;
         }