diff --git a/mobiotsec3justask/app/src/main/AndroidManifest.xml b/mobiotsec3justask/app/src/main/AndroidManifest.xml index faaf2ae..f26397c 100644 --- a/mobiotsec3justask/app/src/main/AndroidManifest.xml +++ b/mobiotsec3justask/app/src/main/AndroidManifest.xml @@ -12,7 +12,6 @@ - diff --git a/mobiotsec3justask/app/src/main/java/com/example/justask/MainActivity.java b/mobiotsec3justask/app/src/main/java/com/example/justask/MainActivity.java index c25bb68..bd0e48e 100644 --- a/mobiotsec3justask/app/src/main/java/com/example/justask/MainActivity.java +++ b/mobiotsec3justask/app/src/main/java/com/example/justask/MainActivity.java @@ -8,8 +8,15 @@ import android.net.Uri; import android.os.Bundle; import android.util.Log; +import java.util.ArrayList; + public class MainActivity extends AppCompatActivity { + // FLAG 1: + // FLAG 2: lapidem_non_vi + // FLAG 3: + // FLAG 4: + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -17,7 +24,8 @@ public class MainActivity extends AppCompatActivity { // "com.example.victimapp/.PartOne" Intent callIntent = new Intent("com.example.victimapp.intent.action.JUSTASK"); - startActivityForResult(callIntent, 2); + startActivityForResult(callIntent, 0); + // Intent resultIntent = new Intent(); // setResult(Activity.RESULT_OK, resultIntent); @@ -33,10 +41,10 @@ public class MainActivity extends AppCompatActivity { super.onActivityResult(requestCode, resultCode, data); Log.d("MOBIOTSEC", "code: "+ resultCode); - if (requestCode == 2) { + if (requestCode == 0) { if (resultCode == RESULT_OK) { - Log.d("MOBIOTSEC", "res: " + data.getDataString()); + Log.d("MOBIOTSEC", "res: " + data.getExtras().toString()); // do your task } else if (resultCode == RESULT_CANCELED) { @@ -45,8 +53,15 @@ public class MainActivity extends AppCompatActivity { } else { - Log.d("MOBIOTSEC", "error 2"); - Log.d("MOBIOTSEC", "res: " + data.getDataString()); + Bundle extra = data.getExtras(); + + /*for (String key: extra.keySet()) + { + Log.d ("MOBIOTSEC", key + " is a key in the bundle"); + }*/ + + Log.d("MOBIOTSEC", "Last"); + Log.d("MOBIOTSEC", "res: " + extra.getString("flag")); } } diff --git a/mobiotsec3justask/justask/justask_logs.txt b/mobiotsec3justask/justask/justask_logs.txt index 430a92f..72d873e 100644 --- a/mobiotsec3justask/justask/justask_logs.txt +++ b/mobiotsec3justask/justask/justask_logs.txt @@ -1,3 +1,5 @@ ---------- beginning of main --------- beginning of system -03-11 08:49:39.261 10345 10345 D MOBIOTSEC: code: 2 +--------- beginning of main +03-11 09:46:22.771 12254 12254 D MOBIOTSEC: code: 2 +03-11 09:46:22.771 12254 12254 D MOBIOTSEC: Last +03-11 09:46:22.771 12254 12254 D MOBIOTSEC: res: lapidem_non_vi