diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9d5c3b7..eab671b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,15 +2,18 @@ + android:versionName="1.0" + android:installLocation="auto"> + android:minSdkVersion="11" + android:targetSdkVersion="19" /> + android:allowBackup="true" + android:label="@string/app_name" + android:logo="@drawable/cube"> diff --git a/lint.xml b/lint.xml new file mode 100644 index 0000000..f494123 --- /dev/null +++ b/lint.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/project.properties b/project.properties index 0252d89..7de5c70 100644 --- a/project.properties +++ b/project.properties @@ -10,4 +10,5 @@ # Project target. target=android-19 android.library.reference.1=../../workspace/gridlayout_v7 -android.library.reference.1=/storage/emulated/0/Download/android-support-v7-appcompat-master/android-support-v7-appcompat-master \ No newline at end of file +android.library.reference.1=../../workspace/gridlayout_v7 +android.library.reference.2=../../workspace/android-support-v7-appcompat diff --git a/res/menu/menu.xml b/res/menu/menu.xml index 5b8efb8..10fe7d2 100644 --- a/res/menu/menu.xml +++ b/res/menu/menu.xml @@ -1,17 +1,17 @@ + xmlns:support="http://schemas.android.com/apk/res-auto"> + support:showAsAction="ifRoom" /> + support:showAsAction="always" + support:actionProviderClass="android.support.v7.widget.ShareActionProvider" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1d94548..138f700 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,7 +2,7 @@ Google Dorks http://rss.slashdot.org/Slashdot/slashdot - Updating... + Updating… Download Choose a category @@ -26,5 +26,5 @@ Settings Select Choose Source - + diff --git a/src/com/cmb/googledorks/Constants.java b/src/com/cmb/googledorks/Constants.java new file mode 100644 index 0000000..d7b923f --- /dev/null +++ b/src/com/cmb/googledorks/Constants.java @@ -0,0 +1,7 @@ +package com.cmb.googledorks; + +public interface Constants { + final String LOG = "com.cmb.googledorks"; + final int ABOUT = 0; + +} diff --git a/src/com/cmb/googledorks/GetGoogleDorks.java b/src/com/cmb/googledorks/GetGoogleDorks.java index 3cd6a5e..ab139f2 100644 --- a/src/com/cmb/googledorks/GetGoogleDorks.java +++ b/src/com/cmb/googledorks/GetGoogleDorks.java @@ -1,11 +1,6 @@ package com.cmb.googledorks; -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import android.view.View.OnClickListener; import android.widget.*; -import org.xml.sax.*; import android.content.*; import java.io.*; import android.content.res.*; diff --git a/src/com/cmb/googledorks/MainActivity.java b/src/com/cmb/googledorks/MainActivity.java index da176a6..1d730cb 100644 --- a/src/com/cmb/googledorks/MainActivity.java +++ b/src/com/cmb/googledorks/MainActivity.java @@ -2,32 +2,34 @@ package com.cmb.googledorks; import android.app.*; import android.os.*; +import android.util.Log; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.widget.*; -import android.view.View.*; import java.util.*; import android.widget.AdapterView.*; + +import java.io.UnsupportedEncodingException; import java.net.*; import android.content.*; import android.net.*; import android.support.v4.view.*; import android.support.v7.widget.ShareActionProvider; -public class MainActivity extends Activity +public class MainActivity extends Activity implements Constants { Spinner catSpin; ListView listV; final GetGoogleDorks dorks = new GetGoogleDorks(); - final public int ABOUT = 0; + public final String TAG = "MainActivity"; ArrayAdapter adapter; List list= null; private ShareActionProvider mShare; protected String dorkSelected = ""; + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu, menu); @@ -43,6 +45,8 @@ public class MainActivity extends Activity super.onCreate(savedInstanceState); setContentView(R.layout.main); + if (BuildConfig.DEBUG) { Log.d(TAG, LOG + " onCreate Called"); } + listV = (ListView)findViewById(R.id.listBox); catSpin = (Spinner)findViewById(R.id.catSpin); @@ -86,7 +90,7 @@ public class MainActivity extends Activity @Override public void onNothingSelected(AdapterView parent) { - //required implememt + //required to implement } }); @@ -106,18 +110,22 @@ public class MainActivity extends Activity listV.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int pos, long idt) { + Uri uuri = null; if(list.get(pos).toString().startsWith("http")) { - startActivity(new Intent(Intent.ACTION_VIEW, - Uri.parse(list.get(pos)))); + uuri = Uri.parse(list.get(pos).toString()); + startActivity(new Intent(Intent.ACTION_VIEW, uuri)); } else { - startActivity(new Intent(Intent.ACTION_VIEW, - Uri.parse("http://www.google.com/#q=" - + URLEncoder.encode(list.get(pos))))); + try { + uuri = Uri.parse("http://www.google.com/#q=" + URLEncoder.encode(list.get(pos), "UTF-8")); + } + catch(UnsupportedEncodingException uex) { + Log.e(TAG, LOG, uex); + } + startActivity(new Intent(Intent.ACTION_VIEW, uuri)); } - Toast.makeText(getBaseContext() - , "Opening http://google.com/#q=" + URLEncoder.encode(list.get(pos)), Toast.LENGTH_LONG).show(); + Toast.makeText(getBaseContext(), uuri.toString(), Toast.LENGTH_LONG).show(); } }); } @@ -139,14 +147,6 @@ public class MainActivity extends Activity return super.onOptionsItemSelected(item); } } - - /** - * Launching new activity - * */ - private void ShowShare() { - Intent i = new Intent(MainActivity.this, ShowHelp.class); - startActivity(i); - } private void setShareIntent(Intent shareIntent) { if (mShare != null) { @@ -157,7 +157,6 @@ public class MainActivity extends Activity private Intent getShareItem() { Intent inten = new Intent(Intent.ACTION_SEND); inten.setType("image/*"); - return inten; } } diff --git a/src/com/cmb/googledorks/SettingsActivity.java b/src/com/cmb/googledorks/SettingsActivity.java index f089757..e5632b8 100644 --- a/src/com/cmb/googledorks/SettingsActivity.java +++ b/src/com/cmb/googledorks/SettingsActivity.java @@ -2,9 +2,6 @@ package com.cmb.googledorks; import android.app.*; import android.os.*; -import android.view.*; -import android.widget.*; -import android.view.View.*; public class SettingsActivity extends Activity { diff --git a/src/com/cmb/googledorks/ShowHelp.java b/src/com/cmb/googledorks/ShowHelp.java index 4fd0b0c..b5b372d 100644 --- a/src/com/cmb/googledorks/ShowHelp.java +++ b/src/com/cmb/googledorks/ShowHelp.java @@ -11,7 +11,6 @@ import android.text.Html; import android.text.util.Linkify; import android.graphics.Color; import android.widget.TextView; -import android.content.res.*; public class ShowHelp extends Dialog {