Merge remote-tracking branch 'upstream/develop-9.6' into merge-develop-9.6-15.02.2021_2

livecodepanos · livecodepanos · commit 939fc490e2d3 · 2021-02-15T14:53:25.000+02:00
diff --git a/docs/notes/bugfix-16296.md b/docs/notes/bugfix-16296.md
@@ -0,0 +1 @@
+# Fix crash on Android when restarting the location tracker
diff --git a/docs/notes/bugfix-23055.md b/docs/notes/bugfix-23055.md
@@ -0,0 +1,2 @@
+# Allow seek command to reset "eof" result after read command reaches the end of a file on macOS
+
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -1601,6 +1601,11 @@ class MCStdioFileHandle: public MCSystemFileHandle
 	virtual bool Seek(int64_t offset, int p_dir)
 	{
         // TODO Add MCSystemFileHandle::SetStream(char *newptr) ?
+		if (m_is_eof)
+		{
+			clearerr(m_stream);
+			m_is_eof = false;
+		}
 		return fseeko(m_stream, offset, p_dir < 0 ? SEEK_END : (p_dir > 0 ? SEEK_SET : SEEK_CUR)) == 0;
 	}
 	
diff --git a/engine/src/java/com/runrev/android/SensorModule.java b/engine/src/java/com/runrev/android/SensorModule.java
@@ -358,17 +358,37 @@ protected void onLocationChanged(Location location)
         public double getLongitude() { return m_last_location.getLongitude(); }
         public double getAltitude() { return m_last_location.getAltitude(); }
         
-        //override to make sure currently known location is sent if already started by heading tracker
-        public boolean startTracking(boolean p_loosely)
-        {
-            boolean t_result;
-            t_result = super.startTracking(p_loosely);
-            if (t_result && m_last_location != null)
-                onLocationChanged(m_last_location);
-            return t_result;
-        }
-    }
-    
+		//override to make sure currently known location is sent if already started by internal tracking
+		public boolean startTracking(boolean p_loosely)
+		{
+			// Check if already tracking at the requested level
+			int t_tracking_requested = p_loosely ? COARSE_TRACKING : FINE_TRACKING;
+
+			if (m_tracking_requested == t_tracking_requested)
+				return true;
+
+			boolean t_result;
+			t_result = super.startTracking(p_loosely);
+			if (t_result && m_last_location != null)
+				m_engine.post(new Runnable() {
+					public void run() {
+						onLocationChanged(m_last_location);
+					}
+				});
+			return t_result;
+		}
+
+		// override to clear cached last location if not tracking internallly
+		public boolean stopTracking()
+		{
+			boolean t_result;
+			t_result = super.stopTracking();
+			if (t_result && !isTracking())
+				m_last_location = null;
+			return t_result;
+		}
+	}
+	
     class HeadingTracker extends Tracker implements SensorEventListener
     {
         private Sensor m_magnetometer;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash on Android when restarting the location tracker`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Allow seek command to reset "eof" result after read command reaches the end of a file on macOS`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1601,6 +1601,11 @@ class MCStdioFileHandle: public MCSystemFileHandle`
`1601`	`1601`	`virtual bool Seek(int64_t offset, int p_dir)`
`1602`	`1602`	`{`
`1603`	`1603`	`// TODO Add MCSystemFileHandle::SetStream(char *newptr) ?`
	`1604`	`+ if (m_is_eof)`
	`1605`	`+ {`
	`1606`	`+ clearerr(m_stream);`
	`1607`	`+ m_is_eof = false;`
	`1608`	`+ }`
`1604`	`1609`	`return fseeko(m_stream, offset, p_dir < 0 ? SEEK_END : (p_dir > 0 ? SEEK_SET : SEEK_CUR)) == 0;`
`1605`	`1610`	`}`
`1606`	`1611`