Actually add subject/body per GeoSixPack

[zxing.git] / android / src / com / google / zxing / client / android / result / SMSResultHandler.java

diff --git a/android/src/com/google/zxing/client/android/result/SMSResultHandler.java b/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
index 319bb02..3675e7a 100644 (file)
--- a/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/SMSResultHandler.java
@@ -16,15 +16,20 @@
 
 package com.google.zxing.client.android.result;
 
-import android.app.Activity;
-import android.telephony.PhoneNumberUtils;
 import com.google.zxing.client.android.R;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.SMSParsedResult;
 
-public class SMSResultHandler extends ResultHandler {
+import android.app.Activity;
+import android.telephony.PhoneNumberUtils;
 
-  private static final int[] mButtons = {
+/**
+ * Handles SMS addresses, offering a choice of composing a new SMS or MMS message.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class SMSResultHandler extends ResultHandler {
+  private static final int[] buttons = {
       R.string.button_sms,
       R.string.button_mms
   };
@@ -33,40 +38,47 @@ public class SMSResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
-    return mButtons.length;
+    return buttons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
-    return mButtons[index];
+    return buttons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
-    SMSParsedResult smsResult = (SMSParsedResult) mResult;
+    SMSParsedResult smsResult = (SMSParsedResult) getResult();
     switch (index) {
       case 0:
-        sendSMS(smsResult.getNumber(), smsResult.getBody());
+        // Don't know of a way yet to express a SENDTO intent with multiple recipients
+        sendSMS(smsResult.getNumbers()[0], smsResult.getBody());
         break;
       case 1:
-        sendMMS(smsResult.getNumber(), smsResult.getSubject(), smsResult.getBody());
+        sendMMS(smsResult.getNumbers()[0], smsResult.getSubject(), smsResult.getBody());
         break;
     }
   }
 
   @Override
   public CharSequence getDisplayContents() {
-    SMSParsedResult smsResult = (SMSParsedResult) mResult;
+    SMSParsedResult smsResult = (SMSParsedResult) getResult();
     StringBuffer contents = new StringBuffer();
-    ParsedResult.maybeAppend(PhoneNumberUtils.formatNumber(smsResult.getNumber()), contents);
-    ParsedResult.maybeAppend(smsResult.getVia(), contents);
+    String[] rawNumbers = smsResult.getNumbers();
+    String[] formattedNumbers = new String[rawNumbers.length];
+    for (int i = 0; i < rawNumbers.length; i++) {
+      formattedNumbers[i] = PhoneNumberUtils.formatNumber(rawNumbers[i]);
+    }
+    ParsedResult.maybeAppend(formattedNumbers, contents);
     ParsedResult.maybeAppend(smsResult.getSubject(), contents);
     ParsedResult.maybeAppend(smsResult.getBody(), contents);
-    ParsedResult.maybeAppend(smsResult.getTitle(), contents);
     return contents.toString();
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_sms;
   }
-
 }