Changeset 136

Timestamp:

02/19/09 11:03:17 (17 months ago)

Author:

dmyung

Message:

overdue checkin of the global settings and ack back override settings

Location:

trunk/rapidandroid/org.rapidandroid

Files:

• AndroidManifest.xml (modified) (1 diff)
• res/layout/global_settings.xml (modified) (3 diffs)
• res/values/strings.xml (modified) (1 diff)
• src/org/rapidandroid/ApplicationGlobals.java (modified) (5 diffs)
• src/org/rapidandroid/activity/FormReviewer.java (modified) (1 diff)
• src/org/rapidandroid/activity/GlobalSettings.java (modified) (6 diffs)
• src/org/rapidandroid/receiver/SmsParseReceiver.java (modified) (4 diffs)
• src/org/rapidandroid/receiver/SmsReceiver.java (modified) (1 diff)

trunk/rapidandroid/org.rapidandroid/AndroidManifest.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.rapidandroid" android:versionName="0.5.0" android:versionCode="97">
+        package="org.rapidandroid" android:versionName="0.5.1" android:versionCode="98">
 
 

trunk/rapidandroid/org.rapidandroid/res/layout/global_settings.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none">
+
 <LinearLayout
 android:id="@+id/widget48"
@@ -6 +11 @@
 android:orientation="vertical"
 xmlns:android="http://schemas.android.com/apk/res/android"
->
+android:scrollbars="vertical">
 <TextView android:id="@+id/TextView02" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/glbsettings_heading" style="?android:attr/listSeparatorTextViewStyle">
-</TextView>
+</TextView><CheckBox android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/glb_chk_activeall" android:text="@string/glb_lbl_activeall"></CheckBox>
 
 <CheckBox
@@ -32 +37 @@
 
 <EditText android:layout_height="wrap_content" android:layout_width="fill_parent" android:id="@+id/glb_etx_failed"></EditText>
+
+
+
 </LinearLayout>
+
+</ScrollView>

trunk/rapidandroid/org.rapidandroid/res/values/strings.xml

@@ -53 +53 @@
 <string name="glb_chk_parse_text">Reply on successful parses</string>
 <string name="glbsettings_heading">Global reply settings</string>
+<string name="glb_lbl_activeall">Activate all SMS features</string>
 </resources>

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/ApplicationGlobals.java

@@ -22 +22 @@
 public class ApplicationGlobals {
 
+        private static boolean globalsLoaded = false;
+        
+        private static boolean mActive = false; 
+        private static boolean mReplyParse = false;
+        private static boolean mReplyFail = false;
+        
+        private static String mReplyParseText = "";
+        private static String mReplyFailText = "";
+        
+        
+        public static void initGlobals(Context context) {
+                if(!globalsLoaded) {
+                        JSONObject globals = ApplicationGlobals.loadSettingsFromFile(context);
+                        try {
+                                
+                                if(globals.has(KEY_ACTIVE_ALL)) {
+                                        mActive = globals.getBoolean(KEY_ACTIVE_ALL);
+                                        
+                                } else {
+                                        mActive = false;
+                                }
+                                mReplyParse = globals.getBoolean(KEY_PARSE_REPLY);
+                                mReplyFail = globals.getBoolean(KEY_FAILED_REPLY);
+                                mReplyParseText = globals.getString(KEY_PARSE_REPLY_TEXT);
+                                mReplyFailText = globals.getString(KEY_FAILED_REPLY_TEXT);
+                                globalsLoaded = true;
+                        } catch (JSONException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                        
+                }
+        }
+        
+        public static boolean doReplyOnFail() {
+                if(mActive) {
+                        return mReplyFail;
+                } else {
+                        return false;
+                }
+        }
+        
+        public static boolean doReplyOnParse() {
+                if(mActive) {
+                        return mReplyParse;
+                } else {
+                        return false;
+                }
+        }
+        
+        public static String getParseSuccessText() {
+                return mReplyParseText;
+        }
+        
+        public static String getParseFailText() {
+                return mReplyFailText;
+        }
+        
         
         public static void checkGlobals(Context context) {              
@@ -32 +90 @@
                                 e.printStackTrace();
                         }
-                        saveGlobalSettings(context, true, "Message parsed successfully, thank you", true, "Unable to understand your message, please try again");
-                }
-        }
+                        saveGlobalSettings(context, false, false, "Message parsed successfully, thank you", false, "Unable to understand your message, please try again");
+                        
+                }
+        }
+        
+        /**
+         * 
+         */
+        public static final String KEY_ACTIVE_ALL = "ActivateAll";
+        
         
         /**
@@ -81 +146 @@
                         String contents = new String(data);
                         readobject = new JSONObject(contents);
+                        
+                        if(!readobject.has(KEY_ACTIVE_ALL)) {
+                                //dmyung hack to keep compatability with new version
+                                readobject.put(KEY_ACTIVE_ALL, false);
+                        }
+                        
 //                      mParseCheckbox.setChecked(readobject.getBoolean(KEY_PARSE_REPLY));
 //                      mParseReplyText.setText(readobject.getString(KEY_PARSE_REPLY_TEXT));
@@ -114 +185 @@
          * 
          */
-        public static void saveGlobalSettings(Context context, boolean parseReply, String parseReplyText, boolean failedReply, String failedReplyText) {                
+        public static void saveGlobalSettings(Context context,boolean activateAll, boolean parseReply, String parseReplyText, boolean failedReply, String failedReplyText) {            
                 JSONObject settingsObj = new JSONObject();
                 FileOutputStream fos = null;
                 try {
+                        settingsObj.put(KEY_ACTIVE_ALL, activateAll);
                         settingsObj.put(KEY_PARSE_REPLY, parseReply);
                         settingsObj.put(KEY_PARSE_REPLY_TEXT, parseReplyText);
@@ -147 +219 @@
                                 }
                         }
-                        SmsParseReceiver.initGlobals(context);
+                        globalsLoaded = false;
+                        ApplicationGlobals.initGlobals(context);
                 }
         }

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/FormReviewer.java

@@ -444 +444 @@
                         messageValues.put(RapidSmsDBConstants.Message.MONITOR, monitor.getID());
 
-                        messageValues.put(RapidSmsDBConstants.Message.TIME, Message.SQLDateFormatter.format(getRandomDate()));
+                        messageValues.put(RapidSmsDBConstants.Message.TIME, Message.SQLDateFormatter.format(dateval));
                         messageValues.put(RapidSmsDBConstants.Message.RECEIVE_TIME, Message.SQLDateFormatter.format(dateval));
                         messageValues.put(RapidSmsDBConstants.Message.IS_OUTGOING, false);

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/GlobalSettings.java

@@ -43 +43 @@
         private static final int MENU_DONE = Menu.FIRST;
         
+        private CheckBox mActiveSwitch;
         private CheckBox mParseCheckbox;
         private EditText mParseReplyText;
@@ -52 +53 @@
 
                 public void onClick(View v) {
-                        if (v.equals(mParseCheckbox)) {
-                                mParseReplyText.setEnabled(mParseCheckbox.isChecked());
-                        } else if (v.equals(mNoparseCheckBox)) {
-                                mNoparseReplyText.setEnabled(mNoparseCheckBox.isChecked());
+                        if(v.equals(mActiveSwitch)) {
+                                mParseReplyText.setEnabled(mActiveSwitch.isChecked());
+                                mNoparseReplyText.setEnabled(mActiveSwitch.isChecked());
+                                
+                                mParseCheckbox.setEnabled(mActiveSwitch.isChecked());
+                                mNoparseCheckBox.setEnabled(mActiveSwitch.isChecked());
                         }
+                        
+                        if (mActiveSwitch.isChecked()) {
+                                if (v.equals(mParseCheckbox)) {
+                                        mParseReplyText.setEnabled(mParseCheckbox.isChecked());
+                                } else if (v.equals(mNoparseCheckBox)) {
+                                        mNoparseReplyText.setEnabled(mNoparseCheckBox.isChecked());
+                                }
+                        } 
                 }
         };
@@ -73 +84 @@
                 setContentView(R.layout.global_settings);
 
+                
+                mActiveSwitch = (CheckBox) findViewById(R.id.glb_chk_activeall);
+                mActiveSwitch.setOnClickListener(mCheckChangeListener);
+                
                 mParseCheckbox = (CheckBox) findViewById(R.id.glb_chk_parse);
                 mParseCheckbox.setOnClickListener(mCheckChangeListener);
@@ -82 +97 @@
                 
                 loadSettingsFromGlobals();
+                
+                mParseReplyText.setEnabled(mActiveSwitch.isChecked());
+                mNoparseReplyText.setEnabled(mActiveSwitch.isChecked());
+                
+                mParseCheckbox.setEnabled(mActiveSwitch.isChecked());
+                mNoparseCheckBox.setEnabled(mActiveSwitch.isChecked());
         }
 
@@ -91 +112 @@
                 JSONObject globals = ApplicationGlobals.loadSettingsFromFile(this);
                 try {
+                        mActiveSwitch.setChecked(globals.getBoolean(ApplicationGlobals.KEY_ACTIVE_ALL));                        
                         mParseCheckbox.setChecked(globals.getBoolean(ApplicationGlobals.KEY_PARSE_REPLY));
                         mParseReplyText.setText(globals.getString(ApplicationGlobals.KEY_PARSE_REPLY_TEXT));
@@ -137 +159 @@
         protected void onPause() {
                 super.onPause();
-                ApplicationGlobals.saveGlobalSettings(this, mParseCheckbox.isChecked(), 
+                ApplicationGlobals.saveGlobalSettings(this,mActiveSwitch.isChecked(),mParseCheckbox.isChecked(), 
                                                       mParseReplyText.getText().toString(), 
                                                       mNoparseCheckBox.isChecked(), 

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/receiver/SmsParseReceiver.java

@@ -55 +55 @@
         
         
-        private static boolean globalsLoaded = false;
-        private static boolean mReplyParse = true;
-        private static boolean mReplyFail = true;
         
-        private static String mReplyParseText = "";
-        private static String mReplyFailText = "";
-        
-        
-        public static void initGlobals(Context context) {
-                if(!globalsLoaded) {
-                        JSONObject globals = ApplicationGlobals.loadSettingsFromFile(context);
-                        try {
-                                mReplyParse = globals.getBoolean(ApplicationGlobals.KEY_PARSE_REPLY);
-                                mReplyFail = globals.getBoolean(ApplicationGlobals.KEY_FAILED_REPLY);
-                                mReplyParseText = globals.getString(ApplicationGlobals.KEY_PARSE_REPLY_TEXT);
-                                mReplyFailText = globals.getString(ApplicationGlobals.KEY_FAILED_REPLY_TEXT);
-                                globalsLoaded = true;
-                        } catch (JSONException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                        }
-                }
-        }
 
         // private Context mContext = null;
@@ -106 +84 @@
         @Override
         public void onReceive(Context context, Intent intent) {
-                initGlobals(context);
+                ApplicationGlobals.initGlobals(context);
         
                 if (prefixes == null) {
@@ -123 +101 @@
 
                 Form form = determineForm(body);
-                if (form == null) {
-                        
-                        
-                        if (mReplyFail) {
+                if (form == null) {                     
+                        if (ApplicationGlobals.doReplyOnFail()) {
                                 Intent broadcast = new Intent("org.rapidandroid.intents.SMS_REPLY");
                                 broadcast.putExtra(SmsReplyReceiver.KEY_DESTINATION_PHONE, intent.getStringExtra("from"));
-                                broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, mReplyFailText);
+                                broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, ApplicationGlobals.getParseFailText());
                                 context.sendBroadcast(broadcast);
                         }
@@ -136 +112 @@
                         Monitor mon = MessageTranslator.GetMonitorAndInsertIfNew(context, intent.getStringExtra("from"));
                         // if(mon.getReplyPreference()) {
-                        if (mReplyParse) {
+                        if (ApplicationGlobals.doReplyOnParse()) {
                                 // for debug purposes, we'll just ack every time.
                                 Intent broadcast = new Intent("org.rapidandroid.intents.SMS_REPLY");
                                 broadcast.putExtra(SmsReplyReceiver.KEY_DESTINATION_PHONE, intent.getStringExtra("from"));
-                                broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, mReplyParseText);
+                                broadcast.putExtra(SmsReplyReceiver.KEY_MESSAGE, ApplicationGlobals.getParseSuccessText());
                                 context.sendBroadcast(broadcast);
                         }

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/receiver/SmsReceiver.java

@@ -117 +117 @@
                         broadcast.putExtra("body", mesg.getMessageBody());
                         broadcast.putExtra("msgid", Integer.valueOf(msgUri.getPathSegments().get(1)));
-                        DeleteSMSFromInbox(context, mesg);
+                        //DeleteSMSFromInbox(context, mesg);
                         context.sendBroadcast(broadcast);
                 }