Location without Cell Radio

app/src/main/java/com/jens/automation2/ActivityMainScreen.java

@@ -29,6 +29,7 @@ import androidx.core.text.HtmlCompat;
 
 import com.jens.automation2.AutomationService.serviceCommands;
 import com.jens.automation2.Trigger.Trigger_Enum;
+import com.jens.automation2.location.CellLocationChangedReceiver;
 import com.jens.automation2.location.LocationProvider;
 
 import java.io.File;

app/src/main/java/com/jens/automation2/ActivityManagePoi.java

@@ -22,6 +22,8 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import com.jens.automation2.receivers.ConnectivityReceiver;
+
 import java.util.Calendar;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -163,7 +165,7 @@ public class ActivityManagePoi extends Activity
 			locationSearchStart = Calendar.getInstance();
 			startTimeout();
 
-			if(!Settings.privacyLocationing)
+			if(!Settings.privacyLocationing || !ConnectivityReceiver.isDataConnectionAvailable(AutomationService.getInstance()))
 			{
 				Miscellaneous.logEvent("i", "POI Manager", getResources().getString(R.string.logGettingPositionWithProvider) + " " + provider1, 3);
 				myLocationManager.requestLocationUpdates(provider1, 500, Settings.satisfactoryAccuracyNetwork, myLocationListenerNetwork);

app/src/main/java/com/jens/automation2/AutomationService.java

@@ -333,7 +333,7 @@ public class AutomationService extends Service implements OnInitListener
 
 	protected void startLocationProvider()
 	{
-		if(ActivityPermissions.havePermission("android.permission.ACCESS_COARSE_LOCATION", AutomationService.this))
+		if(ActivityPermissions.havePermission(Manifest.permission.ACCESS_COARSE_LOCATION, AutomationService.this))
 			myLocationProvider = new LocationProvider(this); //autostart with this (only) constructor
 	}
 
@@ -632,6 +632,9 @@ public class AutomationService extends Service implements OnInitListener
 //				}
 //				else
 //				{
+					if(notificationBuilder == null)
+							notificationBuilder = createDefaultNotificationBuilder();
+
 					notificationBuilder.setContentText(textToDisplay);
 					notificationBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(textToDisplay));
 

app/src/main/java/com/jens/automation2/ReceiverCoordinator.java

@@ -144,14 +144,14 @@ public class ReceiverCoordinator
         ConnectivityReceiver.startConnectivityReceiver(AutomationService.getInstance());
 
         // startCellLocationChangedReceiver
-        if(!ConnectivityReceiver.isAirplaneMode(AutomationService.getInstance()) && WifiBroadcastReceiver.mayCellLocationReceiverBeActivated() && (Rule.isAnyRuleUsing(Trigger.Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger.Trigger_Enum.speed)))
+        if(!ConnectivityReceiver.isAirplaneMode(AutomationService.getInstance()) && WifiBroadcastReceiver.mayCellLocationReceiverBeActivated() && (Rule.isAnyRuleUsing(Trigger.Trigger_Enum.pointOfInterest) || Rule.isAnyRuleUsing(Trigger.Trigger_Enum.speed)))
         {
             if(!Miscellaneous.googleToBlameForLocation(true))
                 CellLocationChangedReceiver.startCellLocationChangedReceiver();
         }
 
         // startBatteryReceiver
-        if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.charging) | Rule.isAnyRuleUsing(Trigger.Trigger_Enum.usb_host_connection) | Rule.isAnyRuleUsing(Trigger.Trigger_Enum.batteryLevel))
+        if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.charging) || Rule.isAnyRuleUsing(Trigger.Trigger_Enum.usb_host_connection) || Rule.isAnyRuleUsing(Trigger.Trigger_Enum.batteryLevel))
             BatteryReceiver.startBatteryReceiver(AutomationService.getInstance());
 
         // startAlarmListener

app/src/main/java/com/jens/automation2/location/CellLocationChangedReceiver.java

@@ -130,6 +130,21 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 		}
 	}
 
+	public static boolean isCellLocationChangedReceiverPossible()
+	{
+		if(telephonyManager == null)
+			telephonyManager = (TelephonyManager) AutomationService.getInstance().getSystemService(Context.TELEPHONY_SERVICE);
+
+		if(
+			ConnectivityReceiver.isAirplaneMode(AutomationService.getInstance())
+										||
+			telephonyManager.getSimState() != TelephonyManager.SIM_STATE_READY
+		)
+			return false;
+		else
+			return true;
+	}
+
 	public Location getLocation(String accuracy)
 	{
 		Criteria crit = new Criteria();
@@ -137,7 +152,7 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 		String myProviderName;
 		
 		// If privacy mode or no data connection available
-		if(Settings.privacyLocationing | !ConnectivityReceiver.isDataConnectionAvailable(AutomationService.getInstance()))
+		if(Settings.privacyLocationing || !ConnectivityReceiver.isDataConnectionAvailable(AutomationService.getInstance()))
 		{
 			Miscellaneous.logEvent("i", "CellLocation", Miscellaneous.getAnyContext().getResources().getString(R.string.enforcingGps), 4);
 			myProviderName = LocationManager.GPS_PROVIDER;
@@ -175,6 +190,9 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 		}
 		else
 		{
+			if(myLocationManager == null)
+				myLocationManager = (LocationManager) AutomationService.getInstance().getSystemService(Context.LOCATION_SERVICE);
+
 			if(!myLocationManager.isProviderEnabled(myProviderName))
 			{
 				if(myProviderName.equals(LocationManager.NETWORK_PROVIDER))
@@ -226,13 +244,11 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 		return currentLocation;
 	}
 
-
 	public void setCurrentLocation(Location currentLocation)
 	{
 		this.currentLocation = currentLocation;
 	}
 
-
 	public class MyLocationListener implements LocationListener
 	{
 		@Override
@@ -327,7 +343,7 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 		{
 			if(!cellLocationListenerActive)
 			{				
-				if(!ConnectivityReceiver.isAirplaneMode(AutomationService.getInstance()))
+				if(!ConnectivityReceiver.isAirplaneMode(AutomationService.getInstance()) && telephonyManager.getSimState() == TelephonyManager.SIM_STATE_READY)
 				{
 					if(WifiBroadcastReceiver.mayCellLocationReceiverBeActivated())
 					{
@@ -356,7 +372,7 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 						Miscellaneous.logEvent("w", "cellReceiver", "Wanted to activate CellLocationChangedReceiver,  but Wifi-Receiver says not to.", 4);
 				}
 				else
-					Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because Airplane mode is active.", 4);
+					Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because Airplane mode is active or SIM_STATE is not ready.", 4);
 			}
 		}
 		catch(Exception ex)
@@ -410,4 +426,3 @@ public class CellLocationChangedReceiver extends PhoneStateListener
 				ActivityPermissions.havePermission("android.permission.ACCESS_WIFI_STATE", Miscellaneous.getAnyContext());
 	}
 }
-

app/src/main/java/com/jens/automation2/location/LocationProvider.java

@@ -7,6 +7,7 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.jens.automation2.ActivityMainScreen;
@@ -26,13 +27,9 @@ import java.util.Calendar;
 
 public class LocationProvider
 {
-	
 	protected static boolean passiveLocationListenerActive = false;
-	
 	protected static LocationListener passiveLocationListener;
-	
 	protected static LocationProvider locationProviderInstance = null;
-	
 	protected AutomationService parentService;
 	public AutomationService getParentService()
 	{
@@ -108,6 +105,8 @@ public class LocationProvider
 	}
 
 	public void setCurrentLocation(Location newLocation, boolean skipVerification)
+	{
+		if(newLocation != null)
 		{
 			Miscellaneous.logEvent("i", "Location", "Setting location.", 4);
 
@@ -119,12 +118,12 @@ public class LocationProvider
 
 			try
 			{
-			if(
+				if (
 						locationList.size() >= 1
 								&&
-				locationList.get(locationList.size()-1).getTime() == newLocation.getTime()
+								locationList.get(locationList.size() - 1).getTime() == newLocation.getTime()
 								&&
-				locationList.get(locationList.size()-1).getProvider().equals(newLocation.getProvider())
+								locationList.get(locationList.size() - 1).getProvider().equals(newLocation.getProvider())
 				)
 				{
 					// This is a duplicate update, do not store it
@@ -137,7 +136,7 @@ public class LocationProvider
 
 					locationList.add(newLocation);
 
-				if(newLocation.hasSpeed())
+					if (newLocation.hasSpeed())
 					{
 						Miscellaneous.logEvent("i", "Speed", "Location has speed, taking that: " + String.valueOf(newLocation.getSpeed()) + " km/h", 4);
 						setSpeed(newLocation.getSpeed());    // Take the value that came with the location, that should be more precise
@@ -157,7 +156,7 @@ public class LocationProvider
 						/*
 							The two most recent locations in the list must have a usable accuracy.
 						 */
-						for(int i = 0; i < 2; i++)
+							for (int i = 0; i < 2; i++)
 							{
 								if
 								(
@@ -217,16 +216,19 @@ public class LocationProvider
 					}
 				}
 			}
-		catch(Exception e)
+			catch (Exception e)
 			{
 				Miscellaneous.logEvent("e", "Speed", "Error during speed calculation: " + Log.getStackTraceString(e), 3);
 			}
 
 			AutomationService.updateNotification();
 
-		if(AutomationService.isMainActivityRunning(parentService))
+			if (AutomationService.isMainActivityRunning(parentService))
 				ActivityMainScreen.updateMainScreen();
 		}
+		else
+			Miscellaneous.logEvent("w", "Location", "New location given is null. Ignoring.", 5);
+	}
 
 	public void startLocationService()
 	{
@@ -244,14 +246,38 @@ public class LocationProvider
 
 		if(Settings.positioningEngine == 0)
 		{
+			if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed))
+			{
+//				TelephonyManager telephonyManager = (TelephonyManager) AutomationService.getInstance().getSystemService(Context.TELEPHONY_SERVICE);
+
 				// startCellLocationChangedReceiver
-			if (!ConnectivityReceiver.isAirplaneMode(this.parentService) && WifiBroadcastReceiver.mayCellLocationReceiverBeActivated() && (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed)))
+				if (CellLocationChangedReceiver.isCellLocationChangedReceiverPossible())
+				{
+					if (WifiBroadcastReceiver.mayCellLocationReceiverBeActivated())
 						CellLocationChangedReceiver.startCellLocationChangedReceiver();
+				}
+				else
+				{
+				/*
+					Reasons why we may end up here:
+					- Airplane mode is active
+					- No phone module present (pure wifi device)
+					- No SIM card is inserted or it's not unlocked
+
+					We'd have to try GPS now to get an initial position.
+					For permanent use there is no way we could know when it
+					would make sense to check the position again.
+				 */
+
+					// Trigger a one-time-position-search
+					Location loc = CellLocationChangedReceiver.getInstance().getLocation("fine");
+					LocationProvider.getInstance().setCurrentLocation(loc, true);
+				}
 
 				// startPassiveLocationListener
-			if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed))
 				startPassiveLocationListener();
 			}
+		}
 		else
 		{
 //			if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest))