diff --git a/app/build.gradle b/app/build.gradle index bd83c02e..024852de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { compileSdkVersion 31 buildToolsVersion '29.0.2' useLibrary 'org.apache.http.legacy' - versionCode 132 - versionName "1.7.16" + versionCode 133 + versionName "1.7.17" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -39,6 +39,12 @@ android { targetSdkVersion 31 } + /* + targetSdkVersion is kept at 28 for as long as possible. + If raised wifi cannot be switched on or off anymore without root permissions. + In the Google version I'm forced to raise the value regularly. + */ + fdroidFlavor { dimension "version" diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java index 95f7c94e..3c539089 100644 --- a/app/src/main/java/com/jens/automation2/Actions.java +++ b/app/src/main/java/com/jens/automation2/Actions.java @@ -2272,7 +2272,7 @@ public class Actions public static void startPhoneCall(Context context, String phoneNumber) { - Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phoneNumber)); + Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + Uri.encode(phoneNumber))); // intent.setClassName("com.android.phone","com.android.phone.OutgoingCallBroadcaster"); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_FROM_BACKGROUND); diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java index 0a6de714..f113e1cf 100644 --- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java +++ b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java @@ -39,8 +39,10 @@ public class ActivityControlCenter extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_control_center); + bVolumeTest = (Button) findViewById(R.id.bVolumeTest); bVolumeTest.setOnClickListener(new View.OnClickListener() { @@ -384,6 +386,7 @@ public class ActivityControlCenter extends Activity protected void onResume() { super.onResume(); + Miscellaneous.setDisplayLanguage(this); String folder = Miscellaneous.getWriteableFolder(); if (folder != null && folder.length() > 0) diff --git a/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java b/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java index 9f29e8f2..9760dffb 100644 --- a/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java +++ b/app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java @@ -21,6 +21,7 @@ public class ActivityDisplayLongMessage extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_display_long_message); tvMessageTitle = (TextView)findViewById(R.id.tvMessageTitle); diff --git a/app/src/main/java/com/jens/automation2/ActivityHelp.java b/app/src/main/java/com/jens/automation2/ActivityHelp.java index 6e75ee52..5f88e1de 100644 --- a/app/src/main/java/com/jens/automation2/ActivityHelp.java +++ b/app/src/main/java/com/jens/automation2/ActivityHelp.java @@ -13,6 +13,7 @@ public class ActivityHelp extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(layout.activity_help_text); TextView tvHelpTextEnergySaving = (TextView) findViewById(R.id.tvHelpTextEnergySaving); diff --git a/app/src/main/java/com/jens/automation2/ActivityMainPoi.java b/app/src/main/java/com/jens/automation2/ActivityMainPoi.java index 2d8a1f73..f205ee7a 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainPoi.java +++ b/app/src/main/java/com/jens/automation2/ActivityMainPoi.java @@ -44,7 +44,7 @@ public class ActivityMainPoi extends ActivityGeneric protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Miscellaneous.setDisplayLanguage(ActivityMainPoi.this); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.main_poi_layout); instance = this; @@ -108,6 +108,13 @@ public class ActivityMainPoi extends ActivityGeneric this.storeServiceReferenceInVariable(); } + @Override + protected void onResume() + { + super.onResume(); + Miscellaneous.setDisplayLanguage(this); + } + private void buttonAddPoi() { poiToEdit = null; diff --git a/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java b/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java index cca51273..65e73460 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java +++ b/app/src/main/java/com/jens/automation2/ActivityMainProfiles.java @@ -40,7 +40,7 @@ public class ActivityMainProfiles extends ActivityGeneric protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Miscellaneous.setDisplayLanguage(ActivityMainProfiles.this); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.main_profile_layout); instance = this; @@ -155,6 +155,13 @@ public class ActivityMainProfiles extends ActivityGeneric } } + @Override + protected void onResume() + { + super.onResume(); + Miscellaneous.setDisplayLanguage(this); + } + private AlertDialog getProfileDialog(final Profile profile) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); diff --git a/app/src/main/java/com/jens/automation2/ActivityMainRules.java b/app/src/main/java/com/jens/automation2/ActivityMainRules.java index d49648b3..0232e7f0 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainRules.java +++ b/app/src/main/java/com/jens/automation2/ActivityMainRules.java @@ -48,7 +48,7 @@ public class ActivityMainRules extends ActivityGeneric protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Miscellaneous.setDisplayLanguage(ActivityMainRules.this); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.main_rule_layout); instance = this; @@ -154,6 +154,13 @@ public class ActivityMainRules extends ActivityGeneric return v; } } + + @Override + protected void onResume() + { + super.onResume(); + Miscellaneous.setDisplayLanguage(this); + } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) diff --git a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java index 87144052..16711e3b 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java +++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java @@ -55,7 +55,7 @@ public class ActivityMainScreen extends ActivityGeneric public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Miscellaneous.setDisplayLanguage(ActivityMainScreen.this); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.main_overview_layout); activityMainScreenInstance = this; @@ -571,6 +571,7 @@ public class ActivityMainScreen extends ActivityGeneric protected void onResume() { super.onResume(); + Miscellaneous.setDisplayLanguage(this); toggleService.setChecked(AutomationService.isMyServiceRunning(this)); ActivityMainScreen.updateMainScreen(); diff --git a/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java b/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java index bbdf5df1..e77e4a95 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java +++ b/app/src/main/java/com/jens/automation2/ActivityMainTabLayout.java @@ -23,7 +23,7 @@ public class ActivityMainTabLayout extends TabActivity { super.onCreate(savedInstanceState); Settings.readFromPersistentStorage(ActivityMainTabLayout.this); - Miscellaneous.setDisplayLanguage(ActivityMainTabLayout.this); + Miscellaneous.setDisplayLanguage(this); if(Settings.tabsPlacement == 1) setContentView(R.layout.main_tab_layout_tabs_at_bottom); @@ -65,6 +65,7 @@ public class ActivityMainTabLayout extends TabActivity protected void onResume() { super.onResume(); + Miscellaneous.setDisplayLanguage(this); // Miscellaneous.logEvent("i", "NFC", "ActivityMainTabLayout.onResume().", 5); NfcReceiver.checkIntentForNFC(this, getIntent()); // NfcReceiver.checkIntentForNFC(this, new Intent(this.getApplicationContext(), this.getClass())); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java b/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java index b4a47966..811171d4 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionBrightnessSetting.java @@ -26,6 +26,7 @@ public class ActivityManageActionBrightnessSetting extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_manage_action_brightness_settings); + Miscellaneous.setDisplayLanguage(this); super.onCreate(savedInstanceState); chkAutoBrightness = (CheckBox)findViewById(R.id.chkAutoBrightness); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java index 8ab2cfe7..f9e8ec22 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java @@ -259,6 +259,7 @@ public class ActivityManageActionCloseNotification extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_close_notification); etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java b/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java index 9a86dc6c..b5e75d19 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionControlMedia.java @@ -19,6 +19,7 @@ public class ActivityManageActionControlMedia extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_control_media); rbMediaPlayPause = (RadioButton)findViewById(R.id.rbMediaPlayPause); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java index c8cf9e98..3c54bc9a 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionCopyToClipboard.java @@ -19,6 +19,7 @@ public class ActivityManageActionCopyToClipboard extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_action_copy_to_clipboard); bSaveCopyToClipboard = (Button) findViewById(R.id.bSaveCopyToClipboard); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java index d4f8bc41..63c26da2 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionCreateNotification.java @@ -24,6 +24,7 @@ public class ActivityManageActionCreateNotification extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_create_notification); etNotificationTitle = (EditText) findViewById(R.id.etNotificationTitle); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java b/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java index 864255a3..21bd238d 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionMakePhoneCall.java @@ -21,6 +21,7 @@ public class ActivityManageActionMakePhoneCall extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_make_phone_call); etTargetPhoneNumber = (EditText)findViewById(R.id.etTargetPhoneNumber); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java b/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java index 257c9444..59b6b681 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionPlaySound.java @@ -26,6 +26,7 @@ public class ActivityManageActionPlaySound extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_play_sound); chkPlaySoundAlwaysPlay = (CheckBox)findViewById(R.id.chkPlaySoundAlwaysPlay); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java index 966092a7..2f39ff94 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java @@ -28,6 +28,7 @@ public class ActivityManageActionRunExecutable extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_run_executable); chkRunExecAsRoot = (CheckBox)findViewById(R.id.chkRunExecAsRoot); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java index 609a9cc6..fe4409d1 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java @@ -37,6 +37,7 @@ public class ActivityManageActionSendBroadcast extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_send_broadcast); etBroadcastToSend = (EditText)findViewById(R.id.etBroadcastToSend); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java index aab66a65..57716634 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSendTextMessage.java @@ -48,6 +48,7 @@ public class ActivityManageActionSendTextMessage extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_action_send_textmessage); etSendTextMessage = (EditText)findViewById(R.id.etSendTextMessage); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java index f7b0be0c..fcff4680 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSetVariable.java @@ -24,6 +24,7 @@ public class ActivityManageActionSetVariable extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_action_set_variable); etVariableSetKey = (EditText)findViewById(R.id.etVariableSetKey); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java index f9e8bd45..8d59b68b 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java @@ -22,6 +22,7 @@ public class ActivityManageActionSpeakText extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_action_speak_text); etSpeakText = (EditText)findViewById(R.id.etTextToSpeak); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java index ddd1f83f..93b8ae13 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java @@ -66,6 +66,7 @@ public class ActivityManageActionStartActivity extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_start_activity); lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java b/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java index 9a41e210..4f1dc646 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java @@ -39,6 +39,7 @@ public class ActivityManageActionTriggerUrl extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_action_trigger_url); etTriggerUrl = (EditText)findViewById(R.id.etTriggerUrl); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java b/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java index 5eeb51cb..c91549cd 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionVibrate.java @@ -27,6 +27,7 @@ public class ActivityManageActionVibrate extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_vibrate); etVibratePattern = (EditText)findViewById(R.id.etVibratePattern); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java b/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java index 01a68d3f..e8767a33 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionWakeLock.java @@ -27,6 +27,7 @@ public class ActivityManageActionWakeLock extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_wakelock); rbWakeLockActivate = (RadioButton)findViewById(R.id.rbWakeLockActivate); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java index 38b948f0..0fe79d25 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java @@ -23,6 +23,7 @@ public class ActivityManageActionWifi extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_action_wifi); chkWifiRunAsRoot = (CheckBox)findViewById(R.id.chkWifiRunAsRoot); diff --git a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java index 990465f3..b6826f29 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java +++ b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java @@ -59,6 +59,7 @@ public class ActivityManagePoi extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_specific_poi); myLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageProfile.java b/app/src/main/java/com/jens/automation2/ActivityManageProfile.java index affd7384..ceb53389 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageProfile.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageProfile.java @@ -86,6 +86,7 @@ public class ActivityManageProfile extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); this.setContentView(R.layout.activity_manage_specific_profile); checkBoxChangeSoundMode = (CheckBox)findViewById(R.id.checkBoxChangeSoundMode); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java index 2795b131..32fda94b 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java @@ -154,6 +154,7 @@ public class ActivityManageRule extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_specific_rule); context = this; diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java index 20db4704..620664e0 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java @@ -32,6 +32,7 @@ public class ActivityManageTriggerBluetooth extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_bluetooth); radioAnyBluetoothDevice = (RadioButton)findViewById(R.id.radioAnyBluetoothDevice); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java index 6c0888f8..65282ac1 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBroadcast.java @@ -28,6 +28,7 @@ public class ActivityManageTriggerBroadcast extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_broadcasts); bBroadcastShowSuggestions = findViewById(R.id.bBroadcastShowSuggestions); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java index 901fe637..10623751 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerCheckVariable.java @@ -20,6 +20,7 @@ public class ActivityManageTriggerCheckVariable extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_check_variable); etVariableKeyTrigger = (EditText) findViewById(R.id.etVariableKeyTrigger); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java index ef3fb199..449e85cf 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerDeviceOrientation.java @@ -104,6 +104,7 @@ public class ActivityManageTriggerDeviceOrientation extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_device_orientation); currentAzimuth = (TextView) findViewById(R.id.tvCurrentAzimuth); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java index 7f83691b..74df0e08 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNfc.java @@ -39,6 +39,7 @@ public class ActivityManageTriggerNfc extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_nfc); etNewNfcIdValue = (EditText)findViewById(R.id.etNewNfcIdValue); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java index bc93f10a..690751d7 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerNotification.java @@ -258,6 +258,7 @@ public class ActivityManageTriggerNotification extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_notification); etNotificationTitle = (EditText)findViewById(R.id.etNotificationTitle); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java index 56103afd..98c6ecbd 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerPhoneCall.java @@ -35,6 +35,7 @@ public class ActivityManageTriggerPhoneCall extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_phone_call); etTriggerPhoneCallPhoneNumber = (EditText)findViewById(R.id.etTriggerPhoneCallPhoneNumber); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java index 365b3da2..a73b50e0 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerProfile.java @@ -31,6 +31,7 @@ public class ActivityManageTriggerProfile extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_profile); bSaveTriggerProfile = (Button)findViewById(R.id.bSaveTriggerProfile); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java index 6c32db74..ec7c71f0 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerSubSystemState.java @@ -21,6 +21,7 @@ public class ActivityManageTriggerSubSystemState extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_subsystemstate); rbSubSystemStateWifi = (RadioButton)findViewById(R.id.rbSubSystemStateWifi); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java index 78fd7d6c..51b5b32f 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java @@ -26,6 +26,7 @@ public class ActivityManageTriggerTethering extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_tethering); rbTetheringOn = (RadioButton) findViewById(R.id.rbTetheringOn); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java index f63041c0..0ba52fde 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java @@ -35,6 +35,7 @@ public class ActivityManageTriggerTimeFrame extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_timeframe); startPicker = (TimePicker)findViewById(R.id.tpTimeFrameStart); diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java index 5a1abe9e..5b09480a 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerWifi.java @@ -49,6 +49,7 @@ public class ActivityManageTriggerWifi extends Activity protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_manage_trigger_wifi); rbTriggerWifiConnected = (RadioButton) findViewById(R.id.rbTriggerWifiConnected); diff --git a/app/src/main/java/com/jens/automation2/ActivityPermissions.java b/app/src/main/java/com/jens/automation2/ActivityPermissions.java index 5cd9091b..cb6717e9 100644 --- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java +++ b/app/src/main/java/com/jens/automation2/ActivityPermissions.java @@ -79,6 +79,7 @@ public class ActivityPermissions extends Activity if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.permissions_activity); bCancelPermissions = (Button)findViewById(R.id.bCancelPermissions); diff --git a/app/src/main/java/com/jens/automation2/ActivitySettings.java b/app/src/main/java/com/jens/automation2/ActivitySettings.java index 5fbb2063..8ac0a12c 100644 --- a/app/src/main/java/com/jens/automation2/ActivitySettings.java +++ b/app/src/main/java/com/jens/automation2/ActivitySettings.java @@ -16,6 +16,7 @@ public class ActivitySettings extends PreferenceActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); addPreferencesFromResource(layout.activity_settings); if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_apk)) @@ -24,4 +25,11 @@ public class ActivitySettings extends PreferenceActivity chkPrefUpdateCheck.setEnabled(true); } } + + @Override + protected void onResume() + { + super.onResume(); + Miscellaneous.setDisplayLanguage(this); + } } \ No newline at end of file diff --git a/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java b/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java index b8977b78..4fce0381 100644 --- a/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java +++ b/app/src/main/java/com/jens/automation2/ActivityVolumeTest.java @@ -30,6 +30,7 @@ public class ActivityVolumeTest extends Activity instance = this; super.onCreate(savedInstanceState); + Miscellaneous.setDisplayLanguage(this); setContentView(R.layout.activity_volume_calibration); tvCurrentVolume = (TextView)findViewById(R.id.tvCurrentVolume); diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 7c0ba53c..1986faa6 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -45,7 +45,7 @@ ru fr pl - zh_rCN + zh_CN diff --git a/fastlane/metadata/android/en-US/changelogs/133.txt b/fastlane/metadata/android/en-US/changelogs/133.txt index 180ca52c..99ed1929 100644 --- a/fastlane/metadata/android/en-US/changelogs/133.txt +++ b/fastlane/metadata/android/en-US/changelogs/133.txt @@ -1,2 +1,4 @@ * Fixed: [variable-name] was incorrectly replaced with an ] at the end +* Fixed: Set custom language +* Fixed: Special characters in making phone call action were not encoded * Added: Chinese translation (simplified) \ No newline at end of file