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

Notification trigger.

Browse Source
This commit is contained in:
Jens
2021-03-28 23:23:29 +02:00
parent 7894504791
commit fb44196a0d
7 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/jens/automation2/Action.java
View File

@ -215,9 +215,9 @@ public class Action
{
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice));
}
else if(this.getAction().equals(Action_Enum.playMusic))
else if(this.getAction().equals(Action_Enum.playSound))
{
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound) + " " + getParameter2());
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.playSound) + ": " + getParameter2());
}
else
returnString.append(action.toString());

23
app/src/main/java/com/jens/automation2/ActivityManageRule.java
View File

@ -1255,6 +1255,29 @@ public class ActivityManageRule extends Activity
this.refreshActionList();
}
}
else if(requestCode == requestCodeActionPlaySoundAdd)
{
if(resultCode == RESULT_OK)
{
newAction.setParameter1(data.getBooleanExtra("actionParameter1", false));
newAction.setParameter2(String.valueOf(data.getIntExtra("actionParameter2", 0)));
ruleToEdit.getActionSet().add(newAction);
this.refreshActionList();
}
}
else if(requestCode == requestCodeActionPlaySoundEdit)
{
if(resultCode == RESULT_OK)
{
if(data.hasExtra("actionParameter1"))
ruleToEdit.getActionSet().get(editIndex).setParameter1(data.getBooleanExtra("actionParameter1", false));
if(data.hasExtra("actionParameter2"))
ruleToEdit.getActionSet().get(editIndex).setParameter2(String.valueOf(data.getIntExtra("actionParameter2", 0)));
this.refreshActionList();
}
}
//TODO: Check with has data been changed or something like that.
/*try

23
app/src/main/java/com/jens/automation2/ActivityPermissions.java
View File

@ -1444,14 +1444,21 @@ public class ActivityPermissions extends Activity
public static Boolean verifyNotificationPermission()
{
String theList = android.provider.Settings.Secure.getString(Miscellaneous.getAnyContext().getContentResolver(), "enabled_notification_listeners");
String[] theListList = theList.split(":");
String me = (new ComponentName(Miscellaneous.getAnyContext(), NotificationListener.class)).flattenToString();
for ( String next : theListList )
try
{
if ( me.equals(next) )
return true;
String theList = android.provider.Settings.Secure.getString(Miscellaneous.getAnyContext().getContentResolver(), "enabled_notification_listeners");
String[] theListList = theList.split(":");
String me = (new ComponentName(Miscellaneous.getAnyContext(), NotificationListener.class)).flattenToString();
for (String next : theListList)
{
if (me.equals(next))
return true;
}
return false;
}
catch(Exception e)
{
return false;
}
return false;
}
}
}

2
app/src/main/java/com/jens/automation2/XmlFileInterface.java
View File

@ -899,6 +899,8 @@ public class XmlFileInterface
newTrigger.setTriggerType(Trigger_Enum.bluetoothConnection);
else if(triggerEventString.equals("headsetPlugged"))
newTrigger.setTriggerType(Trigger_Enum.headsetPlugged);
else if(triggerEventString.equals("notification"))
newTrigger.setTriggerType(Trigger_Enum.notification);
}
else if (name.equals("TriggerParameter1"))
{