From 0eab7853c0da6c6e8d2d87b9fb2723d79a0287e7 Mon Sep 17 00:00:00 2001 From: Oleg Date: Wed, 26 Apr 2017 15:40:05 +0300 Subject: [PATCH 1/2] new versions --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8d109b7..a5c81c3 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { compile 'net.danlew:android.joda:2.9.9' compile 'com.android.support:multidex:1.0.1' compile 'io.reactivex:rxandroid:1.2.1' - compile 'io.reactivex:rxjava:1.2.9' + compile 'io.reactivex:rxjava:1.2.10' provided 'com.android.support:appcompat-v7:25.3.1' provided 'com.android.support:recyclerview-v7:25.3.1' @@ -36,7 +36,7 @@ dependencies { exclude(group: 'org.apache.httpcomponents', module: 'httpclient') } - provided 'com.facebook.fresco:fresco:1.2.0' + provided 'com.facebook.fresco:fresco:1.3.0' provided 'com.bluelinelabs:logansquare:1.3.7' provided 'com.scottyab:aes-crypto:0.0.4' From fe29d22933ff8ba8a951bb3a27986dceb10fd16b Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Fri, 28 Apr 2017 02:09:39 +0300 Subject: [PATCH 2/2] fixed useless validation of logic on collections validation --- src/main/java/ru/touchin/templates/ApiModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/ru/touchin/templates/ApiModel.java b/src/main/java/ru/touchin/templates/ApiModel.java index 45b1680..117e070 100644 --- a/src/main/java/ru/touchin/templates/ApiModel.java +++ b/src/main/java/ru/touchin/templates/ApiModel.java @@ -60,6 +60,10 @@ public abstract class ApiModel implements Serializable { while (iterator.hasNext()) { final Object item = iterator.next(); if (!(item instanceof ApiModel)) { + if (item != null) { + // let's just think that all of items are not ApiModels + break; + } continue; }