remove stray references to telerivet

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.envaya.sms"
-      android:versionCode="29"
+      android:versionCode="30"
-      android:versionName="3.0.0">
+      android:versionName="3.0.1">
          
     <uses-sdk android:minSdkVersion="4" />
          

res/values/strings.xml

@@ -7,6 +7,7 @@
     <string name="stopped">EnvayaSMS stopped.</string>
     <string name="log_view_title">EnvayaSMS : Log View</string>
     <string name="add_phone_title">EnvayaSMS : Add Phone</string>    
+    <string name="expansion_packs_title">EnvayaSMS : SMS Rate Limit</string>    
     <string name="help_title">EnvayaSMS : Help</string>    
     <string name='test_phone_numbers_title'>EnvayaSMS : Test Phone Numbers</string>
     <string name='ignored_phone_numbers_title'>EnvayaSMS : Ignored Phone Numbers</string>
@@ -21,7 +22,7 @@
     <string name="retry_now">Retry</string>
     <string name="forward_saved">Fwd Saved...</string>
     <string name='service_started'>New messages will be forwarded to server</string>
-    <string name='test_phone_numbers'>When running Telerivet in Test Mode, 
+    <string name='test_phone_numbers'>When running EnvayaSMS in Test Mode, 
 EnvayaSMS will only forward SMS messages from the phone numbers 
 listed below. (Incoming SMS messages from other phone numbers will be saved 
 in the normal Messaging inbox.)</string>

res/xml/prefs.xml

@@ -54,8 +54,8 @@
     <CheckBoxPreference
             android:key="call_notifications"
             android:title="Call notifications"
-            android:summaryOff="Telerivet will not notify server when phone receives an incoming call"
+            android:summaryOff="EnvayaSMS will not notify server when phone receives an incoming call"
-            android:summaryOn="Telerivet will notify server when phone receives an incoming call"
+            android:summaryOn="EnvayaSMS will notify server when phone receives an incoming call"
     ></CheckBoxPreference>    
         
     <PreferenceScreen 

src/org/envaya/sms/AmqpConsumer.java

@@ -231,7 +231,7 @@ public class AmqpConsumer {
         {                
             if (wifiLock == null)
             {
-                wifiLock = wifiManager.createWifiLock(WIFI_MODE_FULL_HIGH_PERF, "telerivet-amqp");        
+                wifiLock = wifiManager.createWifiLock(WIFI_MODE_FULL_HIGH_PERF, "amqp-consumer");        
                 wifiLock.setReferenceCounted(false);
             }
             

src/org/envaya/sms/ui/ExpansionPacks.java

@@ -52,7 +52,7 @@ public class ExpansionPacks extends PreferenceActivity  {
         
         String basePackageName = app.getPackageName();
         
-        this.setTitle("Telerivet : SMS Rate Limit ("+app.getOutgoingMessageLimit()+")");
+        this.setTitle(getText(R.string.expansion_packs_title)+" ("+app.getOutgoingMessageLimit()+")");
         
         for(int i=0; i < numPrefs;i++)
         {

src/org/envaya/sms/ui/LogView.java

@@ -146,11 +146,7 @@ public class LogView extends Activity {
 
         if (savedInstanceState == null)
         {
-            if (getIntent().getBooleanExtra("configured", false))
+            if (app.isUpgradeAvailable())
-            {
-                showConfigureSuccessDialog();
-            }
-            else if (app.isUpgradeAvailable())
             {
                 showUpgradeDialog();         
             }
@@ -161,17 +157,13 @@ public class LogView extends Activity {
             if (curDialog == UPGRADE_DIALOG)
             {
                 showUpgradeDialog();                
-            }
+            }            
-            else if (curDialog == CONFIGURE_SUCCESS_DIALOG)
-            {
-                showConfigureSuccessDialog();
-            }
             else if (curDialog == SETTINGS_DIALOG)
             {
                 showSettingsDialog();
             }
         }
-    }    
+    }
 
     public static final int NO_DIALOG = 0;
     public static final int UPGRADE_DIALOG = 1;
@@ -234,25 +226,7 @@ public class LogView extends Activity {
             .setOnCancelListener(new DismissDialogListener())
             .setCancelable(true)
             .show();
-    }
+    }    
-    
-    public void showConfigureSuccessDialog()
-    {
-        curDialog = CONFIGURE_SUCCESS_DIALOG;
-        
-        new AlertDialog.Builder(this)
-            .setTitle("App configured successfully!")
-            .setMessage("Now try using another mobile phone to send a SMS to this phone.\n\nYou should be able to see the message on your Messages page on telerivet.com, and send replies.")
-            .setPositiveButton("OK", new OnClickListener() {
-                public void onClick(DialogInterface dialog, int i)
-                {
-                    showSettingsDialog();
-                }
-            })                
-            .setOnCancelListener(new DismissDialogListener())
-            .setCancelable(true)
-            .show();        
-    }
     
     public String getSettingsSummary()
     {