Merge "ContactsCommon: Fail to export 1500 contacts to SIM card"

4 files changed, 20 insertions, 12 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6f2dd597..a184aa82 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -255,8 +255,8 @@
     <string name="exporting">"正在导出"</string>
     <string name="reading_vcard_files">读取VCARD文件</string>
     <string name="progressdialog_cancel">取消</string>
-    <string name="export_failed">"导出失败"</string>
-    <string name="sim_card_full">"发生错误，SIM卡已满。"</string>
+    <string name="export_to_sim_failed">"导出失败，<xliff:g id="insertCount">%d</xliff:g>条成功导出"</string>
+    <string name="export_sim_card_full">"SIM卡已满，<xliff:g id="insertCount">%d</xliff:g>条成功导出"</string>
     <string name="export_finished">"导出结束"</string>
     <string name="tag_too_long">"发生错误，联系人姓名过长。"</string>
     <string name="sim_contacts_not_load">发生错误，SIM卡联系人未完全加载</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index be49081d..4528bbc2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -256,8 +256,8 @@
     <string name="settings_contact_display_options_description" msgid="4130259058302284077">"設定聯絡人的顯示和排序方式。"</string>
     <string name="exporting">"正在導出"</string>
     <string name="reading_vcard_files">讀取Vcard文件</string>
-    <string name="export_failed">"導出失敗"</string>
-    <string name="sim_card_full">"發生錯誤，SIM卡已滿。"</string>
+    <string name="export_to_sim_failed">"導出失敗，<xliff:g id="insertCount">%d</xliff:g>條成功導出"</string>
+    <string name="export_sim_card_full">"SIM卡已滿，<xliff:g id="insertCount">%d</xliff:g>條成功導出"</string>
     <string name="export_finished">"導出結束"</string>
     <string name="export_no_phone_or_email">導出失敗, <xliff:g id="name">%s</xliff:g>沒有電話號碼或者郵箱地址</string>
     <string name="tag_too_long">"發生錯誤，聯絡人姓名過長。"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 137b19c0..e049c1d1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -768,9 +768,9 @@ a        ren't members of any other group. [CHAR LIMIT=25] -->
 
     <string name="progressdialog_cancel">Cancel</string>
 
-    <string name="export_failed">Export failed</string>
+    <string name="export_to_sim_failed">Export failed, <xliff:g id="insertCount">%d</xliff:g> items are exported</string>
 
-    <string name="sim_card_full">Error, Sim Card is full.</string>
+    <string name="export_sim_card_full">Sim Card is full, <xliff:g id="insertCount">%d</xliff:g> items are exported</string>
 
     <string name="export_finished">Export finished</string>
 
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 8cc339cd..10e87e53 100755
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -571,13 +571,15 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                                             && (MoreContactUtils.getSimFreeCount(mPeople,
                                                     subscription) == 0)) {
                                         isSimCardFull = true;
-                                        mToastHandler.sendEmptyMessage(TOAST_SIM_CARD_FULL);
+                                        mToastHandler.sendMessage(mToastHandler.obtainMessage(
+                                                TOAST_SIM_CARD_FULL, insertCount, 0));
                                         break;
                                     } else {
                                         isAirplaneMode = MoreContactUtils
                                                 .isAPMOnAndSIMPowerDown(mPeople);
                                         if (isAirplaneMode) {
-                                            mToastHandler.sendEmptyMessage(TOAST_EXPORT_FAILED);
+                                            mToastHandler.sendMessage(mToastHandler.obtainMessage(
+                                                    TOAST_EXPORT_FAILED, insertCount, 0));
                                             break;
                                         } else {
                                             continue;
@@ -599,7 +601,8 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                                             TOAST_SIM_CARD_NOT_LOAD_COMPLETE);
                                 } else {
                                     isSimCardFull = true;
-                                    mToastHandler.sendEmptyMessage(TOAST_SIM_CARD_FULL);
+                                    mToastHandler.sendMessage(mToastHandler.obtainMessage(
+                                            TOAST_SIM_CARD_FULL, insertCount, 0));
                                 }
                                 break;
                             }
@@ -632,9 +635,12 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
         private Handler mToastHandler = new Handler() {
             @Override
             public void handleMessage(Message msg) {
+                int exportCount = 0;
                 switch (msg.what) {
                     case TOAST_EXPORT_FAILED:
-                        Toast.makeText(mPeople, R.string.export_failed, Toast.LENGTH_SHORT).show();
+                        exportCount = msg.arg1;
+                        Toast.makeText(mPeople, mPeople.getString(R.string.export_to_sim_failed,
+                                exportCount), Toast.LENGTH_SHORT).show();
                         break;
                     case TOAST_EXPORT_FINISHED:
                         Toast.makeText(mPeople, R.string.export_finished, Toast.LENGTH_SHORT)
@@ -643,7 +649,9 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
 
                     // add toast handler when sim card is full
                     case TOAST_SIM_CARD_FULL:
-                        Toast.makeText(mPeople, R.string.sim_card_full, Toast.LENGTH_SHORT).show();
+                        exportCount = msg.arg1;
+                        Toast.makeText(mPeople, mPeople.getString(R.string.export_sim_card_full,
+                                exportCount), Toast.LENGTH_SHORT).show();
                         break;
 
                     //add the max count limit of Chinese code or not
@@ -653,7 +661,7 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
 
                      // add toast handler when export is canceled
                     case TOAST_EXPORT_CANCELED:
-                        int exportCount = msg.arg1;
+                        exportCount = msg.arg1;
                         Toast.makeText(mPeople,mPeople.getString(R.string.export_cancelled,
                             String.valueOf(exportCount)), Toast.LENGTH_SHORT).show();
                         break;