am e2b2eb7e: (-s ours) DO NOT MERGE Don\'t convert to strings only to convert to int.
* commit 'e2b2eb7ef18ab1ba0260eed4a22930cea195c240':
DO NOT MERGE Don't convert to strings only to convert to int.
diff --git a/assets/script.js b/assets/script.js
index d61f988..b096c4b 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -618,13 +618,13 @@
expandedBody = expandedBodyDivs[i];
headerSpacer = expandedBody.previousElementSibling;
// addJavascriptInterface handler only supports string arrays
- overlayTops[i] = prevBodyBottom;
- overlayBottoms[i] = (getTotalOffset(headerSpacer).top + headerSpacer.offsetHeight);
+ overlayTops[i] = "" + prevBodyBottom;
+ overlayBottoms[i] = "" + (getTotalOffset(headerSpacer).top + headerSpacer.offsetHeight);
prevBodyBottom = getTotalOffset(expandedBody.nextElementSibling).top;
}
// add an extra one to mark the top/bottom of the last message footer spacer
- overlayTops[i] = prevBodyBottom;
- overlayBottoms[i] = document.documentElement.scrollHeight;
+ overlayTops[i] = "" + prevBodyBottom;
+ overlayBottoms[i] = "" + document.documentElement.scrollHeight;
window.mail.onWebContentGeometryChange(overlayTops, overlayBottoms);
}
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 34c88e4..d6fcc56 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -90,7 +90,7 @@
<string name="kilobytes" msgid="9191949758901349712">"<xliff:g id="COUNT">%s</xliff:g> គីឡូបៃ"</string>
<string name="megabytes" msgid="130431176022837380">"<xliff:g id="COUNT">%s</xliff:g> មេកាបៃ"</string>
<string name="attachment_image" msgid="3832985223906528449">"រូបភាព"</string>
- <string name="attachment_video" msgid="7526134752988603154">"វីដេអូ"</string>
+ <string name="attachment_video" msgid="7526134752988603154">"វីដេអូ"</string>
<string name="attachment_audio" msgid="135527133955622936">"សំឡេង"</string>
<string name="attachment_text" msgid="5544874374971562759">"អត្ថបទ"</string>
<string name="attachment_application_msword" msgid="2326909450865637910">"ឯកសារ"</string>
@@ -100,7 +100,7 @@
<string name="attachment_unknown" msgid="6005445955982153931">"ឯកសារ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6934911143603455393">"មើលជាមុន"</string>
<string name="save_attachment" msgid="5360128849867863132">"រក្សាទុក"</string>
- <string name="cancel_attachment" msgid="4651201258272223650">"បោះបង់"</string>
+ <string name="cancel_attachment" msgid="4651201258272223650">"បោះបង់"</string>
<string name="open_attachment" msgid="975940478986626705">"បើក"</string>
<string name="install_attachment" msgid="2803531650273683382">"ដំឡើង"</string>
<string name="download_again" msgid="7418568915429156518">"ទាញយកម្ដងទៀត"</string>
@@ -112,7 +112,7 @@
<string name="download_failed" msgid="442019281547315527">"មិនអាចទាញយក។ ប៉ះដើម្បីព្យាយាមម្ដងទៀត។"</string>
<string name="attachments_header" msgid="6459475590011460229">"ឯកសារភ្ជាប់"</string>
<string name="menu_photo_save_all" msgid="4295226099481995348">"រក្សាទុកទាំងអស់"</string>
- <string name="menu_photo_share" msgid="2214772815165829079">"ចែករំលែក"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"ចែករំលែក"</string>
<string name="menu_photo_share_all" msgid="4577299400844129078">"ចែករំលែកទាំងអស់"</string>
<string name="menu_photo_print" msgid="1751063711206436775">"បោះពុម្ព"</string>
<string name="saving" msgid="925514721138014677">"កំពុងរក្សាទុក..."</string>
@@ -252,9 +252,9 @@
<string name="enumeration_comma" msgid="5191660524342286026">", "</string>
<string name="yes" msgid="7474216525286833848">"បាទ/ចាស"</string>
<string name="no" msgid="427548507197604096">"ទេ"</string>
- <string name="ok" msgid="8339355733816891026">"យល់ព្រម"</string>
+ <string name="ok" msgid="8339355733816891026">"យល់ព្រម"</string>
<string name="done" msgid="3079981801778027540">"ធ្វើរួច"</string>
- <string name="cancel" msgid="8762981157252199115">"បោះបង់"</string>
+ <string name="cancel" msgid="8762981157252199115">"បោះបង់"</string>
<string name="clear" msgid="3184687982186479442">"សម្អាត"</string>
<string-array name="sync_status">
<item msgid="2446076619901049026">"ជោគជ័យ"</item>
@@ -380,9 +380,9 @@
<item quantity="other" msgid="2182899395748020953">"សារ <xliff:g id="COUNT">%1$d</xliff:g> នឹងត្រូវបានលុបជាអចិន្ត្រៃយ៍។"</item>
</plurals>
<string name="drawer_open" msgid="6074646853178471940">"បើកការរុករកថត"</string>
- <string name="drawer_close" msgid="2764774620737876943">"បិទការរុករកថត"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"បិទការរុករកថត"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"ប៉ះរូបភាពរបស់អ្នកផ្ញើ ដើម្បីជ្រើសការសន្ទនានោះ។"</string>
- <string name="long_press_to_select_tip" msgid="9205666839837250150">"ប៉ះ & សង្កត់ ដើម្បីជ្រើសការសន្ទនាមួយ បន្ទាប់មកប៉ះដើម្បីជ្រើសការសន្ទនាច្រើនទៀត។"</string>
+ <string name="long_press_to_select_tip" msgid="9205666839837250150">"ប៉ះ & សង្កត់ ដើម្បីជ្រើសការសន្ទនាមួយ បន្ទាប់មកប៉ះដើម្បីជ្រើសការសន្ទនាច្រើនទៀត។"</string>
<string name="folder_icon_desc" msgid="1500547397347480618">"រូបតំណាងថត"</string>
<string name="add_account" msgid="2162808366829269770">"បន្ថែមគណនី"</string>
<string name="attached_message" msgid="4267189489654642035">"សារដែលបានភ្ជាប់"</string>
@@ -428,8 +428,8 @@
<string name="custom_date" msgid="7566383722092597487">"តាមបំណង"</string>
<string name="date_none" msgid="1033448683454519235">"គ្មាន"</string>
<string name="discard_changes" msgid="57677638191085556">"បោះបង់ការផ្លាស់ប្ដូរ?"</string>
- <string name="vacation_responder_changes_saved" msgid="7996997204497945275">"បានរក្សាទុកការផ្លាស់ប្ដូរការឆ្លើយតបពេលវិស្សមកាល"</string>
- <string name="vacation_responder_changes_discarded" msgid="5699324320463227712">"បានបោះបង់ការឆ្លើយតបពេលវិស្សមកាល"</string>
+ <string name="vacation_responder_changes_saved" msgid="7996997204497945275">"បានរក្សាទុកការផ្លាស់ប្ដូរការឆ្លើយតបពេលវិស្សមកាល"</string>
+ <string name="vacation_responder_changes_discarded" msgid="5699324320463227712">"បានបោះបង់ការឆ្លើយតបពេលវិស្សមកាល"</string>
<string name="vacation_responder_off" msgid="3502054743467746285">"បិទ"</string>
<string name="vacation_responder_on" msgid="5242690599331655563">"បើក ពី<xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="vacation_responder_on_with_end_date" msgid="8198920866703798811">"បើក ពី <xliff:g id="START_DATE">%1$s</xliff:g> ដល់ <xliff:g id="END_DATE">%2$s</xliff:g>"</string>
@@ -443,6 +443,6 @@
<string name="view_app_page" msgid="5320196120982618014"></string>
<string name="print_dialog" msgid="8754985880654139587">"បោះពុម្ព..."</string>
<string name="copyright_information" msgid="1673715390305905781">"ព័ត៌មានរក្សាសិទ្ធិ"</string>
- <string name="privacy_policy" msgid="2072093492013385609">"គោលនយោបាយភាពឯកជន"</string>
+ <string name="privacy_policy" msgid="2072093492013385609">"គោលនយោបាយភាពឯកជន"</string>
<string name="open_source_licenses" msgid="6831573769505612579">"អាជ្ញាប័ណ្ណកម្មវិធីកូដចំហ"</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 3230021..1a49e5b 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -120,7 +120,7 @@
<string name="contextmenu_openlink" msgid="2176176524824953775">"ເປີດໃນໂປຣແກຣມທ່ອງເວັບ"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"ສຳເນົາ"</string>
<string name="contextmenu_copylink" msgid="3580131515400610839">"ສຳເນົາລິ້ງ URL"</string>
- <string name="contextmenu_view_image" msgid="8855189263365643422">"ເບິ່ງຮູບພາບ"</string>
+ <string name="contextmenu_view_image" msgid="8855189263365643422">"ເບິ່ງຮູບພາບ"</string>
<string name="contextmenu_dial_dot" msgid="9104426720103729453">"ໂທ..."</string>
<string name="contextmenu_sms_dot" msgid="6481040539501081547">"SMS..."</string>
<string name="contextmenu_add_contact" msgid="8395100913366045250">"ເພີ່ມລາຍຊື່"</string>
@@ -421,7 +421,7 @@
<string name="vacation_responder_body_hint_text" msgid="5731550117332146705">"ຂໍ້ຄວາມ"</string>
<string name="send_to_contacts_text" msgid="2696513899649703420">"ສົ່ງໃຫ້ຜູ່ທີ່ຢູ່ໃນລາຍຊື່ຕິດຕໍ່ຂອງຂ້ອຍເທົ່ານັ້ນ"</string>
<string name="send_to_domain_text" msgid="5055332409482662383">"ສົ່ງໃຫ້ສະເພາະ <xliff:g id="DOMAIN">%1$s</xliff:g>"</string>
- <string name="pick_start_date_title" msgid="915230000170560933">"ມື້ເລີ່ມ"</string>
+ <string name="pick_start_date_title" msgid="915230000170560933">"ມື້ເລີ່ມ"</string>
<string name="pick_end_date_title" msgid="2068598706186320098">"ມື້ຈົບ (ເປັນທາງເລືອກ)"</string>
<string name="date_not_set" msgid="4925325938525330766">"ຍັງບໍ່ໄດ້ຕັ້ງ"</string>
<string name="set_end_date_dialog_title" msgid="72028456826019380">"ມື້ຈົບ (ເປັນທາງເລືອກ)"</string>
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 41049de..8f0bb19 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -1706,6 +1706,9 @@
.getParcelableArrayList(Intent.EXTRA_STREAM);
ArrayList<Attachment> attachments = new ArrayList<Attachment>();
for (Parcelable uri : uris) {
+ if (uri == null || !(uri instanceof Uri)) {
+ continue;
+ }
try {
final Attachment a = mAttachmentsView.generateLocalAttachment(
(Uri) uri);
@@ -1725,20 +1728,22 @@
}
totalSize += addAttachments(attachments);
} else {
- final Uri uri = extras.getParcelable(Intent.EXTRA_STREAM);
- long size = 0;
- try {
- final Attachment a = mAttachmentsView.generateLocalAttachment(uri);
- size = mAttachmentsView.addAttachment(mAccount, a);
+ final Parcelable uri = extras.getParcelable(Intent.EXTRA_STREAM);
+ if (uri != null && uri instanceof Uri) {
+ long size = 0;
+ try {
+ final Attachment a = mAttachmentsView.generateLocalAttachment((Uri)uri);
+ size = mAttachmentsView.addAttachment(mAccount, a);
- Analytics.getInstance().sendEvent("send_intent_attachment",
- Utils.normalizeMimeType(a.getContentType()), null, size);
+ Analytics.getInstance().sendEvent("send_intent_attachment",
+ Utils.normalizeMimeType(a.getContentType()), null, size);
- } catch (AttachmentFailureException e) {
- LogUtils.e(LOG_TAG, e, "Error adding attachment");
- showAttachmentTooBigToast(e.getErrorRes());
+ } catch (AttachmentFailureException e) {
+ LogUtils.e(LOG_TAG, e, "Error adding attachment");
+ showAttachmentTooBigToast(e.getErrorRes());
+ }
+ totalSize += size;
}
- totalSize += size;
}
}
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index a794875..262d4fe 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -1077,11 +1077,13 @@
// per onLoadFinished()
}
- private static OverlayPosition[] parsePositions(final int[] topArray, final int[] bottomArray) {
+ private static OverlayPosition[] parsePositions(final String[] topArray,
+ final String[] bottomArray) {
final int len = topArray.length;
final OverlayPosition[] positions = new OverlayPosition[len];
for (int i = 0; i < len; i++) {
- positions[i] = new OverlayPosition(topArray[i], bottomArray[i]);
+ positions[i] = new OverlayPosition(
+ Integer.parseInt(topArray[i]), Integer.parseInt(bottomArray[i]));
}
return positions;
}
@@ -1192,8 +1194,8 @@
*/
private class MailJsBridge {
@JavascriptInterface
- public void onWebContentGeometryChange(final int[] overlayTopStrs,
- final int[] overlayBottomStrs) {
+ public void onWebContentGeometryChange(final String[] overlayTopStrs,
+ final String[] overlayBottomStrs) {
try {
getHandler().post(new FragmentRunnable("onWebContentGeometryChange",
ConversationViewFragment.this) {