startApp changes

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

@@ -15,6 +15,7 @@ import java.util.Locale;
 public class Action
 {
 	public static final String actionParameter2Split = "ap2split";
+	public static final String intentPairSeperator = "intPairSplit";
 
 	public enum Action_Enum {	
 								setWifi,
@@ -237,6 +238,10 @@ public class Action
 			else
 				returnString.append(": " + components[0]);
 		}
+		else if(this.getAction().equals(Action_Enum.startOtherActivity))
+		{
+			returnString.append(": " + parameter2.replace(Action.intentPairSeperator, "/"));
+		}
 		else if(this.getAction().equals(Action_Enum.sendTextMessage))
 		{
 			String[] components = parameter2.split(Actions.smsSeparator);

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

@@ -611,7 +611,7 @@ public class Actions
 
 				externalActivityIntent = new Intent();
 
-				if(params.length > 1 && !params[1].contains("/"))
+				if(params.length > 1 && !params[1].contains(Action.intentPairSeperator))
 				{
 					externalActivityIntent.setPackage(params[0]);
 					externalActivityIntent.setAction(params[1]);
@@ -629,7 +629,7 @@ public class Actions
 			// Pack intents
 			for (int i = paramsStartIndex; i < params.length; i++)
 			{
-				String[] singleParam = params[i].split("/");
+				String[] singleParam = params[i].split(Action.intentPairSeperator);
 
     			/*Class c = Class.forName(singleParam[0]);
 				for(Method m : c.getMethods())
@@ -686,6 +686,19 @@ public class Actions
 					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
 					externalActivityIntent.putExtra(singleParam[1], Short.parseShort(singleParam[2]));
 				}
+				else if (singleParam[0].equals("Uri"))
+				{
+					if(singleParam[1].equalsIgnoreCase("IntentData"))
+					{
+						Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with value " + singleParam[2] + " as standard data parameter.", 3);
+						externalActivityIntent.setData(Uri.parse(singleParam[2]));
+					}
+					else
+					{
+						Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+						externalActivityIntent.putExtra(singleParam[1], Uri.parse(singleParam[2]));
+					}
+				}
 				else if (singleParam[0].equals("String"))
 				{
 					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);

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

@@ -73,7 +73,7 @@ public class ActivityManageActionStartActivity extends Activity
 	private static List<PackageInfo> pInfos = null;
 	public static Action resultingAction;
 
-	private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String" };
+	private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String", "Uri" };
 	private ArrayList<String> intentPairList = new ArrayList<String>();
 
 	ArrayAdapter<String> intentTypeSpinnerAdapter, intentPairAdapter;
@@ -281,7 +281,7 @@ public class ActivityManageActionStartActivity extends Activity
 	protected void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.action_start_activity);
+		setContentView(R.layout.activity_manage_action_start_activity);
 		
 		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
 		etParameterName = (EditText)findViewById(R.id.etParameterName);
@@ -329,14 +329,34 @@ public class ActivityManageActionStartActivity extends Activity
 					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
 					return;
 				}
+				else if(etParameterName.getText().toString().contains(Action.intentPairSeperator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeperator), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterName.getText().toString().contains(";"))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+					return;
+				}
 				
 				if(etParameterValue.getText().toString().length() == 0)
 				{
 					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
 					return;
 				}
+				else if(etParameterValue.getText().toString().contains(Action.intentPairSeperator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeperator), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterValue.getText().toString().contains(";"))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+					return;
+				}
 				
-				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + "/" + etParameterName.getText().toString() + "/" + etParameterValue.getText().toString();
+				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeperator + etParameterName.getText().toString() + Action.intentPairSeperator + etParameterValue.getText().toString();
 				intentPairList.add(param);
 				
 				spinnerParameterType.setSelection(0);
@@ -455,7 +475,7 @@ public class ActivityManageActionStartActivity extends Activity
 		{
 			if(params.length > 1)	// should not occur, have fault tollerance
 			{
-				if(params[1].contains("/"))
+				if(params[1].contains(Action.intentPairSeperator))
 				{
 						etActivityOrActionPath.setText(params[0]);
 						startIndex = 1;

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

@@ -1158,6 +1158,13 @@ public class XmlFileInterface
 	            		}
             		}
             	}
+				else if(newAction.getAction().equals(Action_Enum.startOtherActivity))	// separator has been changed, convert in old files
+				{
+					if(tag.contains(Action.intentPairSeperator))	// already has new format
+						newAction.setParameter2(tag);
+					else
+						newAction.setParameter2(tag.replace("/", Action.intentPairSeperator));
+				}
             	else
             		newAction.setParameter2(tag);
             }

app/src/main/res/layout/activity_maintenance.xml

@@ -10,7 +10,26 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-        android:text="@string/settings" />
+        android:text="@string/settings"
+        android:layout_marginBottom="@dimen/default_margin"/>
+
+    <Button
+        android:id="@+id/bMoreSettings"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/moreSettings" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_span="2"
+        android:layout_height="1dp"
+        android:layout_margin="@dimen/default_margin"
+        android:background="#aa000000" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/importExportExplanation" />
 
     <Button
         android:id="@+id/bImportConfiguration"
@@ -24,17 +43,25 @@
         android:layout_height="wrap_content"
         android:text="@string/exportConfiguration" />
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_span="2"
+        android:layout_height="1dp"
+        android:layout_margin="@dimen/default_margin"
+        android:background="#aa000000" />
+
     <Button
         android:id="@+id/bVolumeTest"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/volumeTest" />
 
-    <Button
+    <ImageView
-        android:id="@+id/bMoreSettings"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_span="2"
-        android:text="@string/moreSettings" />
+        android:layout_height="1dp"
+        android:layout_margin="@dimen/default_margin"
+        android:background="#aa000000" />
 
     <Button
         android:id="@+id/bSettingsSetToDefault"
@@ -42,6 +69,13 @@
         android:layout_height="wrap_content"
         android:text="@string/defaultSettings" />
 
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_span="2"
+        android:layout_height="1dp"
+        android:layout_margin="@dimen/default_margin"
+        android:background="#aa000000" />
+
     <Button
         android:id="@+id/bShareConfigAndLog"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_manage_action_start_activity.xml

@@ -139,6 +139,17 @@
 
 			</TableRow>
 
+			<TableRow>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_span="2"
+					android:layout_marginBottom="@dimen/default_margin"
+					android:text="@string/intentDataComment" />
+
+			</TableRow>
+
 			<TableRow
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
@@ -168,7 +179,7 @@
 
 				<EditText
 					android:id="@+id/etParameterName"
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content" />
 
 			</TableRow>

app/src/main/res/layout/text_view_for_poi_listview_mediumtextsize.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content" 
     android:textSize="20sp">
     

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

@@ -659,4 +659,7 @@
     <string name="noApplicableFilesFoundInDirectory">No applicable files could be found in that directory.</string>
     <string name="noFilesImported">No file could be imported.</string>
     <string name="notAllFilesImported">Not all applicable files could be imported.</string>
+    <string name="importExportExplanation">When clicking import or export you select the directory from which files are imported or exported to. When exporting existing files might get overwritten.</string>
+    <string name="intentDataComment">If your parameter is of type Uri AND you specify \"IntentData\" as name (lower/upper case is not important), the parameter will not be added as a normal parameter with putExtra(), but will instead be added to the intent with setData().</string>
+    <string name="stringNotAllowed">String %1$s is not allowed.</string>
 </resources>