diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java index c31e3af..cd9591a 100644 --- a/app/src/main/java/com/jens/automation2/Actions.java +++ b/app/src/main/java/com/jens/automation2/Actions.java @@ -1117,7 +1117,9 @@ public class Actions if (!packageName.equals(dummyPackageString)) { - externalApplicationIntent.setPackage(packageName); + if(!packageName.isEmpty()) + externalApplicationIntent.setPackage(packageName); + if (!StringUtils.isEmpty(className)) externalApplicationIntent.setClassName(packageName, className); } @@ -1138,8 +1140,8 @@ public class Actions { if (Miscellaneous.isNumeric(startupType)) externalApplicationIntent = packParametersIntoIntent(externalApplicationIntent, params, 4); - else - externalApplicationIntent = packParametersIntoIntent(externalApplicationIntent, params, 3); +// else +// externalApplicationIntent = packParametersIntoIntent(externalApplicationIntent, params, 3); } if (startupType.equals(ActivityManageActionStartActivity.startByActivityString)) @@ -1227,7 +1229,6 @@ public class Actions { Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with value " + singleParam[2] + " as standard data parameter.", 3); intent.setData(Uri.parse(Miscellaneous.replaceVariablesInText(singleParam[2], context))); - } else { diff --git a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java index 9392885..d50faad 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java +++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java @@ -128,9 +128,9 @@ public class ActivityMainScreen extends ActivityGeneric @Override public void onClick(View v) { - String privacyPolicyUrl = "https://server47.de/donate"; + String donationUrl = "https://server47.de/donate"; - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(privacyPolicyUrl)); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(donationUrl)); startActivity(browserIntent); } }); diff --git a/app/src/main/java/com/jens/automation2/location/CellLocationChangedReceiver.java b/app/src/main/java/com/jens/automation2/location/CellLocationChangedReceiver.java index 8a5de11..1877529 100644 --- a/app/src/main/java/com/jens/automation2/location/CellLocationChangedReceiver.java +++ b/app/src/main/java/com/jens/automation2/location/CellLocationChangedReceiver.java @@ -363,10 +363,10 @@ public class CellLocationChangedReceiver extends PhoneStateListener // Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because we have no data connection.", 4); } else - Miscellaneous.logEvent("w", "cellReceiver", "Wanted to activate CellLocationChangedReceiver, but Wifi-Receiver says not to.", 4); + Miscellaneous.logEvent("w", "cellReceiver", "Wanted to activate CellLocationChangedReceiver, but Wifi-Receiver says not to.", 5); } else - Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because Airplane mode is active or SIM_STATE is not ready.", 4); + Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because Airplane mode is active or SIM_STATE is not ready.", 5); } } catch(Exception ex) diff --git a/app/src/main/java/com/jens/automation2/location/SensorActivity.java b/app/src/main/java/com/jens/automation2/location/SensorActivity.java index 9a06a09..228bc82 100644 --- a/app/src/main/java/com/jens/automation2/location/SensorActivity.java +++ b/app/src/main/java/com/jens/automation2/location/SensorActivity.java @@ -64,36 +64,36 @@ public class SensorActivity implements SensorEventListener { } - public void onSensorChanged(SensorEvent event) - { - // Device has been moved + public void onSensorChanged(SensorEvent event) + { + // Device has been moved - float x = event.values[0]; - float y = event.values[1]; - float z = event.values[2]; + float x = event.values[0]; + float y = event.values[1]; + float z = event.values[2]; - if(mInitialized) - { - deltaX = Math.abs(lastX-x); - deltaY = Math.abs(lastY-y); - deltaZ = Math.abs(lastZ-z); - //Wenn das jetzt einen gewissen Grenzwert übersteigt, müßten wir den CellListener wieder aktivieren - if(deltaX > Settings.accelerometerMovementThreshold | deltaY > Settings.accelerometerMovementThreshold | deltaZ > Settings.accelerometerMovementThreshold) - { - String text = "Device has been moved. " + String.valueOf(deltaX)+" / "+String.valueOf(deltaY)+" / "+String.valueOf(deltaZ); - Miscellaneous.logEvent("i", "Accelerometer", text, 5); - CellLocationChangedReceiver.resetFollowUpdate(); - CellLocationChangedReceiver.startCellLocationChangedReceiver(); + if(mInitialized) + { + deltaX = Math.abs(lastX-x); + deltaY = Math.abs(lastY-y); + deltaZ = Math.abs(lastZ-z); + // If that exceeds a certain delta we need to start CellLocationListener again + if(deltaX > Settings.accelerometerMovementThreshold | deltaY > Settings.accelerometerMovementThreshold | deltaZ > Settings.accelerometerMovementThreshold) + { + String text = "Device has been moved. " + String.valueOf(deltaX)+" / "+String.valueOf(deltaY)+" / "+String.valueOf(deltaZ); + Miscellaneous.logEvent("i", "Accelerometer", text, 5); + CellLocationChangedReceiver.resetFollowUpdate(); + CellLocationChangedReceiver.startCellLocationChangedReceiver(); } - } - else - { - lastX = x; - lastY = y; - lastZ = z; - mInitialized = true; - } - } + } + else + { + lastX = x; + lastY = y; + lastZ = z; + mInitialized = true; + } + } protected static void startAccelerometerReceiver() { diff --git a/app/src/main/java/com/jens/automation2/receivers/DeviceOrientationListener.java b/app/src/main/java/com/jens/automation2/receivers/DeviceOrientationListener.java index 72dd511..b36b5ab 100644 --- a/app/src/main/java/com/jens/automation2/receivers/DeviceOrientationListener.java +++ b/app/src/main/java/com/jens/automation2/receivers/DeviceOrientationListener.java @@ -34,11 +34,11 @@ public class DeviceOrientationListener implements SensorEventListener, Automatio static int sensorValueCounter = 0; // Gravity rotational data - float gravity[]; + float[] gravity; // Magnetic rotational data - float magnetic[]; //for magnetic rotational data - float accels[] = new float[3]; - float mags[] = new float[3]; + float[] magnetic; //for magnetic rotational data + float[] accels = new float[3]; + float[] mags = new float[3]; float[] values = new float[3]; boolean hasMagneticSensor=false; diff --git a/fastlane/metadata/android/en-US/changelogs/145.txt b/fastlane/metadata/android/en-US/changelogs/145.txt index e9235ed..31ea71f 100644 --- a/fastlane/metadata/android/en-US/changelogs/145.txt +++ b/fastlane/metadata/android/en-US/changelogs/145.txt @@ -11,4 +11,5 @@ * Fixed: Added waiting period for vibrations and separate thread for trying a sequence. * Fixed: Buttons in NFC screen weren't enabled. * Fixed: NFC tag triggers didn't cause a second execution if a tag was removed and presented again. +* Fixed: Package name in startActivity action was incorrectly set to an empty String instead of leaving it as null. That sometimes caused startActivity to have no effect. * Added Possibility to select UI theme, hence enabling modern UI designs \ No newline at end of file