changes in preparation for shipping 2.0

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  android:versionCode="117"
-    	  android:versionName="1.1.7" package="com.nyaruka.androidrelay">
+	  android:versionCode="120"
+    	  android:versionName="1.2.0" package="com.nyaruka.androidrelay">
 
   <uses-permission android:name="android.permission.RECEIVE_SMS" />
   <uses-permission android:name="android.permission.SEND_SMS" />

res/xml/preferences.xml

@@ -15,7 +15,7 @@
 
 	    <EditTextPreference
             android:dialogTitle="Relay Password" android:maxLength="7" android:dialogMessage="Make your own password, will be used as a keyword" android:defaultValue="nyaruka"
-            android:summary="The password setup here will be used as a keyword while changing your preferences throught SMS command" android:title="Relay Password" android:key="relay_password"/>
+            android:summary="This password will be used to validate administrative SMS commands" android:title="Relay Password" android:key="relay_password"/>
 
 		<ListPreference 
             android:key="pref_net"

src/com/nyaruka/android/actionbarcompat/ActionBarHelperBase.java

@@ -16,15 +16,16 @@
 
 package com.nyaruka.android.actionbarcompat;
 
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import com.nyaruka.androidrelay.R;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.InflateException;
 import android.view.Menu;
@@ -37,12 +38,9 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
+import com.nyaruka.androidrelay.R;
 
 /**
  * A class that implements the action bar pattern for pre-Honeycomb devices.
@@ -85,8 +83,7 @@ public void onPostCreate(Bundle savedInstanceState) {
     /**
      * Sets up the compatibility action bar with the given title.
      */
-    @SuppressWarnings("deprecation")
-	private void setupActionBar() {
+    private void setupActionBar() {
         final ViewGroup actionBarCompat = getActionBarCompat();
         if (actionBarCompat == null) {
             return;
@@ -172,8 +169,7 @@ private ViewGroup getActionBarCompat() {
      * state can be changed to show a loading spinner using
      * {@link com.nyaruka.android.actionbarcompat.ActionBarHelperBase#setRefreshActionItemState(boolean)}.
      */
-    @SuppressWarnings("deprecation")
-	private View addActionItemCompatFromMenuItem(final MenuItem item) {
+    private View addActionItemCompatFromMenuItem(final MenuItem item) {
         final int itemId = item.getItemId();
 
         final ViewGroup actionBar = getActionBarCompat();

src/com/nyaruka/androidrelay/MainActivity.java

@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;

src/com/nyaruka/androidrelay/RelayService.java

@@ -20,10 +20,6 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import com.commonsware.cwac.wakeful.WakefulIntentService;
-import com.nyaruka.androidrelay.data.TextMessage;
-import com.nyaruka.androidrelay.data.TextMessageHelper;
-
 import android.app.Service;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -33,8 +29,6 @@
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.SQLException;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.BatteryManager;
@@ -44,6 +38,10 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.commonsware.cwac.wakeful.WakefulIntentService;
+import com.nyaruka.androidrelay.data.TextMessage;
+import com.nyaruka.androidrelay.data.TextMessageHelper;
+
 public class RelayService extends Service implements SMSModem.SmsModemListener {
 
 	public static final String TAG = AndroidRelay.TAG;
@@ -312,7 +310,7 @@ public static boolean sendAlert(Context context, String subject, String body){
 				Log.e(MainActivity.TAG, "Sending log to: " + post.getURI().toURL().toString());
 
 				ResponseHandler<String> responseHandler = new BasicResponseHandler();
-				String content = client.execute(post, responseHandler);
+				client.execute(post, responseHandler);
 				return true;
 			} catch (Throwable t){
 				Log.e(MainActivity.TAG, "Sending of alert failed", t);
@@ -552,7 +550,7 @@ public void markMessageDelivered(TextMessage msg) throws IOException {
 			Log.d(TAG, "Sending: "+ url);
 
 			try {
-				String content = fetchURL(url);
+				fetchURL(url);
 				msg.status = TextMessage.DONE;
 				msg.error = null;
 				Log.d(TAG, "Msg " + msg.serverId + " marked as delivered.");
@@ -687,7 +685,7 @@ public void onNewSMS(String number, String message) {
 		}
 
 		if(message.equalsIgnoreCase(keyword + " clear")){
-			Log.d(TAG, "Clearing all messages will erase all messages");
+			Log.d(TAG, "Clearing all messages");
 			AndroidRelay.clearMessages(RelayService.this);
             Toast.makeText(RelayService.this, "Messages cleared", Toast.LENGTH_LONG).show();
 

src/com/nyaruka/log/LogCollector.java

@@ -1,7 +1,6 @@
 package com.nyaruka.log;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;