Merge remote-tracking branch 'origin/development-stable'

revert Fixed: Crash when managing phone call action in the F-Droid version

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"

app/src/main/java/com/jens/automation2/Actions.java

@@ -2273,7 +2273,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);

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)

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);

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);

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;

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);

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)

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();
 

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()));

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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;

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);
+	}
 }

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);

app/src/main/res/values-de/strings.xml

@@ -798,4 +798,5 @@
     <string name="variablesOnlyForTypes">Variablen sind nur für die Parametertypen String und URI verfügbar</string>
     <string name="intentParametersHint">Wenn Sie einen Parameter angeben möchten, müssen Sie auch auf \"Intent-Paar hinzufügen\" klicken. Andernfalls werden Ihre Änderungen nicht gespeichert.</string>
     <string name="languagePolish">Polnisch</string>
+    <string name="languageChineseChina">Chinesisch (China)</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -797,4 +797,5 @@
     <string name="variablesOnlyForTypes">Las variables solo están disponibles para los tipos de parámetro String y URI</string>
     <string name="intentParametersHint">Si desea especificar un parámetro, también debe hacer clic en \"Agregar par de intención\". De lo contrario, los cambios no se guardarán.</string>
     <string name="languagePolish">Polaco</string>
+    <string name="languageChineseChina">Chino (China)</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -797,4 +797,5 @@
     <string name="variablesOnlyForTypes">Les variables ne sont disponibles que pour les types de paramètres String et URI</string>
     <string name="intentParametersHint">Si vous souhaitez spécifier un paramètre, vous devez également cliquer sur « Ajouter une paire d\'intentions ». Sinon, vos modifications ne seront pas enregistrées.</string>
     <string name="languagePolish">Polonais</string>
+    <string name="languageChineseChina">Chinois (Chine)</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -798,4 +798,5 @@
     <string name="variablesOnlyForTypes">Le variabili sono disponibili solo per i tipi di parametro String e URI</string>
     <string name="intentParametersHint">Se si desidera specificare un parametro è necessario fare clic anche su \"Aggiungi coppia intento\". In caso contrario, le modifiche non verranno salvate.</string>
     <string name="languagePolish">Polacco</string>
+    <string name="languageChineseChina">Cinese (Cina)</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -796,5 +796,6 @@
     <string name="variablesOnlyForTypes">Variabelen zijn alleen beschikbaar voor parametertypen Tekenreeks en URI</string>
     <string name="intentParametersHint">Als u een parameter wilt opgeven, moet u ook op \"Intentiepaar toevoegen\" klikken. Anders worden uw wijzigingen niet opgeslagen.</string>
     <string name="languagePolish">Pools</string>
+    <string name="languageChineseChina">Chinees (China)</string>
 
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -895,4 +895,5 @@
     <string name="languageRussian">Rosyjski</string>
     <string name="languageFrench">Francuski</string>
     <string name="languagePolish">Polski</string>
+    <string name="languageChineseChina">Chiński (Chiny)</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -855,4 +855,5 @@
     <string name="variablesOnlyForTypes">Переменные доступны только для типов параметров: String и URI</string>
   <string name="intentParametersHint">Если вы хотите указать параметр, вам также нужно нажать «Добавить пару намерений». В противном случае ваши изменения не будут сохранены.</string>
     <string name="languagePolish">Польский</string>
+    <string name="languageChineseChina">Китайский (Китай)</string>
 </resources>

app/src/main/res/values/arrays.xml

@@ -45,7 +45,7 @@
         <item name="6">ru</item>
         <item name="7">fr</item>
         <item name="8">pl</item>
-        <item name="9">zh_rCN</item>
+        <item name="9">zh_CN</item>
     </string-array>
 
     <string-array name="tabsPlacementOptions">

fastlane/metadata/android/de-DE/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Behoben: [Variablenname] wurde am Ende fälschlicherweise durch ein ] ersetzt
+* Behoben: Benutzerdefinierte Sprache einstellen
+* Behoben: Sonderzeichen beim Ausführen von Telefonanrufen wurden nicht kodiert
+* Hinzugefügt: Chinesische Übersetzung (vereinfacht)

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)

fastlane/metadata/android/es-ES/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Corregido: [variable-name] fue reemplazado incorrectamente por un ] al final
+* Corregido: Establecer idioma personalizado
+* Corregido: Los caracteres especiales al realizar la acción de llamada telefónica no estaban codificados
+* Añadido: traducción al chino (simplificada)

fastlane/metadata/android/fr-FR/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Correction : [nom_variable] a été remplacé à tort par un ] à la fin
+* Corrigé: Définir la langue personnalisée
+* Correction : les caractères spéciaux dans l'action d'appel téléphonique n'étaient pas codés
+* Ajouté: Traduction chinoise (simplifiée)

fastlane/metadata/android/it-IT/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Risolto: [nome-variabile] è stato erroneamente sostituito con un ] alla fine
+* Risolto: imposta la lingua personalizzata
+* Risolto: i caratteri speciali nell'effettuare un'azione di chiamata telefonica non sono stati codificati
+* Aggiunto: traduzione cinese (semplificata)

fastlane/metadata/android/nl-NL/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Opgelost: [variabele-naam] is ten onrechte vervangen door een ] aan het einde
+* Opgelost: Stel aangepaste taal in
+* Opgelost: Speciale tekens bij het maken van telefoongesprek actie waren niet gecodeerd
+* Toegevoegd: Chinese vertaling (vereenvoudigd)

fastlane/metadata/android/pl-PL/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Naprawiono: [zmienna-nazwa] została niepoprawnie zastąpiona ] na końcu
+* Naprawiono: Ustaw niestandardowy język
+* Naprawiono: Znaki specjalne w wykonywaniu czynności połączenia telefonicznego nie były kodowane
+* Dodano: Chińskie tłumaczenie (uproszczone)

fastlane/metadata/android/ru-RU/changelogs/133.txt

@@ -0,0 +1,4 @@
+* Исправлено: [имя-переменной] было неправильно заменено на ] в конце
+* Исправлено: Установить пользовательский язык
+* Исправлено: Специальные символы при совершении действия телефонного звонка не кодировались
+* Добавлено: Китайский перевод (упрощенный)

fastlane/metadata/android/zh-CN/changelogs/133.txt

@@ -0,0 +1,4 @@
+* 修复：[变量名]末尾被错误地替换为]
+* 修复：设置自定义语言
+* 修复：拨打电话动作时的特殊字符未编码的问题
+* 新增：中文翻译（简体）