Merge remote-tracking branch 'upstream/develop-8.2' into merge-develop-8.2-04.10.2017

livecodepanos · livecodepanos · commit 77707e5a9468 · 2017-10-05T09:03:06.000+01:00
diff --git a/config.py b/config.py
@@ -203,8 +203,6 @@ def guess_xcode_arch(target_sdk):
     if sdk == 'iphoneos':
         if int(ver) < 8:
             return 'armv7'
-        elif int(ver) >= 11:
-        	return 'arm64'
         else:
             return 'armv7 arm64'
     if sdk == 'iphonesimulator':
diff --git a/docs/dictionary/keyword/private.lcdoc b/docs/dictionary/keyword/private.lcdoc
@@ -40,7 +40,7 @@ Whenever an implicit handler call is made (ie calling the handler
 simply by its name as opposed to using send or call), LiveCode will
 check the current script for a private handler before allowing the call
 to pass through the message path. If a private handler is found in the
-curent script, it will be directly called.
+current script, it will be directly called.
 
 > *Note:* Attempting to compile a private handler containing a <pass> 
 control structure will cause a compilation error because private 
diff --git a/docs/dictionary/property/revProfile.lcdoc b/docs/dictionary/property/revProfile.lcdoc
@@ -1,7 +1,5 @@
 Name: revProfile
 
-Synonyms: crevgeneral[&quot;profile&quot;], profile
-
 Type: property
 
 Syntax: set the revProfile of <object> to <profileName>
@@ -66,7 +64,7 @@ cRevGeneral["profile"].)
 >*Note:* When included in a standalone application, the Profile library
 > is implemented as a hidden group and made available when the group
 > receives its first openBackground message. During the first part of
-> the applicati startup process, before this message is sent, the
+> the application startup process, before this message is sent, the
 > <revProfile> property is not yet available. This may affect attempts
 > to use this property in startup, preOpenStack, openStack, or
 > preOpenCard hand in the main stack. Once the application has finished
diff --git a/docs/notes/bugfix-13857.md b/docs/notes/bugfix-13857.md
@@ -0,0 +1 @@
+# Correct dictionary entry for revProfile
diff --git a/docs/notes/bugfix-19609.md b/docs/notes/bugfix-19609.md
@@ -0,0 +1 @@
+# Make sure unicode characters display correctly when set htmlText in browser
diff --git a/engine/src/mblandroidjava.cpp b/engine/src/mblandroidjava.cpp
@@ -21,8 +21,6 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "parsedef.h"
 #include "exec.h"
 
-
-
 #include "mblandroidjava.h"
 
 #include <jni.h>
@@ -500,6 +498,38 @@ bool MCJavaStringFromNative(JNIEnv *env, const char *p_string, jstring &r_java_s
     }
 }
 
+bool MCJavaStringFromUTF8(JNIEnv *env, const char *p_string, jstring &r_java_string)
+{
+    if (p_string == nil)
+    {
+        r_java_string = nil;
+        return true;
+    }
+    
+    /* The JNI NewStringUTF function expected Modified UTF-8 which encodes NUL
+     * as two bytes, and SMP chars as two surrogates. This differs from the
+     * encoding of p_string, which is standard UTF-8. Therefore, we convert
+     * p_string to UTF-16, and then use NewString instead. */
+    
+    /* Create a StringRef from the UTF-8, which does the necessary conversion
+     * to UTF-16. */
+    MCAutoStringRef t_string;
+    if (!MCStringCreateWithBytes((const char_t *)p_string, strlen(p_string), kMCStringEncodingUTF8, false, &t_string))
+    {
+        return false;
+    }
+    
+    /* Now lock the content of the stringref as UTF-16 so we can pass the buffer
+     * and length to the JNI function. */
+    MCAutoStringRefAsUTF16String t_utf16_string;
+    if (!t_utf16_string.Lock(*t_string))
+    {
+        return false;
+    }
+    
+    return nil != (r_java_string = env->NewString(t_utf16_string.Ptr(), t_utf16_string.Size()));
+}
+
 bool MCJavaStringFromUnicode(JNIEnv *env, const MCString *p_string, jstring &r_java_string)
 {
     if (p_string == nil)
@@ -1403,6 +1433,8 @@ static MCJavaType native_sigchar_to_returntype(char p_sigchar)
             return kMCJavaTypeVoid;
         case 's':
             return kMCJavaTypeCString;
+        case 't':
+            return kMCJavaTypeUtf8CString;
         case 'S':
             return kMCJavaTypeMCString;
         case 'U':
@@ -1448,6 +1480,7 @@ static const char *return_type_to_java_sig(MCJavaType p_type)
         case kMCJavaTypeBoolean:  // boolean
             return "Z";
         case kMCJavaTypeCString:  // string from char *
+        case kMCJavaTypeUtf8CString: // string from utf8 char *
         case kMCJavaTypeMCString:  // string from MCString *
         case kMCJavaTypeMCStringUnicode:  // string from utf16 MCString *
 		case kMCJavaTypeMCStringRef: // string from MCStringRef
@@ -1701,11 +1734,23 @@ bool MCJavaConvertParameters(JNIEnv *env, const char *p_signature, va_list p_arg
                 case kMCJavaTypeCString:
                 {
                     t_cstring = va_arg(p_args, const char *);
-                    
+
                     t_success = MCJavaStringFromNative(env, t_cstring, t_java_string);
                     if (t_success)
                         t_value . l = t_java_string;
                     
+                    t_delete = true;
+                    t_object = true;
+                }
+                    break;
+                case kMCJavaTypeUtf8CString:
+                {
+                    t_cstring = va_arg(p_args, const char *);
+
+                    t_success = MCJavaStringFromUTF8(env, t_cstring, t_java_string);
+                    if (t_success)
+                        t_value . l = t_java_string;
+                    
                     t_delete = true;
                     t_object = true;
                 }
diff --git a/engine/src/mblandroidjava.h b/engine/src/mblandroidjava.h
@@ -40,6 +40,7 @@ typedef enum
     
     // specialized return types
     kMCJavaTypeCString,
+    kMCJavaTypeUtf8CString,
     kMCJavaTypeMCString,
     kMCJavaTypeMCStringUnicode,
 	kMCJavaTypeMCStringRef,
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
@@ -402,7 +402,7 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
          if tRawArchs contains "ARM64" and not pSettings["ios,32-bit only"] then
             put "arm64 " after tArchs
          end if
-         if tRawArchs contains "V7" then
+         if tRawArchs contains "V7" and pSettings["ios,minimum version"] < 11.0 then
             put "armv7 " after tArchs
          end if
          
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
@@ -793,7 +793,7 @@ class MCAndroidWebViewBrowser : public MCBrowserBase
 	
 	bool SetHTMLText(const char *p_utf8_string)
 	{
-		MCAndroidObjectRemoteCall(m_view, "loadHtml", "vss", nil, LIBBROWSER_DUMMY_URL, p_utf8_string);
+		MCAndroidObjectRemoteCall(m_view, "loadHtml", "vst", nil, LIBBROWSER_DUMMY_URL, p_utf8_string);
 		return true;
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Correct dictionary entry for revProfile`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure unicode characters display correctly when set htmlText in browser`
Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ class MCAndroidWebViewBrowser : public MCBrowserBase`
`793`	`793`
`794`	`794`	`bool SetHTMLText(const char *p_utf8_string)`
`795`	`795`	`{`
`796`		`- MCAndroidObjectRemoteCall(m_view, "loadHtml", "vss", nil, LIBBROWSER_DUMMY_URL, p_utf8_string);`
	`796`	`+ MCAndroidObjectRemoteCall(m_view, "loadHtml", "vst", nil, LIBBROWSER_DUMMY_URL, p_utf8_string);`
`797`	`797`	`return true;`
`798`	`798`	`}`
`799`	`799`