diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml index dbcb92f..783fdbe 100644 --- a/app/src/apkFlavor/AndroidManifest.xml +++ b/app/src/apkFlavor/AndroidManifest.xml @@ -74,9 +74,7 @@ - + diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml index 4e589db..0594872 100644 --- a/app/src/fdroidFlavor/AndroidManifest.xml +++ b/app/src/fdroidFlavor/AndroidManifest.xml @@ -72,9 +72,7 @@ - + diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml index e3ac22c..ecf1971 100644 --- a/app/src/googlePlayFlavor/AndroidManifest.xml +++ b/app/src/googlePlayFlavor/AndroidManifest.xml @@ -68,13 +68,11 @@ - + - + diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java index c010e5e..7653aa3 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java @@ -191,7 +191,7 @@ public class ActivityManageTriggerNfc extends Activity @Override protected void onPause() { - /** + /* * Call this before onPause, otherwise an IllegalArgumentException is thrown as well. */ disableForegroundDispatch(this); @@ -203,7 +203,7 @@ public class ActivityManageTriggerNfc extends Activity protected void onResume() { super.onResume(); - /** + /* * It's important, that the activity is in the foreground (resumed). Otherwise * an IllegalStateException is thrown. */ @@ -237,10 +237,18 @@ public class ActivityManageTriggerNfc extends Activity if(currentStatus == 0) { generatedId = NfcReceiver.readTag(discoveredTag); - if(generatedId != null && generatedId.length() > 0) - tvCurrentNfcId.setText(generatedId); + if(generatedId != null && generatedId.length() > 0) + { + tvCurrentNfcId.setText(generatedId); + bReadNfcTag.setEnabled(true); + bUseValueCurrentlyStored.setEnabled(true); + } else - tvCurrentNfcId.setText(getResources().getString(R.string.nfcTagDataNotUsable)); + { + tvCurrentNfcId.setText(getResources().getString(R.string.nfcTagDataNotUsable)); + bReadNfcTag.setEnabled(false); + bUseValueCurrentlyStored.setEnabled(false); + } } else if(currentStatus == 1) { diff --git a/app/src/main/java/com/jens/automation2/AutomationService.java b/app/src/main/java/com/jens/automation2/AutomationService.java index 4b266d6..2833407 100644 --- a/app/src/main/java/com/jens/automation2/AutomationService.java +++ b/app/src/main/java/com/jens/automation2/AutomationService.java @@ -1,5 +1,7 @@ package com.jens.automation2; +import static android.app.PendingIntent.FLAG_IMMUTABLE; + import android.Manifest; import android.annotation.SuppressLint; import android.app.ActivityManager; @@ -502,7 +504,12 @@ public class AutomationService extends Service implements OnInitListener if(Miscellaneous.googleToBlameForLocation(true)) { Intent intent = new Intent(AutomationService.this, ActivityMainTabLayout.class); - PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0); + PendingIntent pi; + +// if(Miscellaneous.getTargetSDK(AutomationService.this) >= Build.VERSION_CODES.S) + pi = PendingIntent.getActivity(AutomationService.this, 0, intent, FLAG_IMMUTABLE); +// else +// pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0); Miscellaneous.logEvent("w", "Features disabled", "Background location disabled because Google to blame.", 5); diff --git a/app/src/main/java/com/jens/automation2/receivers/NfcReceiver.java b/app/src/main/java/com/jens/automation2/receivers/NfcReceiver.java index 2798f13..dee14a4 100644 --- a/app/src/main/java/com/jens/automation2/receivers/NfcReceiver.java +++ b/app/src/main/java/com/jens/automation2/receivers/NfcReceiver.java @@ -290,7 +290,7 @@ public class NfcReceiver Miscellaneous.logEvent("e", "NFC", "Error writing tag: " + Log.getStackTraceString(e), 2); } - return false; + return false; } public static boolean checkNfcRequirements(Context context, boolean showErrorMessage) diff --git a/fastlane/metadata/android/en-US/changelogs/145.txt b/fastlane/metadata/android/en-US/changelogs/145.txt index 9f9b45d..7420fd2 100644 --- a/fastlane/metadata/android/en-US/changelogs/145.txt +++ b/fastlane/metadata/android/en-US/changelogs/145.txt @@ -7,4 +7,5 @@ * Fixed: Vibrate action didn't work on some devices * Fixed: Variable trigger didn't always compare correctly. * Fixed: Permission check for ability to schedule exact timers +* Fixed: Crash in Google Play version * Added Possibility to select UI theme, hence enabling modern UI designs \ No newline at end of file