update field1

Author: fgwei

apks/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1.apk

@@ -8,21 +8,27 @@
         android:minSdkVersion="21"
         android:targetSdkVersion="21" />
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="com.ksu.fieldFlowSentivity.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".FooActivity"
+            android:label="@string/title_activity_foo" 
+            android:exported="false" >
+        </activity>
     </application>
 
 </manifest>

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.ksu.fieldFlowSentivity.FooActivity" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_activity_foo" />
+
+</RelativeLayout>

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/res/layout/activity_foo.xml

@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.ksu.fieldFlowSentivity.FooActivity" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/res/menu/foo.xml

@@ -0,0 +1,10 @@
+<resources>
+
+    <!--
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+
+</resources>

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/res/values-w820dp/dimens.xml

@@ -4,5 +4,6 @@
     <string name="app_name">FieldAndObjectSensitivity_FieldFlowSensitivity1</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
+    <string name="title_activity_foo">FooActivity</string>
 
 </resources>

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/res/values/strings.xml

@@ -1,9 +1,58 @@
 package com.ksu.fieldFlowSentivity;
 
-import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
 
-public class Data {
-  public String retrieveData(Context context){
-	  return "Data";
-  }
+public class Data implements Parcelable {
+	
+	public Data() {
+		
+	}
+	
+	private String mData1;
+	private String mData2;
+	
+	public void setData1(String d) {
+		this.mData1 = d;
+	}
+	
+	public void setData2(String d) {
+		this.mData2 = d;
+	}
+	
+	public String retrieveData1(){
+		return this.mData1;
+	}
+	
+	public String retrieveData2(){
+		return this.mData2;
+	}
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
+	
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeString(this.mData1);
+		dest.writeString(this.mData2);
+	}
+	
+	// this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
+    public static final Parcelable.Creator<Data> CREATOR = new Parcelable.Creator<Data>() {
+        public Data createFromParcel(Parcel in) {
+            return new Data(in);
+        }
+
+        public Data[] newArray(int size) {
+            return new Data[size];
+        }
+    };
+
+    // example constructor that takes a Parcel and gives you an object populated with it's values
+    private Data(Parcel in) {
+        mData1 = in.readString();
+        mData2 = in.readString();
+    }
 }

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/src/com/ksu/fieldFlowSentivity/Data.java

@@ -0,0 +1,46 @@
+package com.ksu.fieldFlowSentivity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class FooActivity extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_foo);
+		Intent i = getIntent();
+		Data d = i.getParcelableExtra("data");
+		String data1 = d.retrieveData1();
+		Log.i("data1", data1); // no leak
+		String data2 = d.retrieveData2();
+		process(data2);
+	}
+	
+	public void process(String data){
+		// do something. no leak
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.foo, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// Handle action bar item clicks here. The action bar will
+		// automatically handle clicks on the Home/Up button, so long
+		// as you specify a parent activity in AndroidManifest.xml.
+		int id = item.getItemId();
+		if (id == R.id.action_settings) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+}

eclipse-projects/FieldAndObjectSensitivity/FieldAndObjectSensitivity_FieldFlowSensitivity1/src/com/ksu/fieldFlowSentivity/FooActivity.java

@@ -1,35 +1,36 @@
 package com.ksu.fieldFlowSentivity;
 
 import android.os.Bundle;
-import android.util.Log;
+import android.telephony.TelephonyManager;
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 
 /**
  * @testcase_name FieldAndObjectSensitivity_FieldFlowSensitivity1
  * @author Fengguo Wei & Sankardas Roy
  * @author_mail fgwei@ksu.edu & sroy@ksu.edu
  * 
- * @description Normal data reterived from Data object and log it. Then, reterive 
- * 				sensitive data from SensitiveData, and do some process.
+ * @description Normal data reterived from Data object and log it (in FooActivity). Then, reterive 
+ * 				sensitive data from Data, and do some process (no leak, in FooActivity).
  * @dataflow source -> _
  * @number_of_leaks 0
- * @challenges The analysis have to build interprocedural control flow graph in a flow sensitive way.
+ * @challenges The analysis have to build intercomponent control flow graph in a flow sensitive way.
  */
 public class MainActivity extends Activity {
-
-	Data data;
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		Data d = new Data();
-		this.data = d;
-		Log.d("id", this.data.retrieveData(this)); //sink, no leak
-		Data sd = new SensitiveData();
-		this.data = sd;
-		process(this.data.retrieveData(this));
+		d.setData1("data");
+		TelephonyManager tel = (TelephonyManager) getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
+		String imei = tel.getDeviceId(); //source
+		d.setData2(imei);
+		Intent i = new Intent(getApplicationContext(), FooActivity.class);
+		i.putExtra("data", d);
+		startActivity(i);
 	}
 
-	public void process(String data){
-		// do something. no leak
-	}
+	
 }