From c7a52e07476ef410e488b64f9a673f03dee68aaf Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Mon, 16 May 2016 19:20:17 +0300 Subject: [PATCH] jodatime added by default --- build.gradle | 1 + src/main/java/ru/touchin/templates/TouchinApp.java | 3 +++ src/main/java/ru/touchin/templates/model/GoogleJsonModel.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97a3184..af3395e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ dependencies { provided('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true; } + compile 'net.danlew:android.joda:2.9.3' provided 'io.reactivex:rxandroid:1.1.0' diff --git a/src/main/java/ru/touchin/templates/TouchinApp.java b/src/main/java/ru/touchin/templates/TouchinApp.java index b312c26..eaf78c4 100644 --- a/src/main/java/ru/touchin/templates/TouchinApp.java +++ b/src/main/java/ru/touchin/templates/TouchinApp.java @@ -27,6 +27,8 @@ import android.util.Log; import com.crashlytics.android.Crashlytics; +import net.danlew.android.joda.JodaTimeAndroid; + import io.fabric.sdk.android.Fabric; import ru.touchin.roboswag.components.views.TypefacedViewHelper; import ru.touchin.roboswag.core.log.ConsoleLogProcessor; @@ -50,6 +52,7 @@ public abstract class TouchinApp extends Application { @Override public void onCreate() { super.onCreate(); + JodaTimeAndroid.init(this); if (isDebug()) { TypefacedViewHelper.setAllowEmptyCustomTypeface(false); diff --git a/src/main/java/ru/touchin/templates/model/GoogleJsonModel.java b/src/main/java/ru/touchin/templates/model/GoogleJsonModel.java index 86f1a3a..5b448bb 100644 --- a/src/main/java/ru/touchin/templates/model/GoogleJsonModel.java +++ b/src/main/java/ru/touchin/templates/model/GoogleJsonModel.java @@ -33,7 +33,7 @@ public abstract class GoogleJsonModel extends Model { } } - protected static void validateNullOrNonEmpty(@Nullable final Object object) throws ValidationException { + protected static void validateEmptyOrNonNull(@Nullable final Object object) throws ValidationException { if (object != null && isNullOrEmpty(object)) { throw new ValidationException("Nullable or not empty object is empty"); }