Merge remote-tracking branch 'origin/development-stable' into development

app/src/apkFlavor/java/com/jens/automation2/Rule.java

@@ -312,19 +312,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:

app/src/fdroidFlavor/java/com/jens/automation2/Rule.java

@@ -309,19 +309,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:

app/src/googlePlayFlavor/java/com/jens/automation2/Rule.java

@@ -312,19 +312,12 @@ public class Rule implements Comparable<Rule>
 			switch(action.getAction())
 			{
 				case setAirplaneMode:
-					return true;
 				case setBluetooth:
-					return true;
 				case setDataConnection:
-					return true;
 				case setDisplayRotation:
-					return true;
 				case setUsbTethering:
-					return true;
 				case setWifi:
-					return true;
 				case setWifiTethering:
-					return true;
 				case setBluetoothTethering:
 					return true;
 				default:

app/src/main/java/com/jens/automation2/receivers/NfcReceiver.java

@@ -216,23 +216,26 @@ public class NfcReceiver
         }
  
         NdefMessage ndefMessage = ndef.getCachedNdefMessage();
- 
-        NdefRecord[] records = ndefMessage.getRecords();
-        for (NdefRecord ndefRecord : records)
-        {
-            if (ndefRecord.getTnf() == NdefRecord.TNF_WELL_KNOWN && Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT))
-            {
-                try
-                {
-                    return readText(ndefRecord);
-                }
-                catch (UnsupportedEncodingException e)
-                {
-                    Miscellaneous.logEvent("w", "NFC", "Unsupported Encoding: " +  Log.getStackTraceString(e), 3);
-                }
-            }
-        }
- 
+
+        if(ndefMessage != null)
+		{
+			NdefRecord[] records = ndefMessage.getRecords();
+			for (NdefRecord ndefRecord : records)
+			{
+				if (ndefRecord.getTnf() == NdefRecord.TNF_WELL_KNOWN && Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT))
+				{
+					try
+					{
+						return readText(ndefRecord);
+					}
+					catch (UnsupportedEncodingException e)
+					{
+						Miscellaneous.logEvent("w", "NFC", "Unsupported Encoding: " + Log.getStackTraceString(e), 3);
+					}
+				}
+			}
+		}
+
         return null;
 	}