Merge "Don't convert to strings only to convert to int." into ub-gmail-ur12-dev
diff --git a/assets/script.js b/assets/script.js
index b096c4b..d61f988 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/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 0972dd1..479c807 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -1072,13 +1072,11 @@
// per onLoadFinished()
}
- private static OverlayPosition[] parsePositions(final String[] topArray,
- final String[] bottomArray) {
+ private static OverlayPosition[] parsePositions(final int[] topArray, final int[] bottomArray) {
final int len = topArray.length;
final OverlayPosition[] positions = new OverlayPosition[len];
for (int i = 0; i < len; i++) {
- positions[i] = new OverlayPosition(
- Integer.parseInt(topArray[i]), Integer.parseInt(bottomArray[i]));
+ positions[i] = new OverlayPosition(topArray[i], bottomArray[i]);
}
return positions;
}
@@ -1189,8 +1187,8 @@
*/
private class MailJsBridge {
@JavascriptInterface
- public void onWebContentGeometryChange(final String[] overlayTopStrs,
- final String[] overlayBottomStrs) {
+ public void onWebContentGeometryChange(final int[] overlayTopStrs,
+ final int[] overlayBottomStrs) {
try {
getHandler().post(new FragmentRunnable("onWebContentGeometryChange",
ConversationViewFragment.this) {