diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle index dc80aaa15631..4c77b82bc0e8 100644 --- a/WordPressUtils/build.gradle +++ b/WordPressUtils/build.gradle @@ -1,9 +1,9 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.3.1' } } @@ -12,25 +12,29 @@ apply plugin: 'maven' apply plugin: 'signing' repositories { - mavenCentral() + jcenter() } dependencies { - compile 'commons-lang:commons-lang:2.6' - compile 'com.mcxiaoke.volley:library:1.0.10' - compile 'com.android.support:support-v13:22.2.0' + compile('commons-lang:commons-lang:2.6') { + exclude group: 'commons-logging' + } + compile 'com.mcxiaoke.volley:library:1.0.18' + compile 'com.android.support:support-v13:23.0.0' } android { + useLibrary 'org.apache.http.legacy' + publishNonDefault true - compileSdkVersion 22 - buildToolsVersion '22.0.1' + compileSdkVersion 23 + buildToolsVersion '23.0.0' defaultConfig { versionName "1.5.0" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 23 } } diff --git a/WordPressUtils/src/main/AndroidManifest.xml b/WordPressUtils/src/main/AndroidManifest.xml index 4f3bd125a3c5..44b1dcddc8bf 100644 --- a/WordPressUtils/src/main/AndroidManifest.xml +++ b/WordPressUtils/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java index 67a01773542a..3859605589be 100644 --- a/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java +++ b/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java @@ -5,6 +5,8 @@ import android.content.Context; import android.util.Patterns; +import org.wordpress.android.util.AppLog.T; + import java.util.regex.Pattern; public class UserEmailUtils { @@ -29,6 +31,7 @@ public static String getPrimaryEmail(Context context) { return ""; } catch (SecurityException e) { // exception will occur if app doesn't have GET_ACCOUNTS permission + AppLog.e(T.UTILS, "SecurityException - missing GET_ACCOUNTS permission"); return ""; } } diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java index d68e00b56aed..b6eb6c6c395d 100644 --- a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java +++ b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java @@ -28,8 +28,8 @@ public void init(Activity activity, CustomSwipeRefreshLayout swipeRefreshLayout, mSwipeRefreshLayout.setOnRefreshListener(this); final TypedArray styleAttrs = obtainStyledAttrsFromThemeAttr(activity, R.attr.swipeToRefreshStyle, R.styleable.RefreshIndicator); - int color = styleAttrs.getColor(R.styleable.RefreshIndicator_refreshIndicatorColor, - android.R.color.holo_blue_dark); + int color = styleAttrs.getColor(R.styleable.RefreshIndicator_refreshIndicatorColor, activity.getResources() + .getColor(android.R.color.holo_blue_dark)); mSwipeRefreshLayout.setColorSchemeColors(color, color, color, color); }