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

This commit is contained in:
jens 2022-03-05 20:59:33 +01:00
commit 965bf55811
4 changed files with 20 additions and 38 deletions

View File

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

View File

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

View File

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

View File

@ -217,6 +217,8 @@ public class NfcReceiver
NdefMessage ndefMessage = ndef.getCachedNdefMessage(); NdefMessage ndefMessage = ndef.getCachedNdefMessage();
if(ndefMessage != null)
{
NdefRecord[] records = ndefMessage.getRecords(); NdefRecord[] records = ndefMessage.getRecords();
for (NdefRecord ndefRecord : records) for (NdefRecord ndefRecord : records)
{ {
@ -232,6 +234,7 @@ public class NfcReceiver
} }
} }
} }
}
return null; return null;
} }