From 00f4b2ac69b75b1e64f158846ccf0f6fb5f114c0 Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Sat, 22 Apr 2017 16:29:52 +0300 Subject: [PATCH 1/4] missed/nullable exception clarified --- .../ru/touchin/templates/googlejson/GoogleJsonModel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/touchin/templates/googlejson/GoogleJsonModel.java b/src/main/java/ru/touchin/templates/googlejson/GoogleJsonModel.java index f150dbc..a695e95 100644 --- a/src/main/java/ru/touchin/templates/googlejson/GoogleJsonModel.java +++ b/src/main/java/ru/touchin/templates/googlejson/GoogleJsonModel.java @@ -78,8 +78,11 @@ public abstract class GoogleJsonModel extends ApiModel { * @throws ValidationException Exception of validation. */ protected static void validateNotNull(@Nullable final Object object) throws ValidationException { - if (isNullOrMissed(object)) { - throw new ValidationException("Not nullable object is null or missed at " + Lc.getCodePoint(null, 1)); + if (isNull(object)) { + throw new ValidationException("Not nullable object is null at " + Lc.getCodePoint(null, 1)); + } + if (isMissed(object)) { + throw new ValidationException("Not nullable object is missed at " + Lc.getCodePoint(null, 1)); } } From dfb0907eb5fb14a684b951520e776a7a8359a5a4 Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Sat, 22 Apr 2017 18:31:54 +0300 Subject: [PATCH 2/4] registration of hook crash fixed --- .../java/ru/touchin/templates/TouchinApp.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/touchin/templates/TouchinApp.java b/src/main/java/ru/touchin/templates/TouchinApp.java index 8e29b41..44747b9 100644 --- a/src/main/java/ru/touchin/templates/TouchinApp.java +++ b/src/main/java/ru/touchin/templates/TouchinApp.java @@ -81,13 +81,15 @@ public abstract class TouchinApp extends Application { @Override public void onCreate() { super.onCreate(); - RxAndroidPlugins.getInstance().registerSchedulersHook(new RxAndroidSchedulersHook() { - @NonNull - @Override - public Scheduler getMainThreadScheduler() { - return new MainThreadScheduler(); - } - }); + if (RxAndroidPlugins.getInstance().getSchedulersHook() == null) { + RxAndroidPlugins.getInstance().registerSchedulersHook(new RxAndroidSchedulersHook() { + @NonNull + @Override + public Scheduler getMainThreadScheduler() { + return new MainThreadScheduler(); + } + }); + } JodaTimeAndroid.init(this); if (isDebug()) { enableStrictMode(); From 819e4a1bea51dc68bf7b54e370e9e26d614ac827 Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Sat, 22 Apr 2017 18:46:04 +0300 Subject: [PATCH 3/4] facebook lib version upd --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2077373..66bf3a7 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,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 cb0da708d673da2efea87749b72cb478b2cf43b5 Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Wed, 3 May 2017 22:29:22 +0300 Subject: [PATCH 4/4] build tools update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 66bf3a7..d6be7a8 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda' android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8