Final commit before jna

AndroidManifest.xml

@@ -2,9 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.jourhyang.disasmarm"
       android:versionCode="1"
-      android:versionName="1.0">
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+      android:versionName="1.0"
+	  xmlns:tools="http://schemas.android.com/tools">
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+		tools:remove="android:maxSdkVersion" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		tools:remove="android:maxSdkVersion"/>
 
     <uses-sdk android:minSdkVersion="4" />
     <application android:label="@string/app_name"

src/com/jourhyang/disasmarm/FileSelectorActivity.java

@@ -8,6 +8,7 @@
 import android.widget.*;
 import java.io.*;
 import java.util.*;
+import android.util.*;
 
 public class FileSelectorActivity extends ListActivity {
 	private List<String> item = (List<String>) null;
@@ -17,10 +18,10 @@ public class FileSelectorActivity extends ListActivity {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+		super.onCreate(savedInstanceState);;
 		setContentView(R.layout.fileaselactivity);
 		mPath = (TextView) findViewById(R.id.path);
-		getDir(root);
+		getDir("/sdcard/");
 	}
 
 	private void getDir(String dirPath) {
@@ -35,7 +36,13 @@ private void getDir(String dirPath) {
 			item.add("../");
 			path.add(f.getParent());
 		}
-
+		if(files==null)
+		{
+			Log.e("Disassembler dirsel","listfile null");
+			ArrayAdapter<String> fileList = new ArrayAdapter<String>(this, R.layout.row, item);
+			setListAdapter(fileList);
+			return;
+		}
 		for (int i = 0; i < files.length; i++) {
 			File file = files[i];
 			path.add(file.getPath());

src/com/jourhyang/disasmarm/ListViewItem.java

@@ -114,6 +114,10 @@ public String getCondition()
 		return condition;
 	}
 
+	public void AddComment(String comment)
+	{
+		this.comments+=comment;
+	}
 	@Override
 	public String toString()
 	{

src/com/jourhyang/disasmarm/MainActivity.java

@@ -25,7 +25,7 @@ public class MainActivity extends Activity implements Button.OnClickListener
 	ELFUtil elfUtil;
 	SharedPreferences setting;
 	SharedPreferences.Editor editor;
-	private String TAG="Disassembler";
+	private static final String TAG="Disassembler";
 
 	boolean showAddress=true;
 	boolean showLabel=true;
@@ -391,6 +391,7 @@ public void run()
 					long addr=elfUtil.getCodeSectionVirtAddr();
 					Log.v(TAG, "code section point :" + Long.toHexString(index));
 					//	getFunctionNames();
+					HashMap xrefComments=new HashMap();
 					for (;;)
 					{
 						DisasmResult dar=new DisasmResult(filecontent, index, addr);
@@ -404,7 +405,10 @@ public void run()
 							//break;
 						}
 						final ListViewItem lvi=new ListViewItem(dar);
-
+						if(lvi.isBranch())
+						{
+							xrefComments.put(lvi.getTargetAddress(),lvi.address);
+						}
 						runOnUiThread(new Runnable(){
 								@Override
 								public void run()
@@ -443,6 +447,9 @@ public void run()
 					}
 					mNotifyManager.cancel(0);
 					final int len=disasmResults.size();
+					//add xrefs
+
+
 					runOnUiThread(new Runnable(){
 							@Override
 							public void run()
@@ -543,27 +550,27 @@ public void AdjustShow(TextView t1v, TextView t2v, TextView t3v, TextView t4v, T
 		t7v.setVisibility(isShowComment() ? View.VISIBLE: View.GONE);
 	}
 
-	final int REQUEST_WRITE_STORAGE_REQUEST_CODE=1;
-	private void requestAppPermissions() {
+	public static final int REQUEST_WRITE_STORAGE_REQUEST_CODE=1;
+	public static void requestAppPermissions(Activity a) {
 		if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
 			return;
 		}
-
-		if (hasReadPermissions() && hasWritePermissions()) {
+		if (hasReadPermissions(a) && hasWritePermissions(a)) {
+			Log.i(TAG,"Has permissions");
 			return;
 		}
-		requestPermissions(new String[] {
+		a.requestPermissions(new String[] {
 											  Manifest.permission.READ_EXTERNAL_STORAGE,
 											  Manifest.permission.WRITE_EXTERNAL_STORAGE
 										  }, REQUEST_WRITE_STORAGE_REQUEST_CODE); // your request code
 	}
 
-	private boolean hasReadPermissions() {
-		return checkSelfPermission( Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+	public static boolean hasReadPermissions(Context c) {
+		return c.checkSelfPermission( Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
 	}
 
-	private boolean hasWritePermissions() {
-		return checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+	public static boolean hasWritePermissions(Context c) {
+		return c.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
 	}
     /** Called when the activity is first created. */
     @Override
@@ -645,14 +652,14 @@ public void onItemClick(AdapterView<?> parent, View p2, int position, long id)
 					ListViewItem lvi=(ListViewItem) parent.getItemAtPosition(position);
 					if (lvi.isBranch())
 					{
-
+						
 					}
 					// TODO: Implement this method
 					return;
 				}			
 			});
 
-		requestAppPermissions();
+		requestAppPermissions(this);
 		//	ViewGroup.LayoutParams lp= listview.getLayoutParams();
 		//listview.setMinimumHeight(getScreenHeight());
 		//listview.setLayoutParams(lp);

src/com/jourhyang/disasmarm/SettingsActivity.java

@@ -62,6 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		}
 		//setOnPreferenceChange(findPreference("userNameOpen"));
 		//	setOnPreferenceChange(findPreference("autoUpdate_ringtone"));
+		MainActivity.requestAppPermissions(this);
 	}
 
 	private void setOnPreferenceChange(Preference mPreference) {