Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop_8.1_24.03.17

livecodeali · livecodeali · commit 15bff23c72c7 · 2017-03-24T14:27:04.000Z
diff --git a/config.py b/config.py
@@ -390,7 +390,7 @@ def guess_android_build_tools(sdkdir):
 
 def validate_android_tools(opts):
     if opts['ANDROID_NDK_VERSION'] is None:
-        opts['ANDROID_NDK_VERSION'] = 'r10d'
+        opts['ANDROID_NDK_VERSION'] = 'r14'
 
     ndk_ver = opts['ANDROID_NDK_VERSION']
     if opts['ANDROID_PLATFORM'] is None:
diff --git a/docs/development/build-android.md b/docs/development/build-android.md
@@ -2,7 +2,7 @@
 
 ![LiveCode Community Logo](http://livecode.com/wp-content/uploads/2015/02/livecode-logo.png)
 
-Copyright © 2015 LiveCode Ltd., Edinburgh, UK
+Copyright © 2015-2017 LiveCode Ltd., Edinburgh, UK
 
 ## Dependencies
 
@@ -19,11 +19,17 @@ LiveCode requires both the Android Software Development Kit (SDK) and Native Dev
 Extract both the NDK and SDK to a suitable directory, e.g. `~/android/toolchain`.  For example, you would run:
 
 ````bash
-mkdir -p ~/android/toolchain
+mkdir -p ~/android/toolchain/android-sdk-linux
 cd ~/android/toolchain
 
-tar -xf ~/Downloads/android-sdk_r24.1.2-linux.tgz
-7z x ~/Downloads/android-ndk-r10e-linux-x86_64.bin
+wget https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip
+wget https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
+
+unzip android-ndk-r14-linux-x86_64.zip
+
+pushd android-sdk-linux
+unzip tools_r25.2.3-linux.zip
+popd
 ````
 
 Update the SDK:
@@ -35,16 +41,15 @@ Update the SDK:
 Create a standalone toolchain (this simplifies setting up the build environment):
 
 ````bash
-android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
-    --toolchain=arm-linux-androideabi-clang3.5 \
-    --platform=android-10 \
-    --install-dir=${HOME}/android/toolchain/standalone
+android-ndk-r14/build/tools/make_standalone_toolchain.py \
+    --arch arm --api 17 --stl libc++ \
+    --install-dir ${HOME}/android/toolchain/standalone
 ````
 
 Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
 
 ````bash
-ln -s android-ndk-r10e android-ndk
+ln -s android-ndk-r14 android-ndk
 ln -s android-sdk-linux android-sdk
 ````
 
@@ -75,11 +80,11 @@ LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -fuse-ld=bfd"
 AR="${BINDIR}/${TRIPLE}-ar"
 
 # Android platform information
-ANDROID_NDK_VERSION=r10e
-ANDROID_PLATFORM=android-10
-ANDROID_NDK=${TOOLCHAIN}/android-ndk-r10e
+ANDROID_NDK_VERSION=r14
+ANDROID_PLATFORM=android-17
+ANDROID_NDK=${TOOLCHAIN}/android-ndk-r14
 ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
-ANDROID_BUILD_TOOLS=23.0.1
+ANDROID_BUILD_TOOLS=25.0.2
 
 export JAVA_SDK
 export CC CXX LINK AR
@@ -112,7 +117,7 @@ Otherwise, you'll need to build a target in the gyp-generated makefiles:
 
 **Note:** The following information is provided for reference purposes.  It should be possible to build LiveCode for Android on any modern Linux desktop distribution or recent version of Mac OS.
 
-The Linux build environment used for compiling LiveCode for Android is based on Debian Wheezy x86-64, with the following additional packages installed:
+The Linux build environment used for compiling LiveCode for Android is based on Debian Jessie x86-64, with the following additional packages installed:
 
 * git
 * bzip2
@@ -121,3 +126,5 @@ The Linux build environment used for compiling LiveCode for Android is based on
 * python
 * build-essential
 * openjdk-7-jdk
+* flex
+* bison
diff --git a/docs/guides/LiveCode Documentation Format Reference.md b/docs/guides/LiveCode Documentation Format Reference.md
@@ -235,7 +235,7 @@ etc.
 ### Inline documentation
 Documentation for LiveCode script and LiveCode extensions can be done in-line. In this case, the Name, Type, Syntax and Associated elements are auto-generated. 
 
-The code-block enclosed in /* */ immediately preceding the handler or syntax definition is used for the other elements of the documentation for that entry. In LiveCode extensions, the types of parameters are also pulled from the associated handler.
+The code-block enclosed in /** */ immediately preceding the handler or syntax definition is used for the other elements of the documentation for that entry. In LiveCode extensions, the types of parameters are also pulled from the associated handler.
 
 ### Separate docs files examples
 
@@ -344,13 +344,13 @@ In general, writing inline docs has fewer requirements since several of the elem
 #### LiveCode Builder syntax example
 
 ```
-/*  
+/**  
 This library consists of the operations on lists included in the standard library of LiveCode Builder.
 */
 
 module com.livecode.list
 
-/*
+/**
 Summary:        Returns the first element of <Target>.
 Target:         An expression which evaluates to a list.
 output:			The first element of <Target>
@@ -387,7 +387,7 @@ end module
 
 #### LiveCode Builder handler example
 ```
-/*
+/**
 Summary: Logs the result of a test to the <xResults> list
 
 Parameters:
@@ -415,7 +415,7 @@ end handler
 ```
 #### LiveCode script handler example
 ```
-/*
+/**
 Summary: Extracts the inline docs from a .lcb file
 
 pFile: The path to the .lcb file to extract docs from
diff --git a/docs/notes/bugfix-12187.md b/docs/notes/bugfix-12187.md
@@ -0,0 +1 @@
+# Make sure keyboardActivated/keyboardDeactivated messages are sent when the status bar is hidden on Android
diff --git a/docs/notes/bugfix-18273.md b/docs/notes/bugfix-18273.md
@@ -0,0 +1 @@
+# Prevent crash when rendering card with invalid objptr
diff --git a/docs/notes/bugfix-19298.md b/docs/notes/bugfix-19298.md
@@ -0,0 +1 @@
+# Make sure "Search for Inclusions" detects correctly widget inclusions on iOS simulator
diff --git a/docs/notes/bugfix-19313.md b/docs/notes/bugfix-19313.md
@@ -0,0 +1 @@
+# Fix crash when saving field with fdata
diff --git a/docs/notes/bugfix-19352.md b/docs/notes/bugfix-19352.md
@@ -0,0 +1 @@
+# Fix crash when getting the urlResponse
diff --git a/docs/notes/bugfix-19417.md b/docs/notes/bugfix-19417.md
@@ -0,0 +1 @@
+# Use correct comment syntax in docs on documentation
diff --git a/docs/notes/bugfix-19424.md b/docs/notes/bugfix-19424.md
@@ -0,0 +1 @@
+# Make sure getting `the securityPermissions` returns the expected result
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -3665,7 +3665,7 @@ IO_stat MCButton::save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_
 	{
 		do
 		{
-			if ((stat = tptr->save(stream, OT_BDATA, p_part, p_version)) != IO_NORMAL)
+			if ((stat = tptr->save(stream, OT_BDATA, p_part, nil, p_version)) != IO_NORMAL)
 				return stat;
 			tptr = (MCCdata *)tptr->next();
 		}
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -3065,11 +3065,15 @@ void MCCard::drawselectedchildren(MCDC *dc)
         return;
     do
     {
-        if (tptr -> getref() -> getstate(CS_SELECTED))
-            tptr->getref()->drawselected(dc);
+        MCControl *t_control = tptr->getref();
+        if (t_control != nullptr)
+        {
+            if (tptr -> getref() -> getstate(CS_SELECTED))
+                tptr->getref()->drawselected(dc);
         
-        if (tptr -> getrefasgroup() != nil)
-            tptr -> getrefasgroup() -> drawselectedchildren(dc);
+            if (tptr -> getrefasgroup() != nil)
+                tptr -> getrefasgroup() -> drawselectedchildren(dc);
+        }
             
         tptr = tptr->next();
     }
@@ -3140,7 +3144,9 @@ void MCCard::draw(MCDC *dc, const MCRectangle& dirty, bool p_isolated)
 		MCObjptr *tptr = objptrs;
 		do
 		{
-			tptr->getref()->redraw(dc, dirty);
+            MCControl *t_control = tptr->getref();
+            if (t_control != nullptr)
+                t_control->redraw(dc, dirty);
 			tptr = tptr->next();
 		}
 		while (tptr != objptrs);
diff --git a/engine/src/cdata.cpp b/engine/src/cdata.cpp
@@ -164,7 +164,7 @@ IO_stat MCCdata::load(IO_handle stream, MCObject *parent, uint32_t version)
 	return IO_NORMAL;
 }
 
-IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, uint32_t p_version)
+IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, MCObject *p_parent, uint32_t p_version)
 {
 	IO_stat stat;
 
@@ -195,6 +195,9 @@ IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, uint32_t
 			if (tptr != NULL)
 				do
 				{
+                    // Ensure field's saved MCCdata paragraphs have a parent when needed
+                    if (p_parent != nil)
+                        tptr -> setparent(MCObjectCast<MCField>(p_parent));
 					if ((stat = tptr->save(stream, p_part, p_version)) != IO_NORMAL)
 						return stat;
 					tptr = (MCParagraph *)tptr->next();
diff --git a/engine/src/cdata.h b/engine/src/cdata.h
@@ -35,7 +35,7 @@ class MCCdata : public MCDLlist
 	MCCdata(const MCCdata &fref, MCField* p_new_owner);
 	~MCCdata();
 	IO_stat load(IO_handle stream, MCObject *parent, uint32_t version);
-	IO_stat save(IO_handle stream, Object_type type, uint4 p_part, uint32_t p_version);
+	IO_stat save(IO_handle stream, Object_type type, uint4 p_part, MCObject *parent, uint32_t p_version);
 	uint4 getid();
 	void setid(uint4 newid);
 	MCParagraph *getparagraphs();
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -1732,7 +1732,7 @@ void MCEngineGetSecurityCategories(MCExecContext& ctxt, intset_t& r_value)
 
 void MCEngineGetSecurityPermissions(MCExecContext& ctxt, intset_t& r_value)
 {
-	r_value = MCsecuremode;
+	r_value = ~MCsecuremode;
 }
 
 void MCEngineSetSecurityPermissions(MCExecContext& ctxt, intset_t p_value)
diff --git a/engine/src/exec-network.cpp b/engine/src/exec-network.cpp
@@ -791,7 +791,7 @@ void MCNetworkGetUrlResponse(MCExecContext& ctxt, MCStringRef& r_value)
 {
 	// MW-2008-08-12: Add access to the MCurlresult internal global variable
 	//   this is set by libURL after doing DELETE, POST, PUT or GET type queries.
-	r_value = (MCStringRef)MCValueRetain(MCurlresult -> getvalueref());
+    ctxt.ConvertToString(MCurlresult -> getvalueref(), r_value);
 }
 
 void MCNetworkGetFtpProxy(MCExecContext& ctxt, MCStringRef& r_value)
diff --git a/engine/src/field.cpp b/engine/src/field.cpp
@@ -2718,15 +2718,15 @@ IO_stat MCField::save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_t
 			MCCdata *tptr;
 			tptr = getcarddata(fdata, 0, False);
 			if (tptr != NULL)
-				if ((stat = tptr -> save(stream, OT_FDATA, 0, p_version)) != IO_NORMAL)
+				if ((stat = tptr -> save(stream, OT_FDATA, 0, this, p_version)) != IO_NORMAL)
 					return stat;
 		}
 		else
 		{
 			MCCdata *tptr = fdata;
 			do
 			{
-				if ((stat = tptr->save(stream, OT_FDATA, p_part, p_version)) != IO_NORMAL)
+				if ((stat = tptr->save(stream, OT_FDATA, p_part, this, p_version)) != IO_NORMAL)
 					return stat;
 				tptr = tptr->next();
 			}
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -604,6 +604,7 @@ public void showKeyboard()
 		
 		// HH-2017-01-18: [[ Bug 18058 ]] Fix keyboard not show in landscape orientation
         imm.showSoftInput(this, InputMethodManager.SHOW_FORCED);
+		updateKeyboardVisible(true);
     }
 
     public void hideKeyboard()
@@ -616,6 +617,7 @@ public void hideKeyboard()
 			imm.restartInput(this);
 		
         imm.hideSoftInputFromWindow(getWindowToken(), 0);
+		updateKeyboardVisible(false);
     }
 
 	public void resetKeyboard()
@@ -1413,10 +1415,22 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh)
 	{
 		// Log.i(TAG, "onSizeChanged({" + w + "x" + h + "}, {" + oldw + ", " + oldh + "})");
 		
-		// IM-2013-11-15: [[ Bug 10485 ]] As we can't determine directly if the resize is due to the keyboard
-		// being made visible, we use a rule of thumb that anything larger than 100 pixels must be the keyboard.
-		int t_height_diff = getContainer().getRootView().getHeight() - getContainer().getHeight();
-		updateKeyboardVisible(t_height_diff > 100);
+		// status bar height
+		int t_status_bar_height = 0;
+		int t_resource_id = getResources().getIdentifier("status_bar_height", "dimen", "android");
+		if (t_resource_id > 0)
+		{
+			t_status_bar_height = getResources().getDimensionPixelSize(t_resource_id);
+		}
+		
+		// display window size for the app layout
+		Rect t_app_rect = new Rect();
+		getActivity().getWindow().getDecorView().getWindowVisibleDisplayFrame(t_app_rect);
+		
+		// keyboard height equals (screen height - (user app height + status))
+		int t_keyboard_height = getContainer().getRootView().getHeight() - (t_app_rect.height() + t_status_bar_height);
+		
+		updateKeyboardVisible(t_keyboard_height > 0);
 		
 		Rect t_rect;
 		t_rect = null;
diff --git a/tests/_testerlib.livecodescript b/tests/_testerlib.livecodescript
@@ -111,6 +111,7 @@ function TesterParseTestCommandNames pFilename
    -- Scan the file for "on Test*" definitions
    local tCommandNames, tCount, tLine, tName
 
+   local tCommandNameSeen
    repeat for each line tLine in tScript
       if token 1 of tLine is not "on" then
          next repeat
@@ -122,13 +123,20 @@ function TesterParseTestCommandNames pFilename
          next repeat
       end if
 
+      if tCommandNameSeen[tName] then
+         -- Duplicate test name
+         write merge("Error: duplicate test name [[tName]] in [[pFilename]]\n") to stderr
+         quit 1
+      end if
+
       -- Exclude the test setup message
       if tName is "TestSetup" or tName is "TestTearDown" then
          next repeat
       end if
 
       add 1 to tCount
       put tName into tCommandNames[tCount]
+      put true into tCommandNameSeen[tName]
    end repeat
 
    return tCommandNames
diff --git a/tests/lcs/core/array/combine.livecodescript b/tests/lcs/core/array/combine.livecodescript
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 
-on  TestCombineStrings
+on TestCombineStrings
    local tArray, tKeyList, tKeys, tValues
    local tUncombinedData
    
@@ -36,10 +36,10 @@ on  TestCombineStrings
    sort lines of tUncombinedData by item 1 of each
    
    TestAssert "Combine strings", tUncombinedData is tArray
-end  TestCombineStrings
+end TestCombineStrings
 
 
-on  TestCombineNumbers
+on TestCombineNumbers
    local tArray, tKeyList
    local tUncombinedData
 
@@ -54,7 +54,7 @@ on  TestCombineNumbers
 end TestCombineNumbers
 
 
-on  TestCombineMixed
+on TestCombineMixed
    local tArray, tKeyList, tKeys, tValues
    local tUncombinedData
    
@@ -81,7 +81,7 @@ on  TestCombineMixed
 end TestCombineMixed
 
 
-on  test_arrayCombineByRow
+on TestArrayCombineByRow
    local tArray, tKeyList, tValues
    local tUncombinedData
    
@@ -93,16 +93,16 @@ on  test_arrayCombineByRow
    end repeat
    delete the last character of tUncombinedData
    
-   combine  tArray by row
+   combine tArray by row
    
    sort lines of tArray by item 1 of each
    sort lines of tUncombinedData by item 1 of each   
    
    TestAssert "Combine by row", tUncombinedData is tArray
-end  test_arrayCombineByRow
+end TestArrayCombineByRow
 
 
-on  test_arrayCombineByRow
+on TestArrayCombineByColumn
    local tArray, tKeyList, tValues
    local tUncombinedData
    
@@ -114,10 +114,10 @@ on  test_arrayCombineByRow
    end repeat
    delete the last character of tUncombinedData
    
-   combine  tArray by column
+   combine tArray by column
    
    sort lines of tArray by item 1 of each
    sort lines of tUncombinedData by item 1 of each   
    
    TestAssert "Combine by column", tUncombinedData is tArray
-end  test_arrayCombineByRow
+end TestArrayCombineByColumn
diff --git a/tests/lcs/core/engine/globalproperties.livecodescript b/tests/lcs/core/engine/globalproperties.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure keyboardActivated/keyboardDeactivated messages are sent when the status bar is hidden on Android`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Prevent crash when rendering card with invalid objptr`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure "Search for Inclusions" detects correctly widget inclusions on iOS simulator`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when saving field with fdata`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when getting the urlResponse`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Use correct comment syntax in docs on documentation`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+# Make sure getting `the securityPermissions` returns the expected result