X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=17084863d4784633d96565eeb479caa460eca376;hb=7aab6e6b6e361455a7515fe6db7b0e9a6e4c786c;hp=b4a3227cde7664d4e4b8d1a99f1c9edf84ec8352;hpb=392c878000e9909d37dae6342df3d6cb8f217a1b;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b4a3227c..17084863 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -1,17 +1,18 @@ /* - * Copyright (C) 2009 The Android Open Source Project + * Copyright © 2012 Mike Beattie * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ package org.altusmetrum.AltosDroid; @@ -23,6 +24,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.text.method.ScrollingMovementMethod; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; @@ -32,10 +34,8 @@ import android.view.View; import android.view.Window; import android.view.View.OnClickListener; import android.view.inputmethod.EditorInfo; -import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; -import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; import org.altusmetrum.AltosDroid.R; @@ -45,11 +45,9 @@ import org.altusmetrum.AltosLib.*; * This is the main Activity that displays the current chat session. */ public class AltosDroid extends Activity { - // Debugging - private static final String TAG = "BluetoothChat"; - private static final boolean D = true; - - private static final AltosLine q = new AltosLine(); + // Debugging + private static final String TAG = "AltosDroid"; + private static final boolean D = true; // Message types sent from the BluetoothChatService Handler public static final int MESSAGE_STATE_CHANGE = 1; @@ -62,79 +60,72 @@ public class AltosDroid extends Activity { public static final String DEVICE_NAME = "device_name"; public static final String TOAST = "toast"; - // Intent request codes - private static final int REQUEST_CONNECT_DEVICE_SECURE = 1; - private static final int REQUEST_CONNECT_DEVICE_INSECURE = 2; - private static final int REQUEST_ENABLE_BT = 3; - // Layout Views - private TextView mTitle; - private ListView mConversationView; private EditText mOutEditText; private Button mSendButton; - // Name of the connected device - private String mConnectedDeviceName = null; - // Array adapter for the conversation thread - private ArrayAdapter mConversationArrayAdapter; // String buffer for outgoing messages private StringBuffer mOutStringBuffer; - // Local Bluetooth adapter - private BluetoothAdapter mBluetoothAdapter = null; // Member object for the chat services private BluetoothChatService mChatService = null; - + // Intent request codes + private static final int REQUEST_CONNECT_DEVICE = 1; + private static final int REQUEST_ENABLE_BT = 2; + + // Layout Views + private TextView mTitle; + private TextView mSerialView; + // Name of the connected device + private String mConnectedDeviceName = null; + // Local Bluetooth adapter + private BluetoothAdapter mBluetoothAdapter = null; @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if(D) Log.e(TAG, "+++ ON CREATE +++"); - - // Set up the window layout - requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); - setContentView(R.layout.main); - getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title); + super.onCreate(savedInstanceState); + if(D) Log.e(TAG, "+++ ON CREATE +++"); - // Set up the custom title - mTitle = (TextView) findViewById(R.id.title_left_text); - mTitle.setText(R.string.app_name); - mTitle = (TextView) findViewById(R.id.title_right_text); + // Set up the window layout + requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); + setContentView(R.layout.main); + getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title); // Get local Bluetooth adapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + // Set up the custom title + mTitle = (TextView) findViewById(R.id.title_left_text); + mTitle.setText(R.string.app_name); + mTitle = (TextView) findViewById(R.id.title_right_text); // If the adapter is null, then Bluetooth is not supported - if (mBluetoothAdapter == null) { - Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show(); - finish(); - return; - } + if (mBluetoothAdapter == null) { + Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show(); + finish(); + return; + } } @Override public void onStart() { - super.onStart(); - if(D) Log.e(TAG, "++ ON START ++"); - - // If BT is not on, request that it be enabled. - // setupChat() will then be called during onActivityResult - if (!mBluetoothAdapter.isEnabled()) { - Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); - startActivityForResult(enableIntent, REQUEST_ENABLE_BT); - // Otherwise, setup the chat session - } else { + super.onStart(); + if(D) Log.e(TAG, "++ ON START ++"); + + if (!mBluetoothAdapter.isEnabled()) { + Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE); + startActivityForResult(enableIntent, REQUEST_ENABLE_BT); + } else { if (mChatService == null) setupChat(); - } + } } @Override public synchronized void onResume() { - super.onResume(); - if(D) Log.e(TAG, "+ ON RESUME +"); + super.onResume(); + if(D) Log.e(TAG, "+ ON RESUME +"); - // Performing this check in onResume() covers the case in which BT was - // not enabled during onStart(), so we were paused to enable it... - // onResume() will be called when ACTION_REQUEST_ENABLE activity returns. + // Performing this check in onResume() covers the case in which BT was + // not enabled during onStart(), so we were paused to enable it... + // onResume() will be called when ACTION_REQUEST_ENABLE activity returns. if (mChatService != null) { // Only if the state is STATE_NONE, do we know that we haven't started already if (mChatService.getState() == BluetoothChatService.STATE_NONE) { @@ -144,99 +135,93 @@ public class AltosDroid extends Activity { } } - private void setupChat() { - Log.d(TAG, "setupChat()"); - - // Initialize the array adapter for the conversation thread - mConversationArrayAdapter = new ArrayAdapter(this, R.layout.message); - mConversationView = (ListView) findViewById(R.id.in); - mConversationView.setAdapter(mConversationArrayAdapter); - - // Initialize the compose field with a listener for the return key - mOutEditText = (EditText) findViewById(R.id.edit_text_out); - mOutEditText.setOnEditorActionListener(mWriteListener); - - // Initialize the send button with a listener that for click events - mSendButton = (Button) findViewById(R.id.button_send); - mSendButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - // Send a message using content of the edit text widget - TextView view = (TextView) findViewById(R.id.edit_text_out); - String message = view.getText().toString(); - sendMessage(message); - } - }); - - // Initialize the BluetoothChatService to perform bluetooth connections - mChatService = new BluetoothChatService(this, mHandler); - - // Initialize the buffer for outgoing messages - mOutStringBuffer = new StringBuffer(""); - } - @Override public synchronized void onPause() { - super.onPause(); - if(D) Log.e(TAG, "- ON PAUSE -"); + super.onPause(); + if(D) Log.e(TAG, "- ON PAUSE -"); } @Override public void onStop() { - super.onStop(); - if(D) Log.e(TAG, "-- ON STOP --"); + super.onStop(); + if(D) Log.e(TAG, "-- ON STOP --"); } @Override public void onDestroy() { - super.onDestroy(); + super.onDestroy(); // Stop the Bluetooth chat services if (mChatService != null) mChatService.stop(); - if(D) Log.e(TAG, "--- ON DESTROY ---"); + if(D) Log.e(TAG, "--- ON DESTROY ---"); } - private void ensureDiscoverable() { - if(D) Log.d(TAG, "ensure discoverable"); - if (mBluetoothAdapter.getScanMode() != - BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) { - Intent discoverableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE); - discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 300); - startActivity(discoverableIntent); - } + + + private void setupChat() { + Log.d(TAG, "setupChat()"); + + mSerialView = (TextView) findViewById(R.id.in); + mSerialView.setMovementMethod(new ScrollingMovementMethod()); + mSerialView.setClickable(false); + mSerialView.setLongClickable(false); + + // Initialize the compose field with a listener for the return key + mOutEditText = (EditText) findViewById(R.id.edit_text_out); + mOutEditText.setOnEditorActionListener(mWriteListener); + + // Initialize the send button with a listener that for click events + mSendButton = (Button) findViewById(R.id.button_send); + mSendButton.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + // Send a message using content of the edit text widget + TextView view = (TextView) findViewById(R.id.edit_text_out); + String message = view.getText().toString(); + sendMessage(message); + } + }); + + // Initialize the BluetoothChatService to perform bluetooth connections + mChatService = new BluetoothChatService(this, mHandler); + + // Initialize the buffer for outgoing messages + mOutStringBuffer = new StringBuffer(""); } /** - * Sends a message. - * @param message A string of text to send. - */ + * Sends a message. + * @param message A string of text to send. + */ + /* private void sendMessage(String message) { - // Check that we're actually connected before trying anything - if (mChatService.getState() != BluetoothChatService.STATE_CONNECTED) { - Toast.makeText(this, R.string.not_connected, Toast.LENGTH_SHORT).show(); - return; - } + // Check that we're actually connected before trying anything + if (mChatService.getState() != BluetoothChatService.STATE_CONNECTED) { + Toast.makeText(this, R.string.not_connected, Toast.LENGTH_SHORT).show(); + return; + } - // Check that there's actually something to send - if (message.length() > 0) { - // Get the message bytes and tell the BluetoothChatService to write - byte[] send = message.getBytes(); - mChatService.write(send); + // Check that there's actually something to send + if (message.length() > 0) { + // Get the message bytes and tell the BluetoothChatService to write + byte[] send = message.getBytes(); + mChatService.write(send); + + // Reset out string buffer to zero and clear the edit text field + mOutStringBuffer.setLength(0); + mOutEditText.setText(mOutStringBuffer); + } + } - // Reset out string buffer to zero and clear the edit text field - mOutStringBuffer.setLength(0); - mOutEditText.setText(mOutStringBuffer); - } - } // The action listener for the EditText widget, to listen for the return key private TextView.OnEditorActionListener mWriteListener = - new TextView.OnEditorActionListener() { - public boolean onEditorAction(TextView view, int actionId, KeyEvent event) { - // If the action is a key-up event on the return key, send the message - if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_UP) { - String message = view.getText().toString(); - sendMessage(message); - } - if(D) Log.i(TAG, "END onEditorAction"); + new TextView.OnEditorActionListener() { + public boolean onEditorAction(TextView view, int actionId, KeyEvent event) { + // If the action is a key-up event on the return key, send the message + if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_UP) { + String message = view.getText().toString(); + sendMessage(message); + } + if(D) Log.i(TAG, "END onEditorAction"); return true; } }; @@ -252,7 +237,7 @@ public class AltosDroid extends Activity { case BluetoothChatService.STATE_CONNECTED: mTitle.setText(R.string.title_connected_to); mTitle.append(mConnectedDeviceName); - mConversationArrayAdapter.clear(); + mSerialView.setText(""); break; case BluetoothChatService.STATE_CONNECTING: mTitle.setText(R.string.title_connecting); @@ -267,13 +252,13 @@ public class AltosDroid extends Activity { byte[] writeBuf = (byte[]) msg.obj; // construct a string from the buffer String writeMessage = new String(writeBuf); - mConversationArrayAdapter.add("Me: " + writeMessage); + mSerialView.append(writeMessage + '\n'); break; case MESSAGE_READ: byte[] readBuf = (byte[]) msg.obj; // construct a string from the valid bytes in the buffer String readMessage = new String(readBuf, 0, msg.arg1); - mConversationArrayAdapter.add(mConnectedDeviceName+": " + readMessage); + mSerialView.append(readMessage); break; case MESSAGE_DEVICE_NAME: // save the connected device's name @@ -290,55 +275,49 @@ public class AltosDroid extends Activity { }; public void onActivityResult(int requestCode, int resultCode, Intent data) { - if(D) Log.d(TAG, "onActivityResult " + resultCode); - switch (requestCode) { - case REQUEST_CONNECT_DEVICE_SECURE: - // When DeviceListActivity returns with a device to connect - if (resultCode == Activity.RESULT_OK) { - connectDevice(data, true); - } - break; - case REQUEST_CONNECT_DEVICE_INSECURE: - // When DeviceListActivity returns with a device to connect - if (resultCode == Activity.RESULT_OK) { - connectDevice(data, false); - } - break; - case REQUEST_ENABLE_BT: - // When the request to enable Bluetooth returns - if (resultCode == Activity.RESULT_OK) { - // Bluetooth is now enabled, so set up a chat session + if(D) Log.d(TAG, "onActivityResult " + resultCode); + switch (requestCode) { + case REQUEST_CONNECT_DEVICE: + // When DeviceListActivity returns with a device to connect to + if (resultCode == Activity.RESULT_OK) { + connectDevice(data); + } + break; + case REQUEST_ENABLE_BT: + // When the request to enable Bluetooth returns + if (resultCode == Activity.RESULT_OK) { + // Bluetooth is now enabled, so set up a chat session setupChat(); - } else { - // User did not enable Bluetooth or an error occured - Log.d(TAG, "BT not enabled"); - Toast.makeText(this, R.string.bt_not_enabled_leaving, Toast.LENGTH_SHORT).show(); - finish(); - } - } + } else { + // User did not enable Bluetooth or an error occured + Log.d(TAG, "BT not enabled"); + stopService(new Intent(AltosDroid.this, TelemetryService.class)); + Toast.makeText(this, R.string.bt_not_enabled_leaving, Toast.LENGTH_SHORT).show(); + finish(); + } + } } - private void connectDevice(Intent data, boolean secure) { - // Get the device MAC address - String address = data.getExtras() - .getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS); - // Get the BLuetoothDevice object - BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address); - // Attempt to connect to the device - mChatService.connect(device, secure); + private void connectDevice(Intent data) { + // Get the device MAC address + String address = data.getExtras().getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS); + // Get the BLuetoothDevice object + BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address); + // Attempt to connect to the device + mChatService.connect(device); } @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.option_menu, menu); - return true; + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.option_menu, menu); + return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { - Intent serverIntent = null; - switch (item.getItemId()) { + Intent serverIntent = null; + switch (item.getItemId()) { case R.id.telemetry_service_control: serverIntent = new Intent(this, TelemetryServiceActivities.Controller.class); startActivity(serverIntent); @@ -347,22 +326,13 @@ public class AltosDroid extends Activity { serverIntent = new Intent(this, TelemetryServiceActivities.Binding.class); startActivity(serverIntent); return true; - case R.id.secure_connect_scan: - // Launch the DeviceListActivity to see devices and do scan - serverIntent = new Intent(this, DeviceListActivity.class); - startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE_SECURE); - return true; - case R.id.insecure_connect_scan: - // Launch the DeviceListActivity to see devices and do scan - serverIntent = new Intent(this, DeviceListActivity.class); - startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE_INSECURE); - return true; - case R.id.discoverable: - // Ensure this device is discoverable by others - ensureDiscoverable(); - return true; - } - return false; + case R.id.connect_scan: + // Launch the DeviceListActivity to see devices and do scan + serverIntent = new Intent(this, DeviceListActivity.class); + startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE); + return true; + } + return false; } }