Added feature request, opensource, bug report feature on crash

yhs0602 · Sep 25, 2018 · ec72f28 · ec72f28
1 parent 0d4f6ec
commit ec72f28
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -33,4 +33,7 @@ Can be directly pasted as code!
 It can be loaded again to analyze again(though reloading is not implemented yet - Sorry:( )
 
 # Build
-I use [AIDE](https://play.google.com/store/apps/details?id=com.aide.ui) to build the project.
+I use [AIDE](https://play.google.com/store/apps/details?id=com.aide.ui) to build the project.
+
+# Open Source
+ - This app used [Capstone](https://github.com/aquynh/capstone), and [Colorpickerview](https://github.com/danielnilsson9/color-picker-view).
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/R$string.class b/bin/classesdebug/com/jourhyang/disasmarm/R$string.class
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/R$xml.class b/bin/classesdebug/com/jourhyang/disasmarm/R$xml.class
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/R.class b/bin/classesdebug/com/jourhyang/disasmarm/R.class
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity$0$debug.class b/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity$0$debug.class
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity$100000000$0$debug.class b/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity$100000000$0$debug.class
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity$100000000.class b/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity$100000000.class
diff --git a/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity.class b/bin/classesdebug/com/jourhyang/disasmarm/SettingsActivity.class
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/R$string.class b/bin/classesrelease/com/jourhyang/disasmarm/R$string.class
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/R$string.dex b/bin/classesrelease/com/jourhyang/disasmarm/R$string.dex
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/R$xml.class b/bin/classesrelease/com/jourhyang/disasmarm/R$xml.class
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/R$xml.dex b/bin/classesrelease/com/jourhyang/disasmarm/R$xml.dex
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/R.class b/bin/classesrelease/com/jourhyang/disasmarm/R.class
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/R.dex b/bin/classesrelease/com/jourhyang/disasmarm/R.dex
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity$100000000.class b/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity$100000000.class
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity$100000000.dex b/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity$100000000.dex
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity.class b/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity.class
diff --git a/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity.dex b/bin/classesrelease/com/jourhyang/disasmarm/SettingsActivity.dex
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/jourhyang/disasmarm/R.java b/gen/com/jourhyang/disasmarm/R.java
@@ -2576,23 +2576,25 @@ public static final class string {
         public static final int abc_toolbar_collapse_description=0x7f060010;
         public static final int app_info=0x7f060020;
         public static final int app_name=0x7f06001f;
-        public static final int choose_external_storage=0x7f060028;
-        public static final int choose_storage=0x7f060027;
+        public static final int choose_external_storage=0x7f06002a;
+        public static final int choose_storage=0x7f060029;
         public static final int dev_info=0x7f060021;
         public static final int dev_info_detail=0x7f060022;
-        public static final int external_storage=0x7f060029;
+        public static final int external_storage=0x7f06002b;
         public static final int open_info=0x7f060025;
         public static final int open_info_detail=0x7f060026;
         public static final int search_menu_title=0x7f060011;
+        public static final int send_feature_request=0x7f060027;
+        public static final int send_feature_request_detail=0x7f060028;
         public static final int send_mail=0x7f060023;
         public static final int send_mail_detail=0x7f060024;
         public static final int status_bar_notification_info_overflow=0x7f06001e;
-        public static final int text_freespace=0x7f06002b;
-        public static final int toast_not_readable=0x7f06002d;
-        public static final int toast_threshold_breached=0x7f06002c;
+        public static final int text_freespace=0x7f06002d;
+        public static final int toast_not_readable=0x7f06002f;
+        public static final int toast_threshold_breached=0x7f06002e;
         /**  Usb storage descripton 
          */
-        public static final int usb_storage=0x7f06002a;
+        public static final int usb_storage=0x7f06002c;
     }
     public static final class style {
         public static final int AlertDialog_AppCompat=0x7f080084;

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -8,9 +8,14 @@
 	<string name="send_mail_detail">Send an e-mail to the developer.</string>
 	<string name="open_info">Open source info</string>
 	<string name="open_info_detail">Open source license</string>
-	    <string name="app_name">Storage Chooser</string>
+	<string name="send_feature_request">Send Feature request</string>
+	<string name="send_feature_request_detail">Send a feature request to the developer.</string>
+
+
     <string name="choose_storage">Choose Storage</string>
-    <string name="choose_external_storage">Choose External Storage</string>
+
+
+	<string name="choose_external_storage">Choose External Storage</string>
 
     <string name="external_storage">External storage</string>
     <!-- Usb storage descripton -->

diff --git a/res/xml/pref_settings.xml b/res/xml/pref_settings.xml
@@ -61,8 +61,8 @@
                 android:data="mailto:jourhyang123@naver.com" />
         </Preference>
 		<Preference
-            android:summary="@string/send_mail_detail"
-            android:title="@string/send_mail" >
+            android:summary="@string/send_feature_request_detail"
+            android:title="@string/send_feature_request" >
             <intent
                 android:action="android.intent.action.SENDTO"
                 android:data="mailto:1641832e@fire.fundersclub.com" />
@@ -75,7 +75,9 @@
                 android:targetPackage="com.jourhyang.disasmarm" />
         </Preference-->
 		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-			android:key="openscrn">
+			android:key="openscrn"
+			android:title="Open source LICENSE"
+			android:summary="Check open source license">
 			<Preference
 					android:summary="capstone disassembler engine"
 					android:title="Capstone"
@@ -87,5 +89,4 @@
 					android:key="colorpicker"/>
 		</PreferenceScreen>
     </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/src/com/jourhyang/disasmarm/SettingsActivity.java b/src/com/jourhyang/disasmarm/SettingsActivity.java
@@ -1,43 +1,76 @@
 package com.jourhyang.disasmarm;
 
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
-import android.preference.RingtonePreference;
-import android.text.TextUtils;
+import android.app.*;
+import android.content.*;
+import android.media.*;
+import android.net.*;
+import android.os.*;
 import android.preference.*;
+import android.text.*;
+import android.util.*;
+import java.io.*;
 
 public class SettingsActivity extends PreferenceActivity implements Preference.OnPreferenceClickListener
 {
+	private String TAG="Disassembler settings";
+
 	@Override
 	public boolean onPreferenceClick(Preference p1)
 	{
-		// TODO: Implement this method
+		String key=p1.getKey();
+		StringBuilder buf=new StringBuilder();
+		Log.v(TAG,"on");
+		try
+		{
+			Log.v(TAG,"key="+key);
+			InputStream notice=getAssets().open(key);
+			BufferedReader in=
+				new BufferedReader(new InputStreamReader(notice, "UTF-8"));
+			String str;
+			while ((str=in.readLine()) != null) {
+				buf.append(str);
+			}
+			in.close();
+		}
+		catch (IOException e)
+		{
+			Log.e(TAG,"",e);
+		}
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle(key);
+		builder.setMessage(buf.toString());
+		builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+				public void onClick(DialogInterface dialog, int id)
+				{
+					//action on dialog close
+				}
+			});
+		builder.show();
 		return true ;
 	}
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.pref_settings);
 		PreferenceScreen scrn=(PreferenceScreen) findPreference("openscrn");
-		scrn.setOnPreferenceClickListener(this);
+		//scrn.setOnPreferenceClickListener(this);
+		int cnt=scrn.getPreferenceCount();
+		for(int i=0;i<cnt;++i)
+		{
+			Preference prf=scrn.getPreference(i);
+			prf.setOnPreferenceClickListener(this);
+		}
 		//setOnPreferenceChange(findPreference("userNameOpen"));
-	//	setOnPreferenceChange(findPreference("autoUpdate_ringtone"));
+		//	setOnPreferenceChange(findPreference("autoUpdate_ringtone"));
 	}
 
 	private void setOnPreferenceChange(Preference mPreference) {
 		mPreference.setOnPreferenceChangeListener(onPreferenceChangeListener);
 		onPreferenceChangeListener.onPreferenceChange(
-				mPreference,
-				PreferenceManager.getDefaultSharedPreferences(
-						mPreference.getContext()).getString(
-						mPreference.getKey(), ""));
+			mPreference,
+			PreferenceManager.getDefaultSharedPreferences(
+				mPreference.getContext()).getString(
+				mPreference.getKey(), ""));
 	}
 
 	private Preference.OnPreferenceChangeListener onPreferenceChangeListener = new Preference.OnPreferenceChangeListener() {
@@ -59,13 +92,13 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 				int index = listPreference.findIndexOfValue(stringValue);
 
 				preference
-						.setSummary(index >= 0 ? listPreference.getEntries()[index]
+					.setSummary(index >= 0 ? listPreference.getEntries()[index]
 								: null);
 
 			} else if (preference instanceof RingtonePreference) {
-				
+
 				/*
-				RingtonePreference�� ��� stringValue��
+				 RingtonePreference�� ��� stringValue��
 				 * content://media/internal/audio/media�� ����̱� ������
 				 * RingtoneManager� ����Ͽ� Summary�� ����Ѵ�
 				 * 
@@ -77,15 +110,15 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 					preference.setSummary("������ �����");
 				} else {
 					Ringtone ringtone = RingtoneManager.getRingtone(
-							preference.getContext(), Uri.parse(stringValue));
+						preference.getContext(), Uri.parse(stringValue));
 
 					if (ringtone == null) {
 						// Clear the summary if there was a lookup error.
 						preference.setSummary(null);
 
 					} else {
 						String name = ringtone
-								.getTitle(preference.getContext());
+							.getTitle(preference.getContext());
 						preference.setSummary(name);
 					}
 				}
@@ -103,5 +136,5 @@ protected void onPause()
 		super.onPause();
 		//getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(onPreferenceChangeListener);
 	}
-	
+
 }