Skip to content

#17 use Ringtone class instead of AudioManager and MediaPlayer #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aenonGit merged 1 commit into from
Nov 20, 2017
Merged

#17 use Ringtone class instead of AudioManager and MediaPlayer #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions sipservice/src/main/java/net/gotev/sipservice/SipService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.IBinder;
Expand Down Expand Up @@ -75,8 +74,7 @@ public class SipService extends BackgroundService {

private List<SipAccountData> mConfiguredAccounts = new ArrayList<>();
private static ConcurrentHashMap<String, SipAccount> mActiveSipAccounts = new ConcurrentHashMap<>();
private MediaPlayer mRingTone;
private AudioManager mAudioManager;
private Ringtone mRingTone;
private Vibrator mVibrator;
private Uri mRingtoneUri;
private BroadcastEventEmitter mBroadcastEmitter;
Expand All @@ -100,7 +98,6 @@ public void run() {
loadNativeLibraries();

mRingtoneUri = RingtoneManager.getActualDefaultRingtoneUri(SipService.this, RingtoneManager.TYPE_RINGTONE);
mAudioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
mVibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);

mBroadcastEmitter = new BroadcastEventEmitter(SipService.this);
Expand Down Expand Up @@ -855,13 +852,8 @@ protected synchronized void startRingtone() {
mVibrator.vibrate(VIBRATOR_PATTERN, 0);

try {
mRingTone = MediaPlayer.create(this, mRingtoneUri);
mRingTone.setLooping(true);

int volume = mAudioManager.getStreamVolume(AudioManager.STREAM_RING);
mRingTone.setVolume(volume, volume);

mRingTone.start();
mRingTone = RingtoneManager.getRingtone(this, mRingtoneUri);
mRingTone.play();
} catch (Exception exc) {
Logger.error(TAG, "Error while trying to play ringtone!", exc);
}
Expand All @@ -875,11 +867,6 @@ protected synchronized void stopRingtone() {
if (mRingTone.isPlaying())
mRingTone.stop();
} catch (Exception ignored) { }

try {
mRingTone.reset();
mRingTone.release();
} catch (Exception ignored) { }
}
}

Expand Down