TouchInstinct
/
RoboSwag-components
312
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio singletons in lib removed

This commit is contained in:
Gavriil Sitnikov 2016-04-14 15:25:16 +03:00
parent 9d59234e9a
commit 26c9067a7d
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/ru/touchin/roboswag/components/audio/HeadsetStateObserver.java
View File

@ -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<Boolean> isPluggedInSubject;
private final Observable<Boolean> 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();

16
src/main/java/ru/touchin/roboswag/components/telephony/IsCallingObserver.java
View File

@ -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<Boolean> isCallingSubject = BehaviorSubject.create();
private final Observable<Boolean> 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