diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml index 4756587..6bca09c 100644 --- a/app/src/apkFlavor/AndroidManifest.xml +++ b/app/src/apkFlavor/AndroidManifest.xml @@ -165,6 +165,7 @@ + diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml index 821c7fc..77a006c 100644 --- a/app/src/fdroidFlavor/AndroidManifest.xml +++ b/app/src/fdroidFlavor/AndroidManifest.xml @@ -163,6 +163,7 @@ + diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml index 736f13f..5d60ad4 100644 --- a/app/src/googlePlayFlavor/AndroidManifest.xml +++ b/app/src/googlePlayFlavor/AndroidManifest.xml @@ -150,6 +150,7 @@ + diff --git a/app/src/main/java/com/jens/automation2/Action.java b/app/src/main/java/com/jens/automation2/Action.java index f765e6c..817f663 100644 --- a/app/src/main/java/com/jens/automation2/Action.java +++ b/app/src/main/java/com/jens/automation2/Action.java @@ -49,6 +49,7 @@ public class Action vibrate, createNotification, closeNotification, + sendBroadcast, sendTextMessage; public String getFullName(Context context) @@ -119,6 +120,8 @@ public class Action return context.getResources().getString(R.string.createNotification); case closeNotification: return context.getResources().getString(R.string.closeNotifications); + case sendBroadcast: + return context.getResources().getString(R.string.sendBroadcast); default: return "Unknown"; } @@ -259,6 +262,9 @@ public class Action case closeNotification: returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.closeNotifications)); break; + case sendBroadcast: + returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendBroadcast)); + break; default: returnString.append(action.toString()); } @@ -534,6 +540,9 @@ public class Action else Miscellaneous.logEvent("w", "Close notification", "Close notification was requested, but OS version is too low: " + String.valueOf(Build.VERSION.SDK_INT), 2); break; + case sendBroadcast: + Actions.sendBroadcast(context, this.getParameter2()); + break; default: Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3); break; @@ -637,7 +646,7 @@ public class Action //Do something with result //Toast.makeText(context, text, duration) result; Miscellaneous.logEvent("i", "HTTP RESULT", result, 3); - Actions myAction=new Actions(); + Actions myAction = new Actions(); myAction.useDownloadedWebpage(result); } } diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java index 9d494ea..d3c0d5f 100644 --- a/app/src/main/java/com/jens/automation2/Actions.java +++ b/app/src/main/java/com/jens/automation2/Actions.java @@ -185,7 +185,15 @@ public class Actions } } - public static class WifiStuff + public static void sendBroadcast(Context context, String action) + { + Miscellaneous.logEvent("i", "sendBroadcast", "Sending broadcast with action " + action, 5); + Intent broadcastIntent = new Intent(); + broadcastIntent.setAction(action); + context.sendBroadcast(broadcastIntent); + } + + public static class WifiStuff { public static Boolean setWifi(Context context, Boolean desiredState, boolean toggleActionIfPossible) { diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java new file mode 100644 index 0000000..f346984 --- /dev/null +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java @@ -0,0 +1,83 @@ +package com.jens.automation2; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import androidx.annotation.Nullable; + +import org.apache.commons.lang3.StringUtils; + +public class ActivityManageActionSendBroadcast extends Activity +{ + EditText etBroadcastToSend; + Button bBroadcastSendShowSuggestions, bSaveSendBroadcast; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_manage_action_send_broadcast); + + etBroadcastToSend = (EditText)findViewById(R.id.etBroadcastToSend); + bBroadcastSendShowSuggestions = (Button)findViewById(R.id.bBroadcastSendShowSuggestions); + bSaveSendBroadcast = (Button)findViewById(R.id.bSaveSendBroadcast); + + bSaveSendBroadcast.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View view) + { + if(checkInput()) + { + Intent answer = new Intent(); + answer.putExtra(ActivityManageRule.intentNameActionParameter2, etBroadcastToSend.getText().toString()); + setResult(RESULT_OK, answer); + finish(); + } + } + }); + + bBroadcastSendShowSuggestions.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) + { + AlertDialog.Builder builder = new AlertDialog.Builder(ActivityManageActionSendBroadcast.this); + builder.setTitle(getResources().getString(R.string.selectBroadcast)); + builder.setItems(ActivityManageTriggerBroadcast.broadcastSuggestions, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialogInterface, int which) + { + etBroadcastToSend.setText(ActivityManageTriggerBroadcast.broadcastSuggestions[which]); + } + }); + builder.create().show(); + } + }); + + Intent input = getIntent(); + + if(input.hasExtra(ActivityManageRule.intentNameActionParameter2)) + etBroadcastToSend.setText(input.getStringExtra(ActivityManageRule.intentNameActionParameter2)); + } + + boolean checkInput() + { + String broadcastToSend = etBroadcastToSend.getText().toString(); + if(StringUtils.isEmpty(broadcastToSend)) + { + Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.enterBroadcast), Toast.LENGTH_SHORT).show(); + return false; + } + + return true; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java index cdb1fd3..a64e6dc 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java @@ -121,6 +121,8 @@ public class ActivityManageRule extends Activity final static int requestCodeActionControlMediaEdit = 808; final static int requestCodeTriggerBroadcastReceivedAdd = 809; final static int requestCodeTriggerBroadcastReceivedEdit = 810; + final static int requestCodeActionSendBroadcastAdd = 811; + final static int requestCodeActionSendBroadcastEdit = 812; public static ActivityManageRule getInstance() { @@ -375,6 +377,11 @@ public class ActivityManageRule extends Activity activityEditVibrateIntent.putExtra("vibratePattern", a.getParameter2()); startActivityForResult(activityEditVibrateIntent, requestCodeActionVibrateEdit); break; + case sendBroadcast: + Intent activityEditSendBroadcastIntent = new Intent(ActivityManageRule.this, ActivityManageActionSendBroadcast.class); + activityEditSendBroadcastIntent.putExtra(intentNameActionParameter2, a.getParameter2()); + startActivityForResult(activityEditSendBroadcastIntent, requestCodeActionSendBroadcastEdit); + break; case controlMediaPlayback: Intent activityEditControlMediaIntent = new Intent(ActivityManageRule.this, ActivityManageActionControlMedia.class); activityEditControlMediaIntent.putExtra(ActivityManageRule.intentNameActionParameter2, a.getParameter2()); @@ -1472,6 +1479,16 @@ public class ActivityManageRule extends Activity this.refreshActionList(); } } + else if(requestCode == requestCodeActionSendBroadcastAdd) + { + if(resultCode == RESULT_OK) + { + newAction.setParentRule(ruleToEdit); + newAction.setParameter2(data.getStringExtra(intentNameActionParameter2)); + ruleToEdit.getActionSet().add(newAction); + this.refreshActionList(); + } + } else if(requestCode == requestCodeActionControlMediaAdd) { if(resultCode == RESULT_OK) @@ -1518,6 +1535,18 @@ public class ActivityManageRule extends Activity this.refreshActionList(); } } + else if(requestCode == requestCodeActionSendBroadcastEdit) + { + if(resultCode == RESULT_OK) + { + ruleToEdit.getActionSet().get(editIndex).setParentRule(ruleToEdit); + + if(data.hasExtra(intentNameActionParameter2)) + ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra(intentNameActionParameter2)); + + this.refreshActionList(); + } + } else if(requestCode == requestCodeActionControlMediaEdit) { if(resultCode == RESULT_OK) @@ -1728,6 +1757,8 @@ public class ActivityManageRule extends Activity items.add(new Item(typesLong[i].toString(), R.drawable.notification)); else if(types[i].toString().equals(Action_Enum.closeNotification.toString())) items.add(new Item(typesLong[i].toString(), R.drawable.notification)); + else if(types[i].toString().equals(Action_Enum.sendBroadcast.toString())) + items.add(new Item(typesLong[i].toString(), R.drawable.satellite)); else if(types[i].toString().equals(Action_Enum.sendTextMessage.toString())) { // if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this)) @@ -1890,6 +1921,12 @@ public class ActivityManageRule extends Activity Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionVibrate.class); startActivityForResult(intent, requestCodeActionVibrateAdd); } + else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.sendBroadcast.toString())) + { + newAction.setAction(Action_Enum.sendBroadcast); + Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionSendBroadcast.class); + startActivityForResult(intent, requestCodeActionSendBroadcastAdd); + } else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.controlMediaPlayback.toString())) { newAction.setAction(Action_Enum.controlMediaPlayback); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java index eb366e1..6c0888f 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java @@ -96,7 +96,7 @@ public class ActivityManageTriggerBroadcast extends Activity }); } - String[] broadcastSuggestions = { + public static String[] broadcastSuggestions = { "android.accounts.LOGIN_ACCOUNTS_CHANGED", "android.accounts.action.ACCOUNT_REMOVED", "android.app.action.ACTION_PASSWORD_CHANGED", diff --git a/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java b/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java index 934439b..599c07c 100644 --- a/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java +++ b/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java @@ -12,6 +12,7 @@ import android.provider.Settings; import androidx.annotation.RequiresApi; +import com.jens.automation2.Actions; import com.jens.automation2.ActivityPermissions; import com.jens.automation2.AutomationService; import com.jens.automation2.Miscellaneous; @@ -134,11 +135,11 @@ public class ScreenStateReceiver extends BroadcastReceiver implements Automation if(keyguardManager.isKeyguardLocked() && !keyguardManager.isDeviceLocked()) { - sendLockBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithoutSecurity); + Actions.sendBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithoutSecurity); } else if(keyguardManager.isDeviceLocked()) { - sendLockBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithSecurity); + Actions.sendBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithSecurity); } else { @@ -232,13 +233,13 @@ public class ScreenStateReceiver extends BroadcastReceiver implements Automation if(keyguardManager.isKeyguardLocked() && !keyguardManager.isDeviceLocked()) { - sendLockBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithoutSecurity); + Actions.sendBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithoutSecurity); timer.purge(); timer.cancel(); } else if(keyguardManager.isDeviceLocked()) { - sendLockBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithSecurity); + Actions.sendBroadcast(Miscellaneous.getAnyContext(), broadcastScreenLockedWithSecurity); timer.purge(); timer.cancel(); } @@ -270,11 +271,4 @@ public class ScreenStateReceiver extends BroadcastReceiver implements Automation timer.scheduleAtFixedRate(task, 0, interval); } } - - static void sendLockBroadcast(Context context, String lockType) - { - Intent lockedBroadcastIntent = new Intent(); - lockedBroadcastIntent.setAction(lockType); - context.sendBroadcast(lockedBroadcastIntent); - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manage_action_send_broadcast.xml b/app/src/main/res/layout/activity_manage_action_send_broadcast.xml new file mode 100644 index 0000000..56b1ffe --- /dev/null +++ b/app/src/main/res/layout/activity_manage_action_send_broadcast.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + +