jens/Automation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Phone Listener changed.

Browse Source
This commit is contained in:
jens
2021-05-15 02:27:59 +02:00
parent 191ad904a3
commit 3844079781
6 changed files with 91 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/apkFlavor/java/com/jens/automation2/Rule.java
View File

@ -609,13 +609,11 @@ public class Rule implements Comparable<Rule>
{
//if(PhoneStatusListener.isInACall() == oneTrigger.getTriggerParameter())
if(
elements[0].equals(Trigger.triggerPhoneCallStateAny)
||
(elements[0].equals(Trigger.triggerPhoneCallStateRinging) && PhoneStatusListener.getLastState() == TelephonyManager.CALL_STATE_RINGING)
(elements[0].equals(Trigger.triggerPhoneCallStateRinging) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_RINGING)
||
(elements[0].equals(Trigger.triggerPhoneCallStateStarted) && PhoneStatusListener.getLastState() == TelephonyManager.CALL_STATE_OFFHOOK)
(elements[0].equals(Trigger.triggerPhoneCallStateStarted) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_OFFHOOK)
||
(elements[0].equals(Trigger.triggerPhoneCallStateStopped) && PhoneStatusListener.getLastState() == TelephonyManager.CALL_STATE_IDLE)
(elements[0].equals(Trigger.triggerPhoneCallStateStopped) && PhoneStatusListener.getCurrentState() == TelephonyManager.CALL_STATE_IDLE)
)
{
if(
@ -1362,28 +1360,28 @@ public class Rule implements Comparable<Rule>
return ruleCandidates;
}
public static ArrayList<Rule> findRuleCandidatesByPhoneCall(boolean triggerParameter)
{
ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
for(Rule oneRule : ruleCollection)
{
innerloop:
for(Trigger oneTrigger : oneRule.getTriggerSet())
{
if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
{
if(oneTrigger.getTriggerParameter() == triggerParameter)
{
ruleCandidates.add(oneRule);
break innerloop; //we don't need to search the other triggers in the same rule
}
}
}
}
return ruleCandidates;
}
// public static ArrayList<Rule> findRuleCandidatesByPhoneCall()
// {
// ArrayList<Rule> ruleCandidates = new ArrayList<Rule>();
//
// for(Rule oneRule : ruleCollection)
// {
// innerloop:
// for(Trigger oneTrigger : oneRule.getTriggerSet())
// {
// if(oneTrigger.getTriggerType() == Trigger.Trigger_Enum.phoneCall)
// {
// if(oneTrigger.getTriggerParameter() == triggerParameter)
// {
// ruleCandidates.add(oneRule);
// break innerloop; //we don't need to search the other triggers in the same rule
// }
// }
// }
// }
//
// return ruleCandidates;
// }
public static ArrayList<Rule> findRuleCandidatesByNfc()
{