bin/classes.dex bin/occyd-android.apk bin/resources.ap_ @@ -11,6 +11,7 @@ android:clickable="true" android:apiKey="insert-your-google-maps-android-api-key-here-and-dont-share-it" /> + <LinearLayout android:id="@+id/zoom" android:layout_width="wrap_content" android:layout_height="wrap_content" res/layout/mapview.xml @@ -20,16 +20,21 @@ package com.pansapiens.occyd; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; +import java.net.URL; import java.net.URLEncoder; import org.json.JSONException; import org.json.JSONObject; import android.app.Activity; +import android.app.Dialog; +import android.app.ProgressDialog; import android.content.Intent; import android.location.Location; import android.location.LocationManager; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -38,6 +43,8 @@ import android.widget.Button; import android.widget.Toast; public class NewPost extends Activity { + protected static final int DIALOG_POSTING = 0; + LocationManager locationManager; @Override @@ -90,18 +97,30 @@ public class NewPost extends Activity { double lat = here.getLatitude(); double lon = here.getLongitude(); - Toast.makeText(NewPost.this, "Posting ...", - Toast.LENGTH_LONG).show(); + //Toast.makeText(NewPost.this, "Posting ...", + // Toast.LENGTH_LONG).show(); + try { String BASEURL = getString(R.string.occyd_server); - String url = String.format("%s/v1/posts/add?ll=%f,%f&desc=%s&tags=%s&link=%s", BASEURL, lat, lon, desc, tags, BASEURL); + String urlstr = String.format("%s/v1/posts/add?ll=%f,%f&desc=%s&tags=%s&link=%s", BASEURL, lat, lon, desc, tags, BASEURL); + final URL url = new URL(urlstr); TextView tx = (TextView) findViewById(R.id.new_post_title); - tx.setText(url); + tx.setText(url.toString()); + + // run http fetch in a thread, with + // 'posting' dialog + final Thread tr = new Thread() { + @Override + public void run() { + handle_result.post(mDisplayPosting); + UrlFetch fetcher = new UrlFetch(url, handle_result); + fetcher.fetch(); + handle_result.post(mDismissPosting); + } + }; + tr.start(); - UrlFetch fetcher = new UrlFetch(url); - result_code = new JSONObject(fetcher.fetch()) - .getString("result"); } catch (MalformedURLException e) { Toast.makeText(NewPost.this, "FAIL: Malformed URL.", @@ -109,10 +128,24 @@ public class NewPost extends Activity { } catch (IOException e) { Toast.makeText(NewPost.this, "FAIL: http fetch failed.", Toast.LENGTH_LONG).show(); - } catch (JSONException e) { - Toast.makeText(NewPost.this, "FAIL: Malformed response from server.", - Toast.LENGTH_LONG).show(); - } + } + } + }); + } + + // result handler - launches / kills + // 'waiting' dialogs, recieves http result body + final Handler handle_result = new Handler() { + @Override + public void handleMessage(Message msg) { + + //Toast.makeText(NewPost.this, msg.obj.toString(), + // Toast.LENGTH_LONG).show(); + + try { + String result_code = new JSONObject(msg.obj.toString()) + .getString("result"); + if (result_code != null && result_code.equals("done")) { Toast.makeText(NewPost.this, "Sighting posted !!", Toast.LENGTH_LONG).show(); @@ -121,12 +154,44 @@ public class NewPost extends Activity { Toast.LENGTH_LONG).show(); } - //TextView tx = (TextView) findViewById(R.id.new_post_title); - //tx.setText(result_code); + } catch (JSONException e) { + Toast.makeText(NewPost.this, "FAIL: Malformed response from server.", + Toast.LENGTH_LONG).show(); + } + } + }; + + final Runnable mDisplayPosting = new Runnable(){ + public void run(){ + showDialog(DIALOG_POSTING); + } + }; + + final Runnable mDismissPosting = new Runnable(){ + public void run(){ + try{ + dismissDialog(DIALOG_POSTING); + } catch(IllegalArgumentException e){ + return; + } + } + }; + + @Override + protected Dialog onCreateDialog(int id) { + switch (id) { + case DIALOG_POSTING: { + ProgressDialog dialog = new ProgressDialog(this); + dialog.setTitle("Posting ..."); + dialog.setMessage("Posting ..."); + dialog.setIndeterminate(true); + dialog.setCancelable(false); + return dialog; } - }); + } + return null; } - + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); src/com/pansapiens/occyd/NewPost.java @@ -17,32 +17,20 @@ package com.pansapiens.occyd; -import java.io.BufferedReader; -import org.apache.commons.lang.StringUtils; import java.io.IOException; -import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Scanner; - -import org.json.JSONArray; import org.json.JSONException; -import org.json.JSONObject; -import org.json.JSONTokener; - - import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface.OnCancelListener; -import android.content.DialogInterface; +import android.app.Dialog; +import android.app.ProgressDialog; import android.content.Intent; import android.location.Location; import android.location.LocationManager; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -54,6 +42,12 @@ import android.widget.TextView; import android.widget.Toast; public class Search extends Activity implements SeekBar.OnSeekBarChangeListener { + private static final int DIALOG_SEARCHING = 0; + + // if true, switch to map view automatically + // after recieving search results + protected static boolean AUTOSHOW_MAP = true; + LocationManager locationManager; EditText query_txt; @@ -61,11 +55,12 @@ public class Search extends Activity implements SeekBar.OnSeekBarChangeListener SeekBar distanceBar; TextView distanceText; String distance_label; - ArrayList<Post> searchResults; - String searchResults_json = null; int distance; String current_ll; + ArrayList<Post> searchResults; + String searchResults_json = null; + /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { @@ -95,43 +90,66 @@ public class Search extends Activity implements SeekBar.OnSeekBarChangeListener final String q = query_txt.getText().toString(); String[] tags = q.split(" "); - Toast.makeText(Search.this, "Fetching results ...", - Toast.LENGTH_SHORT).show(); - - // query server, results returned as json - searchResults_json = searchByTag(tags); - try { - searchResults = JSONdecoder.json2postArray(searchResults_json); - } - catch (JSONException e) { - Toast.makeText(Search.this, "FAIL: Malformed response from server.", - Toast.LENGTH_LONG).show(); - } - - if (searchResults.size() == 0) { - Toast.makeText(Search.this, "Search got zero hits ...", - Toast.LENGTH_LONG).show(); - } - - // TODO: Do it this way: http://code.google.com/android/kb/commontasks.html#binding - // format post_results for output as a list in the TextView tx - String out_string = ""; - for (int i = 0; i < searchResults.size(); i++) { - out_string += searchResults.get(i).tagsToString() + "\n"; - } - - tx.setText(out_string); - Log.i("Search", out_string); - Log.i("Search json result", searchResults_json); - - // show results on a map, search result data passed as raw json - if (searchResults.size() > 0) { - showMapResults(searchResults_json); - } + //Toast.makeText(Search.this, "Fetching results ...", + // Toast.LENGTH_SHORT).show(); + + // query server, results are returned as json + // to the handle results method + searchByTag(tags); } }); } + // result handler - launches / kills + // 'waiting' dialogs, recieves http result body + final Handler handle_result = new Handler() { + + @Override + public void handleMessage(Message msg) { + + //Toast.makeText(Search.this, msg.obj.toString(), + // Toast.LENGTH_LONG).show(); + + if (msg.what == 1) { + searchResults_json = msg.obj.toString(); + + try { + searchResults = JSONdecoder.json2postArray(searchResults_json); + } + catch (JSONException e) { + Toast.makeText(Search.this, "FAIL: Malformed response from server.", + Toast.LENGTH_LONG).show(); + } + + if (searchResults.size() == 0) { + Toast.makeText(Search.this, "Search got zero hits ...", + Toast.LENGTH_LONG).show(); + } else { + + // TODO: Do it this way: http://code.google.com/android/kb/commontasks.html#binding + // format post_results for output as a list in the TextView tx + String out_string = ""; + for (int i = 0; i < searchResults.size(); i++) { + out_string += searchResults.get(i).tagsToString() + "\n"; + } + + tx.setText(out_string); + Log.i("Search", out_string); + Log.i("Search json result", searchResults_json); + + // show results on a map, search result data passed as raw json + if ((searchResults.size() > 0) && AUTOSHOW_MAP) { + showMapResults(searchResults_json); + } + } + + } else { + Toast.makeText(Search.this, "Search failed (IO error ?) ...", + Toast.LENGTH_LONG).show(); + } + } + }; + void showMapResults(String json_result) { // open the MapResults activity ... //mapresultsI.setClassName("com.pansapiens.occyd", "com.pansapiens.occyd.MapResults"); @@ -143,9 +161,25 @@ public class Search extends Activity implements SeekBar.OnSeekBarChangeListener startActivity(mapresultsI); } - public String searchByTag(String[] taglist) { - String json_txt = null; - String tags = StringUtils.join(taglist, ","); + // like the org.apache.commons.lang.StringUtils + // for joining strings (['a','b','c'], '-') => 'a-b-c' + public String joinString(String[] strings, String joiner) { + String outstr = ""; + for (int i = 0; i < strings.length; i++) { + if (i != (strings.length - 1)) { + outstr += strings[i] + joiner; + } else { // for the final token in the list + outstr += strings[i]; + } + } + return outstr; + } + + public void searchByTag(String[] taglist) { + String tags = joinString(taglist, ","); + + final URL url; + UrlFetch fetcher; /* for (int i = 0; i < taglist.length; i++) { tags += taglist[0]; @@ -154,9 +188,9 @@ public class Search extends Activity implements SeekBar.OnSeekBarChangeListener try { String BASEURL = getString(R.string.occyd_server); - UrlFetch fetcher; if (distance == 0) { - fetcher = new UrlFetch(BASEURL+"/v1/posts/get?tag="+tags+"&format=json"); + url = new URL(BASEURL+"/v1/posts/get?tag="+tags+"&format=json"); + fetcher = new UrlFetch(url, handle_result); } else { Location here = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER); @@ -164,14 +198,27 @@ public class Search extends Activity implements SeekBar.OnSeekBarChangeListener double lon = here.getLongitude(); String current_ll = String.format("%f,%f", lat, lon); - String urlstr = BASEURL+"/v1/posts/get?tag="+tags+"&radius="+distance+"&near="+current_ll+"&format=json"; + url = new URL(BASEURL+"/v1/posts/get?tag="+tags+"&radius="+distance+"&near="+current_ll+"&format=json"); - Toast.makeText(Search.this, urlstr, + Toast.makeText(Search.this, url.toString(), Toast.LENGTH_LONG).show(); - fetcher = new UrlFetch(urlstr); + fetcher = new UrlFetch(url, handle_result); } - json_txt = fetcher.fetch(); + + // run http fetch in a thread, with + // 'searching' dialog + final Thread tr = new Thread() { + @Override + public void run() { + handle_result.post(mDisplaySearching); + UrlFetch fetcher = new UrlFetch(url, handle_result); + fetcher.fetch(); + handle_result.post(mDismissSearching); + } + }; + tr.start(); + } catch (MalformedURLException e) { Toast.makeText(Search.this, "FAIL: Malformed URL.", Toast.LENGTH_LONG).show(); @@ -179,9 +226,39 @@ public class Search extends Activity implements SeekBar.OnSeekBarChangeListener Toast.makeText(Search.this, "FAIL: http fetch failed.", Toast.LENGTH_LONG).show(); } - return json_txt; } + final Runnable mDisplaySearching = new Runnable(){ + public void run(){ + showDialog(DIALOG_SEARCHING); + } + }; + + final Runnable mDismissSearching = new Runnable(){ + public void run(){ + try{ + dismissDialog(DIALOG_SEARCHING); + } catch(IllegalArgumentException e){ + return; + } + } + }; + + @Override + protected Dialog onCreateDialog(int id) { + switch (id) { + case DIALOG_SEARCHING: { + ProgressDialog dialog = new ProgressDialog(this); + dialog.setTitle("Searching ..."); + dialog.setMessage("Searching ..."); + dialog.setIndeterminate(true); + dialog.setCancelable(false); + return dialog; + } + } + return null; + } + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); src/com/pansapiens/occyd/Search.java @@ -20,35 +20,58 @@ package com.pansapiens.occyd; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; +import java.util.ArrayList; +import java.util.List; -import android.widget.Toast; +import org.apache.http.Header; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.params.ClientPNames; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicHeader; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; + +import android.os.Handler; +import android.os.Message; public class UrlFetch { - URL url; - public UrlFetch(String url_str) throws MalformedURLException { - url = new URL(url_str); - } - - public String fetch(String url_str) throws MalformedURLException, IOException { - // grab a url - url = new URL(url_str); - return fetch(); - } - // TODO: make fetching threaded (example: http://developerlife.com/tutorials/?p=290 ) ? - public String fetch() throws IOException { - String response = null; + public String USER_AGENT = "OccydAndroid/1.0"; + private final Handler handler; + private URL url; - URLConnection conn; - conn = url.openConnection(); - conn.setRequestProperty("User-agent", "OccydAndroid/1.0"); + public UrlFetch(URL uri, Handler result_handler) { + super(); + url = uri; + handler = result_handler; + } + + public void fetch() { + String response = ""; + Message msg = Message.obtain(); + msg.what = 0; + msg.obj = "empty"; + try { + // create an http client with a get request + // for our url + HttpClient httpClient = new DefaultHttpClient(); + HttpContext localContext = new BasicHttpContext(); + HttpGet httpGet = new HttpGet(url.toString()); + + // set the User-Agent + List<Header> headers=new ArrayList<Header>(); + headers.add(new BasicHeader("User-Agent", USER_AGENT)); + httpClient.getParams().setParameter(ClientPNames.DEFAULT_HEADERS, headers); + + // execute the request + HttpResponse resp = httpClient.execute(httpGet, localContext); BufferedReader in = new BufferedReader( new InputStreamReader( - conn.getInputStream())); + resp.getEntity().getContent())); String inputLine; response = ""; @@ -56,6 +79,14 @@ public class UrlFetch { response += inputLine; in.close(); - return response; - } + msg.what = 1; + msg.obj = response; + + } catch (IOException e) { + msg.what = 0; + msg.obj = "io exception : " + url.toString(); + } finally { + handler.sendMessage(msg); + } + } } \ No newline at end of file src/com/pansapiens/occyd/UrlFetch.java baac87e3432e3c03fcd19ec8e270c50086a033b5 90c56635f51028f0372e4fb536e4afc2feae0fb3 pansapiens ajperry@pansapiens.com http://github.com/pansapiens/occyd-android/commit/5e7361d12bd6e69d029e9eb23f268bdf662717ac 5e7361d12bd6e69d029e9eb23f268bdf662717ac 2009-03-15T02:43:51-07:00 2009-03-15T02:43:51-07:00 Merge branch 'threaded', resolved conflicts. c8ccec0c7ccaa77f3c6c5c082b69aba432cabae6 pansapiens ajperry@pansapiens.com