From 26c9067a7de51761c62f099a26104f7c8127af2c Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Thu, 14 Apr 2016 15:25:16 +0300 Subject: [PATCH] audio singletons in lib removed --- .../components/audio/HeadsetStateObserver.java | 16 +--------------- .../components/telephony/IsCallingObserver.java | 16 +--------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/main/java/ru/touchin/roboswag/components/audio/HeadsetStateObserver.java b/src/main/java/ru/touchin/roboswag/components/audio/HeadsetStateObserver.java index 047a0f1..eabad85 100644 --- a/src/main/java/ru/touchin/roboswag/components/audio/HeadsetStateObserver.java +++ b/src/main/java/ru/touchin/roboswag/components/audio/HeadsetStateObserver.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import rx.Observable; import rx.subjects.BehaviorSubject; @@ -17,24 +16,11 @@ import rx.subjects.BehaviorSubject; */ public final class HeadsetStateObserver { - @Nullable - private static HeadsetStateObserver instance; - - @NonNull - public static HeadsetStateObserver getInstance(@NonNull final Context context) { - synchronized (HeadsetStateObserver.class) { - if (instance == null) { - instance = new HeadsetStateObserver(context); - } - return instance; - } - } - private final AudioManager audioManager; private final BehaviorSubject isPluggedInSubject; private final Observable isPluggedInObservable; - private HeadsetStateObserver(@NonNull final Context context) { + public HeadsetStateObserver(@NonNull final Context context) { audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); isPluggedInSubject = BehaviorSubject.create(); final IsPluggedInReceiver isPluggedInReceiver = new IsPluggedInReceiver(); diff --git a/src/main/java/ru/touchin/roboswag/components/telephony/IsCallingObserver.java b/src/main/java/ru/touchin/roboswag/components/telephony/IsCallingObserver.java index 29530e8..b68d815 100644 --- a/src/main/java/ru/touchin/roboswag/components/telephony/IsCallingObserver.java +++ b/src/main/java/ru/touchin/roboswag/components/telephony/IsCallingObserver.java @@ -21,7 +21,6 @@ package ru.touchin.roboswag.components.telephony; import android.content.Context; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; @@ -34,27 +33,14 @@ import rx.subjects.BehaviorSubject; */ public final class IsCallingObserver { - @Nullable - private static IsCallingObserver instance; - private static boolean isCallingState(final int state) { return state != TelephonyManager.CALL_STATE_IDLE; } - @NonNull - public static IsCallingObserver getInstance(@NonNull final Context context) { - synchronized (IsCallingObserver.class) { - if (instance == null) { - instance = new IsCallingObserver(context); - } - return instance; - } - } - private final BehaviorSubject isCallingSubject = BehaviorSubject.create(); private final Observable isCallingObservable; - private IsCallingObserver(@NonNull final Context context) { + public IsCallingObserver(@NonNull final Context context) { final TelephonyManager phoneStateManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); phoneStateManager.listen(new PhoneStateListener() { @Override