From f2007e16933dd88d4b7004c5b6c8946c45cd236d Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Fri, 1 Jan 2016 01:20:26 -0500 Subject: [PATCH] Change variables which never should change to 'final' --- src/protect/babymonitor/DiscoverActivity.java | 6 ++--- src/protect/babymonitor/ListenActivity.java | 18 +++++++-------- src/protect/babymonitor/MonitorActivity.java | 22 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/protect/babymonitor/DiscoverActivity.java b/src/protect/babymonitor/DiscoverActivity.java index 3abfff3..3bef35b 100644 --- a/src/protect/babymonitor/DiscoverActivity.java +++ b/src/protect/babymonitor/DiscoverActivity.java @@ -82,9 +82,9 @@ public class DiscoverActivity extends Activity public void onItemClick(AdapterView parent, View view, int position, long id) { - ServiceInfoWrapper info = (ServiceInfoWrapper) parent.getItemAtPosition(position); - Intent i = new Intent(getApplicationContext(), ListenActivity.class); - Bundle b = new Bundle(); + final ServiceInfoWrapper info = (ServiceInfoWrapper) parent.getItemAtPosition(position); + final Intent i = new Intent(getApplicationContext(), ListenActivity.class); + final Bundle b = new Bundle(); b.putString("address", info.getAddress()); b.putInt("port", info.getPort()); b.putString("name", info.getName()); diff --git a/src/protect/babymonitor/ListenActivity.java b/src/protect/babymonitor/ListenActivity.java index 7e45868..95d9b70 100644 --- a/src/protect/babymonitor/ListenActivity.java +++ b/src/protect/babymonitor/ListenActivity.java @@ -39,14 +39,14 @@ public class ListenActivity extends Activity String _name; Thread _listenThread; - private void streamAudio(Socket socket) throws IllegalArgumentException, IllegalStateException, IOException + private void streamAudio(final Socket socket) throws IllegalArgumentException, IllegalStateException, IOException { Log.i(TAG, "Setting up stream"); - int frequency = 11025; - int channelConfiguration = AudioFormat.CHANNEL_OUT_MONO; - int audioEncoding = AudioFormat.ENCODING_PCM_16BIT; - int bufferSize = AudioTrack.getMinBufferSize(frequency, channelConfiguration, audioEncoding); + final int frequency = 11025; + final int channelConfiguration = AudioFormat.CHANNEL_OUT_MONO; + final int audioEncoding = AudioFormat.ENCODING_PCM_16BIT; + final int bufferSize = AudioTrack.getMinBufferSize(frequency, channelConfiguration, audioEncoding); final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, frequency, @@ -57,14 +57,14 @@ public class ListenActivity extends Activity setVolumeControlStream(AudioManager.STREAM_MUSIC); - InputStream is = socket.getInputStream(); + final InputStream is = socket.getInputStream(); int read = 0; audioTrack.play(); try { - byte [] buffer = new byte[bufferSize*2]; + final byte [] buffer = new byte[bufferSize*2]; while(socket.isConnected() && read != -1 && Thread.currentThread().isInterrupted() == false) { @@ -88,7 +88,7 @@ public class ListenActivity extends Activity { super.onCreate(savedInstanceState); - Bundle b = getIntent().getExtras(); + final Bundle b = getIntent().getExtras(); _address = b.getString("address"); _port = b.getInt("port"); _name = b.getString("name"); @@ -115,7 +115,7 @@ public class ListenActivity extends Activity { try { - Socket socket = new Socket(_address, _port); + final Socket socket = new Socket(_address, _port); streamAudio(socket); } catch (UnknownHostException e) diff --git a/src/protect/babymonitor/MonitorActivity.java b/src/protect/babymonitor/MonitorActivity.java index eee9adf..45a1875 100644 --- a/src/protect/babymonitor/MonitorActivity.java +++ b/src/protect/babymonitor/MonitorActivity.java @@ -56,30 +56,30 @@ public class MonitorActivity extends Activity } }); - int frequency = 11025; - int channelConfiguration = AudioFormat.CHANNEL_IN_MONO; - int audioEncoding = AudioFormat.ENCODING_PCM_16BIT; + final int frequency = 11025; + final int channelConfiguration = AudioFormat.CHANNEL_IN_MONO; + final int audioEncoding = AudioFormat.ENCODING_PCM_16BIT; - int bufferSize = AudioRecord.getMinBufferSize(frequency, channelConfiguration, audioEncoding); - AudioRecord audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, + final int bufferSize = AudioRecord.getMinBufferSize(frequency, channelConfiguration, audioEncoding); + final AudioRecord audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, frequency, channelConfiguration, audioEncoding, bufferSize); final int byteBufferSize = bufferSize*2; - byte[] buffer = new byte[bufferSize*2]; + final byte[] buffer = new byte[bufferSize*2]; try { audioRecord.startRecording(); - OutputStream out = socket.getOutputStream(); + final OutputStream out = socket.getOutputStream(); socket.setSendBufferSize(byteBufferSize); Log.d(TAG, "Socket send buffer size: " + socket.getSendBufferSize()); while (socket.isConnected() && Thread.currentThread().isInterrupted() == false) { - int read = audioRecord.read(buffer, 0, bufferSize); + final int read = audioRecord.read(buffer, 0, bufferSize); out.write(buffer, 0, read); } } @@ -114,7 +114,7 @@ public class MonitorActivity extends Activity serverSocket = new ServerSocket(0); // Store the chosen port. - int localPort = serverSocket.getLocalPort(); + final int localPort = serverSocket.getLocalPort(); // Register the service so that parent devices can // locate the child device @@ -202,9 +202,9 @@ public class MonitorActivity extends Activity return super.onOptionsItemSelected(item); } - private void registerService(int port) + private void registerService(final int port) { - NsdServiceInfo serviceInfo = new NsdServiceInfo(); + final NsdServiceInfo serviceInfo = new NsdServiceInfo(); serviceInfo.setServiceName("ProtectBabyMonitor"); serviceInfo.setServiceType("_babymonitor._tcp."); serviceInfo.setPort(port);