TouchInstinct
/
android-templates
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into lib_upd

This commit is contained in:
gorodeckii 2017-08-01 19:31:24 +03:00
parent 129bbf5b18 29aae2df52
commit 3773cec2df
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -27,8 +27,8 @@ dependencies {
compile 'io.reactivex:rxandroid:1.2.1'
compile 'io.reactivex:rxjava:1.3.0'
provided 'com.android.support:appcompat-v7:25.4.0'
provided 'com.android.support:recyclerview-v7:25.4.0'
provided 'com.android.support:appcompat-v7:25.3.1'
provided 'com.android.support:recyclerview-v7:25.3.1'
provided 'com.squareup.retrofit2:retrofit:2.3.0'
provided('com.google.http-client:google-http-client-jackson2:1.22.0') {

2
src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
View File

@ -52,7 +52,7 @@ public class LoganSquareEnumConverter<T extends Enum & LoganSquareEnum> extends
@Override
public T getFromString(@Nullable final String string) {
if (string == null) {
return null;
return defaultValue;
}
for (final T value : enumValues) {
if (value.getValueName().equals(string)) {