Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fac94751 authored by 2bllw8's avatar 2bllw8 Committed by luca020400
Browse files

Recorder: refactor SoundRecorderService and status management 

Use Messenger objects to communicate with the activity
instead of holding a reference to it.

Change-Id: I282188ca863eead22cf9068d956daf7d9c345aff
parent e11902b0

app/src/main/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
        <!-- Sound recorder -->

        <service

            android:name=".service.SoundRecorderService"

            android:foregroundServiceType="microphone"

            android:exported="false">

            <intent-filter>

                <action android:name="org.lineageos.recorder.service.START" />

app/src/main/java/org/lineageos/recorder/DialogActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import org.lineageos.recorder.utils.PermissionManager; 
import org.lineageos.recorder.utils.Utils;



public class DialogActivity extends AppCompatActivity {

    public static final String EXTRA_IS_RECORDING = "is_recording";



    private PermissionManager mPermissionManager;

    private SwitchCompat mLocationSwitch;
@@ -44,7 +46,7 @@ public class DialogActivity extends AppCompatActivity { 
                .setOnDismissListener(dialogInterface -> finish())

                .show();



        final boolean isRecording = Utils.isRecording(this);

        final boolean isRecording = getIntent().getBooleanExtra(EXTRA_IS_RECORDING, false);



        mLocationSwitch = dialog.findViewById(

                R.id.dialog_content_settings_location_switch);

app/src/main/java/org/lineageos/recorder/RecorderActivity.java

+116 −96
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.ServiceConnection;

import android.content.SharedPreferences;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.os.RemoteException;

import android.telephony.TelephonyManager;

import android.view.View;

import android.widget.ImageView;
@@ -42,8 +44,8 @@ import androidx.constraintlayout.widget.ConstraintLayout; 


import com.google.android.material.floatingactionbutton.FloatingActionButton;



import org.lineageos.recorder.service.RecorderBinder;

import org.lineageos.recorder.service.SoundRecorderService;

import org.lineageos.recorder.status.UiStatus;

import org.lineageos.recorder.task.DeleteRecordingTask;

import org.lineageos.recorder.task.TaskExecutor;

import org.lineageos.recorder.ui.WaveFormView;
@@ -53,12 +55,7 @@ import org.lineageos.recorder.utils.OnBoardingHelper; 
import org.lineageos.recorder.utils.PermissionManager;

import org.lineageos.recorder.utils.Utils;



public class RecorderActivity extends AppCompatActivity implements

        SharedPreferences.OnSharedPreferenceChangeListener {

    private ServiceConnection mConnection;

    private SoundRecorderService mSoundService;

    private SharedPreferences mPrefs;



public class RecorderActivity extends AppCompatActivity {

    private FloatingActionButton mSoundFab;

    private ImageView mPauseResume;
@@ -72,6 +69,9 @@ public class RecorderActivity extends AppCompatActivity implements 
    private boolean mReturnAudio;

    private boolean mHasRecordedAudio;



    @UiStatus

    private int mUiStatus = UiStatus.READY;



    private final BroadcastReceiver mTelephonyReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {
@@ -84,6 +84,50 @@ public class RecorderActivity extends AppCompatActivity implements 
        }

    };



    private final Messenger mMessenger = new Messenger(new Handler(Looper.getMainLooper()) {

        @Override

        public void handleMessage(@NonNull Message msg) {

            switch (msg.what) {

                case SoundRecorderService.MSG_UI_STATUS:

                    setStatus((int) msg.obj);

                    break;

                case SoundRecorderService.MSG_SOUND_AMPLITUDE:

                    setVisualizerAmplitude((int) msg.obj);

                    break;

                default:

                    super.handleMessage(msg);

                    break;

            }

        }

    });



    private final ServiceConnection mConnection = new ServiceConnection() {

        @Override

        public void onServiceConnected(ComponentName name, IBinder service) {

            mService = new Messenger(service);



            try {

                final Message msg = Message.obtain(null,

                        SoundRecorderService.MSG_REGISTER_CLIENT);

                msg.replyTo = mMessenger;

                mService.send(msg);

            } catch (RemoteException e) {

                // In this case the service has crashed before we could even

                // do anything with it; we can count on soon being

                // disconnected (and then reconnected if it can be restarted)

                // so there is no need to do anything here.

            }

        }



        @Override

        public void onServiceDisconnected(ComponentName name) {

            mService = null;

        }

    };



    private Messenger mService;

    private boolean mIsServiceBound;



    @Override

    public void onCreate(@Nullable Bundle savedInstance) {

        super.onCreate(savedInstance);
@@ -106,9 +150,6 @@ public class RecorderActivity extends AppCompatActivity implements 
        Utils.setFullScreen(getWindow(), mainView);

        Utils.setVerticalInsets(mainView);



        mPrefs = getSharedPreferences(Utils.PREFS, 0);

        mPrefs.registerOnSharedPreferenceChangeListener(this);



        mLocationHelper = new LocationHelper(this);

        mPermissionManager = new PermissionManager(this);
@@ -121,7 +162,7 @@ public class RecorderActivity extends AppCompatActivity implements 
            settings.setVisibility(View.GONE);

        }



        bindSoundRecService();

        doBindService();



        OnBoardingHelper.onBoardList(this, soundList);

        OnBoardingHelper.onBoardSettings(this, settings);
@@ -129,10 +170,7 @@ public class RecorderActivity extends AppCompatActivity implements 


    @Override

    public void onDestroy() {

        if (mConnection != null) {

            unbindService(mConnection);

        }

        mPrefs.unregisterOnSharedPreferenceChangeListener(this);

        doUnbindService();

        super.onDestroy();

    }
@@ -145,20 +183,13 @@ public class RecorderActivity extends AppCompatActivity implements 


    @Override

    protected void onStop() {

        super.onStop();

        unregisterReceiver(mTelephonyReceiver);

    }



    @Override

    protected void onResume() {

        super.onResume();

        refresh();

        super.onStop();

    }



    @Override

    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,

                                           @NonNull int[] results) {



        super.onRequestPermissionsResult(requestCode, permissions, results);

        if (requestCode == PermissionManager.REQUEST_CODE) {

            if (mPermissionManager.hasEssentialPermissions()) {
@@ -169,20 +200,20 @@ public class RecorderActivity extends AppCompatActivity implements 
        }

    }



    @Override

    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {

        if (Utils.KEY_RECORDING.equals(key)) {

            refresh();

    private void setStatus(@UiStatus int status) {

        applyUiStatus(status);



        if (mReturnAudio && mHasRecordedAudio) {

            Utils.cancelShareNotification(this);

            promptUser();

        }

    }

    }



    private void setVisualizerAmplitude(int amplitude) {

        mRecordingVisualizer.post(() -> mRecordingVisualizer.setAmplitude(amplitude));

    }



    private void toggleAfterPermissionRequest() {

        bindSoundRecService();

        new Handler(Looper.getMainLooper()).postDelayed(this::toggleSoundRecorder, 500);

    }
@@ -191,50 +222,50 @@ public class RecorderActivity extends AppCompatActivity implements 
            return;

        }



        if (mSoundService == null) {

            bindSoundRecService();

            return;

        }



        if (Utils.isRecording(this)) {

            // Stop

            Intent stopIntent = new Intent(this, SoundRecorderService.class)

                    .setAction(SoundRecorderService.ACTION_STOP);

            startService(stopIntent);

            mHasRecordedAudio = true;

        } else {

        if (mUiStatus == UiStatus.READY) {

            // Start

            Intent startIntent = new Intent(this, SoundRecorderService.class)

            startService(new Intent(this, SoundRecorderService.class)

                    .setAction(SoundRecorderService.ACTION_START)

                    .putExtra(SoundRecorderService.EXTRA_LOCATION,

                            mLocationHelper.getCurrentLocationName());

            startService(startIntent);

                    .putExtra(SoundRecorderService.EXTRA_FILE_NAME,

                            mLocationHelper.getCurrentLocationName()));

        } else {

            // Stop

            startService(new Intent(this, SoundRecorderService.class)

                    .setAction(SoundRecorderService.ACTION_STOP));

            mHasRecordedAudio = true;

        }

    }



    private void togglePause() {

        if (!Utils.isRecording(this)) {

            return;

        }



        if (Utils.isPaused(this)) {

            Intent resumeIntent = new Intent(this, SoundRecorderService.class)

                    .setAction(SoundRecorderService.ACTION_RESUME);

            startService(resumeIntent);

        } else {

            Intent pauseIntent = new Intent(this, SoundRecorderService.class)

                    .setAction(SoundRecorderService.ACTION_PAUSE);

            startService(pauseIntent);

        switch (mUiStatus) {

            case UiStatus.RECORDING:

                startService(new Intent(this, SoundRecorderService.class)

                        .setAction(SoundRecorderService.ACTION_PAUSE));

                break;

            case UiStatus.PAUSED:

                startService(new Intent(this, SoundRecorderService.class)

                        .setAction(SoundRecorderService.ACTION_RESUME));

                break;

            case UiStatus.READY:

                // Do nothing

                break;

        }

    }



    private void refresh() {

        if (Utils.isRecording(this)) {

    private void applyUiStatus(@UiStatus int status) {

        mUiStatus = status;



        if (UiStatus.READY == status) {

            mRecordingText.setText(getString(R.string.main_sound_action));

            mSoundFab.setImageResource(R.drawable.ic_action_record);

            mRecordingVisualizer.setVisibility(View.INVISIBLE);

            mPauseResume.setVisibility(View.GONE);

        } else {

            mSoundFab.setImageResource(R.drawable.ic_action_stop);

            mRecordingVisualizer.setVisibility(View.VISIBLE);

            mRecordingVisualizer.setAmplitude(0);

            mPauseResume.setVisibility(View.VISIBLE);

            if (Utils.isPaused(this)) {

            if (UiStatus.PAUSED == status) {

                mRecordingText.setText(getString(R.string.sound_recording_title_paused));

                mPauseResume.setImageResource(R.drawable.ic_resume);

                mPauseResume.setContentDescription(getString(R.string.resume));
@@ -243,47 +274,36 @@ public class RecorderActivity extends AppCompatActivity implements 
                mPauseResume.setImageResource(R.drawable.ic_pause);

                mPauseResume.setContentDescription(getString(R.string.pause));

            }

            if (mSoundService != null) {

                mSoundService.setAudioListener(mRecordingVisualizer);

            }

        } else {

            mRecordingText.setText(getString(R.string.main_sound_action));

            mSoundFab.setImageResource(R.drawable.ic_action_record);

            mRecordingVisualizer.setVisibility(View.INVISIBLE);

            mPauseResume.setVisibility(View.GONE);

            if (mSoundService != null) {

                mSoundService.setAudioListener(null);

        }

    }

    }



    private void setupConnection() {

        mPermissionManager.requestEssentialPermissions();



        mConnection = new ServiceConnection() {

            @Override

            public void onServiceConnected(ComponentName name, IBinder binder) {

                mSoundService = ((RecorderBinder) binder).getService();

                mSoundService.setAudioListener(mRecordingVisualizer);

    private void doBindService() {

        bindService(new Intent(this, SoundRecorderService.class),

                mConnection, BIND_AUTO_CREATE);

        mIsServiceBound = true;

    }



            @Override

            public void onServiceDisconnected(ComponentName name) {

                mSoundService = null;

    private void doUnbindService() {

        if (mService != null) {

            try {

                final Message msg = Message.obtain(null,

                        SoundRecorderService.MSG_UNREGISTER_CLIENT);

                msg.replyTo = mMessenger;

                mService.send(msg);

            } catch (RemoteException e) {

                // There is nothing special we need to do if the service

                // has crashed.

            }

        };

        }



    private void bindSoundRecService() {

        if (mSoundService == null && mPermissionManager.hasEssentialPermissions()) {

            setupConnection();

            bindService(new Intent(this, SoundRecorderService.class),

                    mConnection, BIND_AUTO_CREATE);

        if (mIsServiceBound) {

            unbindService(mConnection);

            mIsServiceBound = false;

        }

    }



    private void openSettings() {

        Intent intent = new Intent(this, DialogActivity.class);

        Intent intent = new Intent(this, DialogActivity.class)

                .putExtra(DialogActivity.EXTRA_IS_RECORDING, mUiStatus != UiStatus.READY);

        startActivity(intent);

    }