diff --git a/src/main/java/ru/touchin/templates/TouchinActivity.java b/src/main/java/ru/touchin/templates/TouchinActivity.java index 07dcdaa..fbe29c2 100644 --- a/src/main/java/ru/touchin/templates/TouchinActivity.java +++ b/src/main/java/ru/touchin/templates/TouchinActivity.java @@ -31,16 +31,13 @@ import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity; -import ru.touchin.roboswag.components.utils.Logic; import ru.touchin.roboswag.core.log.Lc; /** * Created by Gavriil Sitnikov on 11/03/16. * Base class of activity to extends for Touch Instinct related projects. - * - * @param Type of application's {@link Logic}. */ -public abstract class TouchinActivity extends ViewControllerActivity { +public abstract class TouchinActivity extends ViewControllerActivity { @Override protected void onCreate(@Nullable final Bundle savedInstanceState) { diff --git a/src/main/java/ru/touchin/templates/TouchinService.java b/src/main/java/ru/touchin/templates/TouchinService.java index aca5d2b..9c660aa 100644 --- a/src/main/java/ru/touchin/templates/TouchinService.java +++ b/src/main/java/ru/touchin/templates/TouchinService.java @@ -39,8 +39,6 @@ import io.reactivex.functions.Action; import io.reactivex.functions.Consumer; import io.reactivex.internal.functions.Functions; import io.reactivex.subjects.BehaviorSubject; -import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity; -import ru.touchin.roboswag.components.utils.Logic; import ru.touchin.roboswag.components.utils.UiUtils; import ru.touchin.roboswag.core.log.Lc; import ru.touchin.roboswag.core.utils.ServiceBinder; @@ -49,27 +47,14 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException; /** * Created by Gavriil Sitnikov on 10/01/17. * Base class of service to extends for Touch Instinct related projects. - * It contains {@link Logic} and could bind to it through {@link #untilDestroy(Observable)} methods. - * - * @param Type of application's {@link Logic}. */ -public abstract class TouchinService extends Service { +public abstract class TouchinService extends Service { - //it is needed to hold strong reference to logic - private TLogic reference; @NonNull private final Handler postHandler = new Handler(); @NonNull private final BehaviorSubject isCreatedSubject = BehaviorSubject.create(); - /** - * It should return specific class where all logic will be. - * - * @return Returns class of specific {@link Logic}. - */ - @NonNull - protected abstract Class getLogicClass(); - @Override public void onCreate() { super.onCreate(); @@ -77,21 +62,6 @@ public abstract class TouchinService extends Service { postHandler.post(() -> isCreatedSubject.onNext(true)); } - /** - * Returns (and creates if needed) application's logic. - * - * @return Object which represents application's logic. - */ - @NonNull - protected TLogic getLogic() { - synchronized (ViewControllerActivity.class) { - if (reference == null) { - reference = Logic.getInstance(this, getLogicClass()); - } - } - return reference; - } - @SuppressWarnings("CPD-START") //CPD: it is same as in other implementation based on BaseLifecycleBindable /**