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

Rework

Browse Source
This commit is contained in:
jens
2021-12-19 17:12:24 +01:00
parent 3d8257aeec
commit 64801d8ff2
16 changed files with 154 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,7 @@ public class Action
enableScreenRotation,disableScreenRotation,
startOtherActivity,
waitBeforeNextAction,
wakeupDevice,
turnScreenOnOrOff,
turnScreenOnOrOff,
setAirplaneMode,
setDataConnection,
speakText,
@ -91,8 +90,6 @@ public class Action
return context.getResources().getString(R.string.startOtherActivity);
case waitBeforeNextAction:
return context.getResources().getString(R.string.waitBeforeNextAction);
case wakeupDevice:
return context.getResources().getString(R.string.wakeupDevice);
case turnScreenOnOrOff:
return context.getResources().getString(R.string.turnScreenOnOrOff);
case vibrate:
@ -233,10 +230,6 @@ public class Action
{
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendTextMessage));
}
else if(this.getAction().equals(Action_Enum.wakeupDevice))
{
returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.wakeupDevice));
}
else if(this.getAction().equals(Action_Enum.turnScreenOnOrOff))
{
if(getParameter1())
@ -415,18 +408,6 @@ public class Action
case waitBeforeNextAction:
Actions.waitBeforeNextAction(Long.parseLong(this.getParameter2()));
break;
case wakeupDevice:
Actions.wakeupDevice(Long.parseLong(this.getParameter2()));
// wakeupDevice() will create a separate thread. That'll take some time, we wait 100ms.
try
{
Thread.sleep(100);
}
catch (InterruptedException e)
{
e.printStackTrace();
}
break;
case turnScreenOnOrOff:
if(getParameter1())
{

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

@ -1455,8 +1455,6 @@ public class ActivityManageRule extends Activity
items.add(new Item(typesLong[i].toString(), R.drawable.wait));
else if(types[i].toString().equals(Action_Enum.setAirplaneMode.toString()))
items.add(new Item(typesLong[i].toString(), R.drawable.plane));
else if(types[i].toString().equals(Action_Enum.wakeupDevice.toString()))
items.add(new Item(typesLong[i].toString(), R.drawable.alarm));
else if(types[i].toString().equals(Action_Enum.turnScreenOnOrOff.toString()))
items.add(new Item(typesLong[i].toString(), R.drawable.smartphone));
else if(types[i].toString().equals(Action_Enum.changeSoundProfile.toString()))
@ -1588,11 +1586,6 @@ public class ActivityManageRule extends Activity
newAction.setAction(Action_Enum.waitBeforeNextAction);
getActionWaitBeforeNextActionDialog(ActivityManageRule.this).show();
}
else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.wakeupDevice.toString()))
{
newAction.setAction(Action_Enum.wakeupDevice);
getActionWakeupDeviceDialog(ActivityManageRule.this).show();
}
else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.turnScreenOnOrOff.toString()))
{
newAction.setAction(Action_Enum.turnScreenOnOrOff);
@ -1604,7 +1597,6 @@ public class ActivityManageRule extends Activity
getActionParameter1Dialog(ActivityManageRule.this).show();
if(Build.VERSION.SDK_INT >= 17)
{
// Toast.makeText(context, getResources().getString(R.string.airplaneModeSdk17Warning), Toast.LENGTH_LONG).show();
Miscellaneous.messageBox(getResources().getString(R.string.airplaneMode), getResources().getString(R.string.rootExplanation), ActivityManageRule.this).show();
}
}

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

@ -596,9 +596,9 @@ public class ActivityPermissions extends Activity
if(
action.getParameter2().contains(Actions.wireguard_tunnel_up)
||
action.getParameter2().contains(Actions.wireguard_tunnel_down)
action.getParameter2().contains(Actions.wireguard_tunnel_down)
||
action.getParameter2().contains(Actions.wireguard_tunnel_refresh)
action.getParameter2().contains(Actions.wireguard_tunnel_refresh)
)
addToArrayListUnique(ActivityPermissions.permissionNameWireguard, requiredPermissions);
// if(
@ -626,42 +626,36 @@ public class ActivityPermissions extends Activity
break;
case turnUsbTetheringOff:
addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
// addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
break;
case turnUsbTetheringOn:
addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
// addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
break;
case turnWifiOff:
addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
// addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
break;
case turnWifiOn:
addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
// addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
break;
case turnWifiTetheringOff:
addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
// addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
break;
case turnWifiTetheringOn:
addToArrayListUnique(Manifest.permission.WRITE_SETTINGS, requiredPermissions);
// addToArrayListUnique(Manifest.permission.CHANGE_NETWORK_STATE, requiredPermissions);
addToArrayListUnique(Manifest.permission.ACCESS_NETWORK_STATE, requiredPermissions);
break;
case waitBeforeNextAction:
break;
case wakeupDevice:
addToArrayListUnique(Manifest.permission.WAKE_LOCK, requiredPermissions);
break;
case playSound:
addToArrayListUnique(Manifest.permission.READ_EXTERNAL_STORAGE, requiredPermissions);
break;
case turnScreenOnOrOff:
addToArrayListUnique(Manifest.permission.BIND_DEVICE_ADMIN, requiredPermissions);
if(action.getParameter1())
addToArrayListUnique(Manifest.permission.WAKE_LOCK, requiredPermissions);
else
addToArrayListUnique(Manifest.permission.BIND_DEVICE_ADMIN, requiredPermissions);
break;
default:
break;
@ -794,14 +788,6 @@ public class ActivityPermissions extends Activity
for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.wifiConnection))
usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
break;
/*case "android.permission.BATTERY_STATS":
for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.batteryLevel))
usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.charging))
usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.usb_host_connection))
usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
break;*/
case Manifest.permission.BLUETOOTH_ADMIN:
for(String ruleName : getRulesUsing(Trigger.Trigger_Enum.bluetoothConnection))
usingElements.add(String.format(getResources().getString(R.string.ruleXrequiresThis), ruleName));
@ -981,7 +967,6 @@ public class ActivityPermissions extends Activity
requiredPermissions.remove(s);
cachedPermissionsToRequest = requiredPermissions;
Intent intent = new Intent(android.provider.Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
// intent.setData(Uri.parse("package:" + getPackageName()));
startActivityForResult(intent, requestCodeForPermissionsNotificationPolicy);
return;
}
@ -1021,7 +1006,7 @@ public class ActivityPermissions extends Activity
{
if(!ActivityPermissions.isPermissionDeclaratedInManifest(Miscellaneous.getAnyContext(), Manifest.permission.SEND_SMS)
&&
Miscellaneous.isGooglePlayInstalled(Miscellaneous.getAnyContext())
Miscellaneous.isGooglePlayInstalled(Miscellaneous.getAnyContext())
)
{
requiredPermissions.remove(Manifest.permission.PROCESS_OUTGOING_CALLS);
@ -1031,8 +1016,6 @@ public class ActivityPermissions extends Activity
if(requiredPermissions.contains(Manifest.permission.SEND_SMS))
{
if(!ActivityPermissions.isPermissionDeclaratedInManifest(Miscellaneous.getAnyContext(), Manifest.permission.SEND_SMS)
// &&
// Miscellaneous.isGooglePlayInstalled(Miscellaneous.getAnyContext())
)
{
requiredPermissions.remove(Manifest.permission.SEND_SMS);
@ -1049,11 +1032,8 @@ public class ActivityPermissions extends Activity
Miscellaneous.logEvent("i", "Permissions", "Requesting permissions: " + permissions, 2);
// Toast.makeText(ActivityPermissions.this, "Requesting permissions. Amount: " + String.valueOf(requiredPermissions.size()), Toast.LENGTH_LONG).show();
if(requiredPermissions.size() > 0)
requestPermissions(requiredPermissions.toArray(new String[requiredPermissions.size()]), requestCodeForPermissions);
// else
// Miscellaneous.messageBox(getResources().getString(R.string.warning), getResources().getString(R.string.permissionsRequiredNotAvailable), ActivityPermissions.this).show();
}
else
setHaveAllPermissions();
@ -1071,17 +1051,11 @@ public class ActivityPermissions extends Activity
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
{
Miscellaneous.logEvent("i", "onRequestPermissionsResult()", "onRequestPermissionsResult()", 3);
// Toast.makeText(ActivityPermissions.this, "onRequestPermissionsResult()", Toast.LENGTH_LONG).show();
// ArrayList<String> disabledFeatures = new ArrayList<String>();
ArrayList<String> deniedPermissions = new ArrayList<String>();
if (requestCode == requestCodeForPermissions)
{
/*ArrayList<String> affectedGeneralList = new ArrayList<String>();
ArrayList<String> affectedTriggersList = new ArrayList<String>();
ArrayList<String> affectedActionList = new ArrayList<String>();*/
for (int i=0; i < grantResults.length; i++)
{
if(permissions[i].equalsIgnoreCase(Manifest.permission.WRITE_EXTERNAL_STORAGE) && grantResults[i] == PackageManager.PERMISSION_GRANTED)
@ -1141,8 +1115,8 @@ public class ActivityPermissions extends Activity
if(deniedPermissions.size() > 0)
{
/*
The user denied certain permissions. With the exception of write-storage we need to live with that
and simply disable features while keeping the notification alive. The user may dismiss it anyway.
The user denied certain permissions. We need to live with that and simply disable
features while keeping the notification alive. The user may dismiss it anyway.
*/
Miscellaneous.logEvent("w", "Denied permissions", getResources().getString(R.string.theFollowingPermissionsHaveBeenDenied) + Miscellaneous.explode(", ", deniedPermissions), 3);
@ -1367,10 +1341,7 @@ public class ActivityPermissions extends Activity
mapActionPermissions.put("setWifiTethering", Manifest.permission.WRITE_SETTINGS);
mapActionPermissions.put("setWifiTethering", Manifest.permission.CHANGE_NETWORK_STATE);
mapActionPermissions.put("setWifiTethering", Manifest.permission.ACCESS_NETWORK_STATE);
// mapActionPermissions.put("speakText", Manifest.permission.ACCESS_NOTIFICATION_POLICY);
// mapActionPermissions.put("startOtherActivity", "");
mapActionPermissions.put("triggerUrl", Manifest.permission.INTERNET);
// Hier müßte ein Hinweis kommen, daß nur die Variablen verwendet werden können, für die es Rechte gibt.
mapActionPermissions.put("turnBluetoothOff", Manifest.permission.BLUETOOTH_ADMIN);
mapActionPermissions.put("turnBluetoothOff", Manifest.permission.BLUETOOTH);
mapActionPermissions.put("turnBluetoothOff", Manifest.permission.ACCESS_NETWORK_STATE);
@ -1400,209 +1371,6 @@ public class ActivityPermissions extends Activity
mapActionPermissions.put("wakeupDevice", Manifest.permission.WAKE_LOCK);
}
/*
<string name="android.permission.SEND_SMS"></string>
<string name="android.permission.SEND_SMS_NO_CONFIRMATION"></string>
<string name="android.permission.RECEIVE_SMS"></string>
<string name="android.permission.RECEIVE_MMS"></string>
<string name="android.permission.RECEIVE_EMERGENCY_BROADCAST"></string>
<string name="android.permission.READ_CELL_BROADCASTS"></string>
<string name="android.permission.READ_SMS"></string>
<string name="android.permission.WRITE_SMS"></string>
<string name="android.permission.RECEIVE_WAP_PUSH"></string>
<string name="android.permission.READ_CONTACTS"></string>
<string name="android.permission.WRITE_CONTACTS"></string>
<string name="android.permission.BIND_DIRECTORY_SEARCH"></string>
<string name="android.permission.READ_CALL_LOG"></string>
<string name="android.permission.WRITE_CALL_LOG"></string>
<string name="android.permission.READ_SOCIAL_STREAM"></string>
<string name="android.permission.WRITE_SOCIAL_STREAM"></string>
<string name="android.permission.READ_PROFILE"></string>
<string name="android.permission.WRITE_PROFILE"></string>
<string name="android.permission.READ_CALENDAR"></string>
<string name="android.permission.WRITE_CALENDAR"></string>
<string name="android.permission.READ_USER_DICTIONARY"></string>
<string name="android.permission.WRITE_USER_DICTIONARY"></string>
<string name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"></string>
<string name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"></string>
<string name="com.android.alarm.permission.SET_ALARM"></string>
<string name="com.android.voicemail.permission.ADD_VOICEMAIL"></string>
<string name="android.permission.ACCESS_FINE_LOCATION"></string>
<string name="android.permission.ACCESS_COARSE_LOCATION"></string>
<string name="android.permission.ACCESS_MOCK_LOCATION"></string>
<string name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"></string>
<string name="android.permission.INSTALL_LOCATION_PROVIDER"></string>
<string name="android.permission.INTERNET"></string>
<string name="android.permission.ACCESS_NETWORK_STATE"></string>
<string name="android.permission.ACCESS_WIFI_STATE"></string>
<string name="android.permission.CHANGE_WIFI_STATE"></string>
<string name="android.permission.ACCESS_WIMAX_STATE"></string>
<string name="android.permission.CHANGE_WIMAX_STATE"></string>
<string name="android.permission.BLUETOOTH"></string>
<string name="android.permission.BLUETOOTH_ADMIN"></string>
<string name="android.permission.BLUETOOTH_STACK"></string>
<string name="android.permission.NFC"></string>
<string name="android.permission.CONNECTIVITY_INTERNAL"></string>
<string name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"></string>
<string name="android.permission.GET_ACCOUNTS"></string>
<string name="android.permission.AUTHENTICATE_ACCOUNTS"></string>
<string name="android.permission.USE_CREDENTIALS"></string>
<string name="android.permission.MANAGE_ACCOUNTS"></string>
<string name="android.permission.ACCOUNT_MANAGER"></string>
<string name="android.permission.CHANGE_WIFI_MULTICAST_STATE"></string>
<string name="android.permission.VIBRATE"></string>
<string name="android.permission.FLASHLIGHT"></string>
<string name="android.permission.WAKE_LOCK"></string>
<string name="android.permission.MODIFY_AUDIO_SETTINGS"></string>
<string name="android.permission.MANAGE_USB"></string>
<string name="android.permission.ACCESS_MTP"></string>
<string name="android.permission.HARDWARE_TEST"></string>
<string name="android.permission.NET_ADMIN"></string>
<string name="android.permission.REMOTE_AUDIO_PLAYBACK"></string>
<string name="android.permission.RECORD_AUDIO"></string>
<string name="android.permission.CAMERA"></string>
<string name="android.permission.PROCESS_OUTGOING_CALLS"></string>
<string name="android.permission.MODIFY_PHONE_STATE"></string>
<string name="android.permission.READ_PHONE_STATE"></string>
<string name="android.permission.READ_PRIVILEGED_PHONE_STATE"></string>
<string name="android.permission.CALL_PHONE"></string>
<string name="android.permission.USE_SIP"></string>
<string name="android.permission.READ_EXTERNAL_STORAGE"></string>
<string name="android.permission.WRITE_EXTERNAL_STORAGE"></string>
<string name="android.permission.WRITE_MEDIA_STORAGE"></string>
<string name="android.permission.DISABLE_KEYGUARD"></string>
<string name="android.permission.GET_TASKS"></string>
<string name="android.permission.INTERACT_ACROSS_USERS"></string>
<string name="android.permission.INTERACT_ACROSS_USERS_FULL"></string>
<string name="android.permission.MANAGE_USERS"></string>
<string name="android.permission.GET_DETAILED_TASKS"></string>
<string name="android.permission.REORDER_TASKS"></string>
<string name="android.permission.REMOVE_TASKS"></string>
<string name="android.permission.START_ANY_ACTIVITY"></string>
<string name="android.permission.RESTART_PACKAGES"></string>
<string name="android.permission.KILL_BACKGROUND_PROCESSES"></string>
<string name="android.permission.SYSTEM_ALERT_WINDOW"></string>
<string name="android.permission.SET_WALLPAPER"></string>
<string name="android.permission.SET_WALLPAPER_HINTS"></string>
<string name="android.permission.SET_TIME"></string>
<string name="android.permission.SET_TIME_ZONE"></string>
<string name="android.permission.EXPAND_STATUS_BAR"></string>
<string name="android.permission.READ_SYNC_SETTINGS"></string>
<string name="android.permission.WRITE_SYNC_SETTINGS"></string>
<string name="android.permission.READ_SYNC_STATS"></string>
<string name="android.permission.SET_SCREEN_COMPATIBILITY"></string>
<string name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE"></string>
<string name="android.permission.CHANGE_CONFIGURATION"></string>
<string name="android.permission.WRITE_SETTINGS"></string>
<string name="android.permission.WRITE_GSERVICES"></string>
<string name="android.permission.SET_SCREEN_COMPATIBILITY"></string>
<string name="android.permission.CHANGE_CONFIGURATION"></string>
<string name="android.permission.FORCE_STOP_PACKAGES"></string>
<string name="android.permission.RETRIEVE_WINDOW_CONTENT"></string>
<string name="android.permission.SET_ANIMATION_SCALE"></string>
<string name="android.permission.PERSISTENT_ACTIVITY"></string>
<string name="android.permission.GET_PACKAGE_SIZE"></string>
<string name="android.permission.SET_PREFERRED_APPLICATIONS"></string>
<string name="android.permission.RECEIVE_BOOT_COMPLETED"></string>
<string name="android.permission.BROADCAST_STICKY"></string>
<string name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"></string>
<string name="android.permission.MOUNT_FORMAT_FILESYSTEMS"></string>
<string name="android.permission.ASEC_ACCESS"></string>
<string name="android.permission.ASEC_CREATE"></string>
<string name="android.permission.ASEC_DESTROY"></string>
<string name="android.permission.ASEC_MOUNT_UNMOUNT"></string>
<string name="android.permission.ASEC_RENAME"></string>
<string name="android.permission.WRITE_APN_SETTINGS"></string>
<string name="android.permission.SUBSCRIBED_FEEDS_READ"></string>
<string name="android.permission.SUBSCRIBED_FEEDS_WRITE"></string>
<string name="android.permission.CHANGE_NETWORK_STATE"></string>
<string name="android.permission.CLEAR_APP_CACHE"></string>
<string name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"></string>
<string name="android.permission.WRITE_SECURE_SETTINGS"></string>
<string name="android.permission.DUMP"></string>
<string name="android.permission.READ_LOGS"></string>
<string name="android.permission.SET_DEBUG_APP"></string>
<string name="android.permission.SET_PROCESS_LIMIT"></string>
<string name="android.permission.SET_ALWAYS_FINISH"></string>
<string name="android.permission.SIGNAL_PERSISTENT_PROCESSES"></string>
<string name="android.permission.DIAGNOSTIC"></string>
<string name="android.permission.STATUS_BAR"></string>
<string name="android.permission.STATUS_BAR_SERVICE"></string>
<string name="android.permission.FORCE_BACK"></string>
<string name="android.permission.UPDATE_DEVICE_STATS"></string>
<string name="android.permission.INTERNAL_SYSTEM_WINDOW"></string>
<string name="android.permission.MANAGE_APP_TOKENS"></string>
<string name="android.permission.FREEZE_SCREEN"></string>
<string name="android.permission.INJECT_EVENTS"></string>
<string name="android.permission.FILTER_EVENTS"></string>
<string name="android.permission.RETRIEVE_WINDOW_INFO"></string>
<string name="android.permission.TEMPORARY_ENABLE_ACCESSIBILITY"></string>
<string name="android.permission.MAGNIFY_DISPLAY"></string>
<string name="android.permission.SET_ACTIVITY_WATCHER"></string>
<string name="android.permission.SHUTDOWN"></string>
<string name="android.permission.STOP_APP_SWITCHES"></string>
<string name="android.permission.READ_INPUT_STATE"></string>
<string name="android.permission.BIND_INPUT_METHOD"></string>
<string name="android.permission.BIND_ACCESSIBILITY_SERVICE"></string>
<string name="android.permission.BIND_TEXT_SERVICE"></string>
<string name="android.permission.BIND_VPN_SERVICE"></string>
<string name="android.permission.BIND_WALLPAPER"></string>
<string name="android.permission.BIND_DEVICE_ADMIN"></string>
<string name="android.permission.SET_ORIENTATION"></string>
<string name="android.permission.SET_POINTER_SPEED"></string>
<string name="android.permission.SET_KEYBOARD_LAYOUT"></string>
<string name="android.permission.INSTALL_PACKAGES"></string>
<string name="android.permission.CLEAR_APP_USER_DATA"></string>
<string name="android.permission.DELETE_CACHE_FILES"></string>
<string name="android.permission.DELETE_PACKAGES"></string>
<string name="android.permission.MOVE_PACKAGE"></string>
<string name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"></string>
<string name="android.permission.GRANT_REVOKE_PERMISSIONS"></string>
<string name="android.permission.ACCESS_SURFACE_FLINGER"></string>
<string name="android.permission.READ_FRAME_BUFFER"></string>
<string name="android.permission.CONFIGURE_WIFI_DISPLAY"></string>
<string name="android.permission.CONTROL_WIFI_DISPLAY"></string>
<string name="android.permission.BRICK"></string>
<string name="android.permission.REBOOT"></string>
<string name="android.permission.DEVICE_POWER"></string>
<string name="android.permission.NET_TUNNELING"></string>
<string name="android.permission.FACTORY_TEST"></string>
<string name="android.permission.BROADCAST_PACKAGE_REMOVED"></string>
<string name="android.permission.BROADCAST_SMS"></string>
<string name="android.permission.BROADCAST_WAP_PUSH"></string>
<string name="android.permission.MASTER_CLEAR"></string>
<string name="android.permission.CALL_PRIVILEGED"></string>
<string name="android.permission.PERFORM_CDMA_PROVISIONING"></string>
<string name="android.permission.CONTROL_LOCATION_UPDATES"></string>
<string name="android.permission.ACCESS_CHECKIN_PROPERTIES"></string>
<string name="android.permission.PACKAGE_USAGE_STATS"></string>
<string name="android.permission.BATTERY_STATS"></string>
<string name="android.permission.BACKUP"></string>
<string name="android.permission.CONFIRM_FULL_BACKUP"></string>
<string name="android.permission.BIND_REMOTEVIEWS"></string>
<string name="android.permission.BIND_APPWIDGET"></string>
<string name="android.permission.BIND_KEYGUARD_APPWIDGET"></string>
<string name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"></string>
<string name="android.permission.CHANGE_BACKGROUND_DATA_SETTING"></string>
<string name="android.permission.GLOBAL_SEARCH"></string>
<string name="android.permission.GLOBAL_SEARCH_CONTROL"></string>
<string name="android.permission.SET_WALLPAPER_COMPONENT"></string>
<string name="android.permission.READ_DREAM_STATE"></string>
<string name="android.permission.WRITE_DREAM_STATE"></string>
<string name="android.permission.ACCESS_CACHE_FILESYSTEM"></string>
<string name="android.permission.COPY_PROTECTED_DATA"></string>
<string name="android.permission.CRYPT_KEEPER"></string>
<string name="android.permission.READ_NETWORK_USAGE_HISTORY"></string>
<string name="android.permission.MANAGE_NETWORK_POLICY"></string>
<string name="android.permission.MODIFY_NETWORK_ACCOUNTING"></string>
<string name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"></string>
<string name="android.permission.PACKAGE_VERIFICATION_AGENT"></string>
<string name="android.permission.BIND_PACKAGE_VERIFIER"></string>
<string name="android.permission.SERIAL_PORT"></string>
<string name="android.permission.ACCESS_CONTENT_PROVIDERS_EXTERNALLY"></string>
<string name="android.permission.UPDATE_LOCK"></string>
*/
public static boolean isPermissionDeclaratedInManifest(Context context, String permission)
{
PackageManager pm = context.getPackageManager();
@ -1621,12 +1389,11 @@ public class ActivityPermissions extends Activity
ArrayList<String> requestedPermissionsArrayList = new ArrayList<String>();
requestedPermissionsArrayList.addAll(requestedPermissionsList);
return (requestedPermissionsArrayList.contains(permission));
// Log.i(ExConsts.TAG, ""+requestedPermissionsArrayList);
}
}
catch (PackageManager.NameNotFoundException e)
{
e.printStackTrace();
Miscellaneous.logEvent("w", "ActivityPermissions", Log.getStackTraceString(e), 2);
}
return false;

6
app/src/main/java/com/jens/automation2/ActivityVolumeTest.java
View File

@ -30,14 +30,14 @@ public class ActivityVolumeTest extends Activity
instance = this;
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_volume_test);
setContentView(R.layout.activity_volume_calibration);
tvCurrentVolume = (TextView)findViewById(R.id.tvCurrentVolume);
etReferenceValue = (EditText)findViewById(R.id.etReferenceValue);
sbReferenceValue = (SeekBar)findViewById(R.id.sbReferenceValue);
tvVolumeTestExplanation = (TextView)findViewById(R.id.tvVolumeTestExplanation);
tvVolumeTestExplanation = (TextView)findViewById(R.id.tvVolumeCalibrationExplanation);
tvVolumeTestExplanation.setText(String.format(getResources().getString(R.string.volumeTesterExplanation), String.valueOf(volumeRefreshInterval)));
tvVolumeTestExplanation.setText(String.format(getResources().getString(R.string.volumeCalibrationExplanation), String.valueOf(volumeRefreshInterval)));
etReferenceValue.setText(String.valueOf(Settings.referenceValueForNoiseLevelMeasurements));

99
app/src/main/java/com/jens/automation2/Trigger.java
View File

@ -286,61 +286,62 @@ public class Trigger
float currentPitch = DeviceOrientationListener.getInstance().getPitch();
float currentRoll = DeviceOrientationListener.getInstance().getRoll();
if(
!(
desiredAzimuthTolerance < 180
&&
(
Math.abs(currentAzimuth) <= Math.abs(desiredAzimuth - desiredAzimuthTolerance)
||
Math.abs(currentAzimuth) <= desiredAzimuth + desiredAzimuthTolerance
)
)
)
if(desiredAzimuthTolerance < 180)
{
Miscellaneous.logEvent("i", "DeviceOrientation", "Azimuth outside of tolerance area.", 5);
if(getTriggerParameter())
return false;
else
return true;
if (
!(
Math.abs(currentAzimuth) <= Math.abs(desiredAzimuth - desiredAzimuthTolerance)
||
Math.abs(currentAzimuth) <= desiredAzimuth + desiredAzimuthTolerance
)
)
{
Miscellaneous.logEvent("i", "DeviceOrientation", "Azimuth outside of tolerance area.", 5);
if (getTriggerParameter())
return false;
else
return true;
}
}
if(
!(
desiredPitchTolerance < 180
&&
(
Math.abs(currentPitch) <= Math.abs(desiredPitch - desiredPitchTolerance)
||
Math.abs(currentPitch) <= desiredPitch + desiredPitchTolerance
)
)
)
if(desiredPitchTolerance < 180)
{
Miscellaneous.logEvent("i", "DeviceOrientation", "Pitch outside of tolerance area.", 5);
if(getTriggerParameter())
return false;
else
return true;
if (
!(
(
Math.abs(currentPitch) <= Math.abs(desiredPitch - desiredPitchTolerance)
||
Math.abs(currentPitch) <= desiredPitch + desiredPitchTolerance
)
)
)
{
Miscellaneous.logEvent("i", "DeviceOrientation", "Pitch outside of tolerance area.", 5);
if (getTriggerParameter())
return false;
else
return true;
}
}
if(
!(
desiredRollTolerance < 180
&&
(
Math.abs(currentRoll) <= Math.abs(desiredRoll - desiredRollTolerance)
||
Math.abs(currentRoll) <= desiredRoll + desiredRollTolerance
)
)
)
if(desiredRollTolerance < 180)
{
Miscellaneous.logEvent("i", "DeviceOrientation", "Roll outside of tolerance area.", 5);
if(getTriggerParameter())
return false;
else
return true;
if (
!(
(
Math.abs(currentRoll) <= Math.abs(desiredRoll - desiredRollTolerance)
||
Math.abs(currentRoll) <= desiredRoll + desiredRollTolerance
)
)
)
{
Miscellaneous.logEvent("i", "DeviceOrientation", "Roll outside of tolerance area.", 5);
if (getTriggerParameter())
return false;
else
return true;
}
}
if(getTriggerParameter())
@ -493,7 +494,7 @@ public class Trigger
return false;
}
return false;
return true;
}
boolean checkRoaming()

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

@ -889,7 +889,7 @@ public class XmlFileInterface
{
String triggerEventString = readTag(parser, "TriggerEvent");
if(triggerEventString.equals("process_started_stopped") | triggerEventString.equals("process_running"))
if(triggerEventString.equals("process_started_stopped") || triggerEventString.equals("process_running"))
newTrigger.setTriggerType(Trigger_Enum.process_started_stopped);
else
newTrigger.setTriggerType(Trigger_Enum.valueOf(triggerEventString));
@ -1152,7 +1152,14 @@ public class XmlFileInterface
newAction.setAction(Action_Enum.enableScreenRotation);
else if(actionNameString.equals("disableScreenRotation"))
newAction.setAction(Action_Enum.disableScreenRotation);
// *** deprecated
else if(actionNameString.equals("disableScreenRotation"))
newAction.setAction(Action_Enum.disableScreenRotation);
else if(actionNameString.equals("wakeupDevice"))
{
newAction.setAction(Action_Enum.turnScreenOnOrOff);
newAction.setParameter1(true);
}
// *** deprecated
else
newAction.setAction(Action_Enum.valueOf(actionNameString));
@ -1220,6 +1227,18 @@ public class XmlFileInterface
newAction.setParameter1(false);
readTag(parser, "ActionParameter1"); //read the tag for the parser to head on
}
else if(newAction.getAction().equals(Action_Enum.disableScreenRotation))
{
newAction.setAction(Action_Enum.setDisplayRotation);
newAction.setParameter1(false);
readTag(parser, "ActionParameter1"); //read the tag for the parser to head on
}
else if(newAction.getAction().equals(Action_Enum.turnScreenOnOrOff) && newAction.getParameter1())
{
/*
If param1 == true we will keep it because this action used to be of type wakeUpDevice.
*/
}
else
// exclusion for deprecated types
newAction.setParameter1(Boolean.parseBoolean(readTag(parser, "ActionParameter1")));
@ -1241,7 +1260,6 @@ public class XmlFileInterface
{
newAction.setParameter2(tag);
}
/*
androidx.security.crypto.MasterKey.Builder
@ -1300,9 +1318,6 @@ public class XmlFileInterface
}
}
}
// Miscellaneous.logEvent("i", "New Rule from file", newPoi.name + "/" + String.valueOf(newPoi.radius) + "/" + String.valueOf(newPoi.location.getLatitude()) + "/" + String.valueOf(newPoi.location.getLongitude()) + "/" + String.valueOf(newPoi.changeWifiState) + "/" + String.valueOf(newPoi.desiredWifiState) + "/" + String.valueOf(newPoi.changeCameraState) + "/" + String.valueOf(newPoi.desiredCameraState) + "/" + String.valueOf(newPoi.changeSoundSetting) + "/" + String.valueOf(newPoi.desiredSoundSetting));
return newAction;
}

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

@ -369,7 +369,7 @@ public class CellLocationChangedReceiver extends PhoneStateListener
// Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because we have no data connection.", 4);
}
else
Miscellaneous.logEvent("w", "cellReceiver", "Wanted to activate CellLocationChangedReceiver, but Wifi-Receiver says not to.", 4);
Miscellaneous.logEvent("w", "cellReceiver", "Wanted to activate CellLocationChangedReceiver, but Wifi-Receiver says not to.", 4);
}
else
Miscellaneous.logEvent("i", "cellReceiver", "Not starting cellLocationListener because Airplane mode is active or SIM_STATE is not ready.", 4);

7
app/src/main/java/com/jens/automation2/receivers/PhoneStatusListener.java
View File

@ -110,7 +110,6 @@ public class PhoneStatusListener implements AutomationListenerInterface
}
ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger_Enum.phoneCall);
// ArrayList<Rule> ruleCandidates = Rule.findRuleCandidatesByPhoneCall(Trigger.triggerPhoneCallDirectionOutgoing);
for(int i=0; i<ruleCandidates.size(); i++)
{
AutomationService asInstance = AutomationService.getInstance();
@ -143,7 +142,6 @@ public class PhoneStatusListener implements AutomationListenerInterface
}
ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger_Enum.phoneCall);
// ArrayList<Rule> ruleCandidates = Rule.findRuleCandidatesByPhoneCall(Trigger.triggerPhoneCallDirectionIncoming);
for (int i = 0; i < ruleCandidates.size(); i++)
{
AutomationService asInstance = AutomationService.getInstance();
@ -170,10 +168,6 @@ public class PhoneStatusListener implements AutomationListenerInterface
*/
setLastPhoneDirection(2);
// TelephonyManager tm = (TelephonyManager)context.getSystemService(Service.TELEPHONY_SERVICE);
// int newState = tm.getCallState();
// setCurrentState(newState);
setCurrentState(TelephonyManager.CALL_STATE_RINGING);
String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
@ -181,7 +175,6 @@ public class PhoneStatusListener implements AutomationListenerInterface
Miscellaneous.logEvent("i", "Call state", String.format(Miscellaneous.getAnyContext().getResources().getString(R.string.outgoingCallTo), getLastPhoneNumber()), 4);
ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger_Enum.phoneCall);
// ArrayList<Rule> ruleCandidates = Rule.findRuleCandidatesByPhoneCall(Trigger.triggerPhoneCallDirectionOutgoing);
for(int i=0; i<ruleCandidates.size(); i++)
{
AutomationService asInstance = AutomationService.getInstance();