From ccd9b85d049f2442a7015342c8a26fd070140e59 Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Thu, 4 May 2017 13:27:55 +0300 Subject: [PATCH 1/5] update build tools version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a5c81c3..4ac9519 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 From f3b989cd0a9958286f5976c688601dfea019f121 Mon Sep 17 00:00:00 2001 From: Anton Domnikov Date: Thu, 4 May 2017 13:31:43 +0300 Subject: [PATCH 2/5] static --- src/main/java/ru/touchin/templates/ApiModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ru/touchin/templates/ApiModel.java b/src/main/java/ru/touchin/templates/ApiModel.java index 117e070..e319d9b 100644 --- a/src/main/java/ru/touchin/templates/ApiModel.java +++ b/src/main/java/ru/touchin/templates/ApiModel.java @@ -50,7 +50,7 @@ public abstract class ApiModel implements Serializable { * @param collectionValidationRule Rule explaining what to do if invalid items found; * @throws ValidationException Exception of validation. */ - @SuppressWarnings("PMD.PreserveStackTrace") + @SuppressWarnings({"PMD.PreserveStackTrace", "PMD.CyclomaticComplexity"}) // PreserveStackTrace: it's ok - we are logging it on Lc.e() protected static void validateCollection(@NonNull final Collection collection, @NonNull final CollectionValidationRule collectionValidationRule) throws ValidationException { From 58a015369eb2bb3f38ebb1eec1fdee30f1a9bc02 Mon Sep 17 00:00:00 2001 From: Elena Bobkova Date: Fri, 5 May 2017 16:58:12 +0300 Subject: [PATCH 3/5] Revert "registration of hook crash fixed" This reverts commit dfb0907eb5fb14a684b951520e776a7a8359a5a4. --- .../java/ru/touchin/templates/TouchinApp.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/ru/touchin/templates/TouchinApp.java b/src/main/java/ru/touchin/templates/TouchinApp.java index 44747b9..8e29b41 100644 --- a/src/main/java/ru/touchin/templates/TouchinApp.java +++ b/src/main/java/ru/touchin/templates/TouchinApp.java @@ -81,15 +81,13 @@ public abstract class TouchinApp extends Application { @Override public void onCreate() { super.onCreate(); - if (RxAndroidPlugins.getInstance().getSchedulersHook() == null) { - RxAndroidPlugins.getInstance().registerSchedulersHook(new RxAndroidSchedulersHook() { - @NonNull - @Override - public Scheduler getMainThreadScheduler() { - return new MainThreadScheduler(); - } - }); - } + RxAndroidPlugins.getInstance().registerSchedulersHook(new RxAndroidSchedulersHook() { + @NonNull + @Override + public Scheduler getMainThreadScheduler() { + return new MainThreadScheduler(); + } + }); JodaTimeAndroid.init(this); if (isDebug()) { enableStrictMode(); From 0ae38bf5f3243d4c7fe6945ee6f09ce7dcc5e4cd Mon Sep 17 00:00:00 2001 From: Oleg Date: Wed, 10 May 2017 21:15:38 +0300 Subject: [PATCH 4/5] rxjava version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4ac9519..07ead07 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.10' + compile 'io.reactivex:rxjava:1.3.0' provided 'com.android.support:appcompat-v7:25.3.1' provided 'com.android.support:recyclerview-v7:25.3.1' From 6203b9a7cf94bbc3a8e9f1f4308af6d8b9315ef6 Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Fri, 12 May 2017 19:31:41 +0300 Subject: [PATCH 5/5] observable collection debug enabled --- src/main/java/ru/touchin/templates/TouchinApp.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/ru/touchin/templates/TouchinApp.java b/src/main/java/ru/touchin/templates/TouchinApp.java index 8e29b41..3d2be3d 100644 --- a/src/main/java/ru/touchin/templates/TouchinApp.java +++ b/src/main/java/ru/touchin/templates/TouchinApp.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import io.fabric.sdk.android.Fabric; +import ru.touchin.roboswag.components.adapters.ObservableCollectionAdapter; import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment; import ru.touchin.roboswag.components.utils.UiUtils; import ru.touchin.roboswag.components.views.TypefacedEditText; @@ -91,6 +92,7 @@ public abstract class TouchinApp extends Application { JodaTimeAndroid.init(this); if (isDebug()) { enableStrictMode(); + ObservableCollectionAdapter.setInDebugMode(); ViewControllerFragment.setInDebugMode(); TypefacedEditText.setInDebugMode(); TypefacedTextView.setInDebugMode();