Merge branch 'master' of github.com:deepwinter/rhus-android

ZavenArra · Apr 13, 2012 · d5746a8 · d5746a8
2 parents 272d3d6 + 8cba530
commit d5746a8
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 50 deletions.
diff --git a/gen/net/winterroot/android/wildflowers/BuildConfig.java b/gen/net/winterroot/android/wildflowers/BuildConfig.java
diff --git a/src/net/winterroot/android/rhus/RhusDocumentDetailActivity.java b/src/net/winterroot/android/rhus/RhusDocumentDetailActivity.java
@@ -13,6 +13,8 @@
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -25,36 +27,21 @@
 
 public class RhusDocumentDetailActivity extends Activity {
 
-	static final String DOCUMENT_EXTRA = "RhusDocumentDetailActivity_Document_Extra";
+	static final String DOCUMENT_EXTRA = "net.winterroot.android.rhus.RhusDocumentDetailActivity_Document_Extra";
 
 	private RhusDocument document = null; 
 
 	private String TAG = "RhusDocumentDetailActivity";
 
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+
 		super.onCreate(savedInstanceState);
 
 		Bundle extras = getIntent().getExtras();
-		String documentJson = extras.getString(RhusDocumentDetailActivity.DOCUMENT_EXTRA);
-		Log.v(TAG, documentJson);
-		if(documentJson != null){
-			ObjectMapper mapper = new ObjectMapper();
-			try {
-				document = mapper.readValue(documentJson, RhusDocument.class);
-			} catch (JsonParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (JsonMappingException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}	
-
-		}
-
+		document = extras.getParcelable(RhusDocumentDetailActivity.DOCUMENT_EXTRA);
+
         setContentView(R.layout.documentdetail);
 
         ((ImageButton) findViewById(R.id.closeDocumentDetail)).setOnClickListener(	new OnClickListener(){
@@ -84,14 +71,15 @@ public void onClick(View arg0) {
 
 
         ImageView detailImage = (ImageView) findViewById(R.id.detailImage);
-        if(document.medium != null){
+        if(document != null && document.medium != null){
         	ByteArrayInputStream is = new ByteArrayInputStream(document.medium);
         	Drawable drw = Drawable.createFromStream(is, "mediumImage");
         	detailImage.setImageDrawable(drw);
         }
 
 	}
 
-
-
+
+
+
 }
diff --git a/src/net/winterroot/android/rhus/RhusMapActivity.java b/src/net/winterroot/android/rhus/RhusMapActivity.java
@@ -134,25 +134,7 @@ public void onTap(GeoPoint geoPoint, RhusOverlayItem rhusOverlayItem) {
 					public void onClick(View arg0) {
 
 						Intent intent = new Intent("net.winterroot.android.rhus.action.DOCUMENTDETAIL");
-
-						//Use Jackson to write document to json, and pass as string to the next intent
-						ObjectMapper mapper = new ObjectMapper(); 
-						String documentJson = null;
-						try {
-							documentJson = mapper.writeValueAsString(document);
-							Log.v(TAG, documentJson);
-
-						} catch (JsonGenerationException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						} catch (JsonMappingException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						} catch (IOException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-						intent.putExtra(RhusDocumentDetailActivity.DOCUMENT_EXTRA, documentJson);
+						intent.putExtra(RhusDocumentDetailActivity.DOCUMENT_EXTRA, document );
 						startActivity(intent);
 
 					}
@@ -235,6 +217,8 @@ public void onCreate(Bundle savedState) {
 		*/
 
 
+	//	Intent intent = new Intent("net.winterroot.android.rhus.action.DOCUMENTDETAIL");
+	//	startActivity(intent);
 
 		startLocationUpdates();
 

diff --git a/src/net/winterroot/android/rhus/provider/RhusDocument.java b/src/net/winterroot/android/rhus/provider/RhusDocument.java
@@ -3,10 +3,12 @@
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
 import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 
-public class RhusDocument {
+public class RhusDocument implements Parcelable {
 
 	public static final String AUTHORITY =
 	            "net.winterroot.android.rhus.provider.RhusDocument";
@@ -27,7 +29,6 @@ public class RhusDocument {
      */
     public static final Uri CONTENT_URI = DOCUMENTS_URI;
 
-
     public String id;
     public String longitude;
     public String latitude;
@@ -37,4 +38,102 @@ public class RhusDocument {
     public byte[] medium = null;
     public String reporter;
     public String comment;
+
+
+
+    public RhusDocument(){
+
+    }
+
+
+
+    public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getLongitude() {
+		return longitude;
+	}
+	public void setLongitude(String longitude) {
+		this.longitude = longitude;
+	}
+	public String getLatitude() {
+		return latitude;
+	}
+	public void setLatitude(String latitude) {
+		this.latitude = latitude;
+	}
+	public byte[] getThumb() {
+		return thumb;
+	}
+	public void setThumb(byte[] thumb) {
+		this.thumb = thumb;
+	}
+	public byte[] getMedium() {
+		return medium;
+	}
+	public void setMedium(byte[] medium) {
+		this.medium = medium;
+	}
+	public String getReporter() {
+		return reporter;
+	}
+	public void setReporter(String reporter) {
+		this.reporter = reporter;
+	}
+    public String getComment() {
+		return comment;
+	}
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel out, int flags) {
+    	out.writeString(id);
+    	out.writeString(longitude);
+    	out.writeString(latitude);
+    	out.writeString(created_at);
+    	out.writeString(deviceuser_identifier);
+    	out.writeInt(thumb.length);
+    	out.writeByteArray(thumb);
+    	out.writeInt(medium.length);
+    	out.writeByteArray(medium);
+    	out.writeString(reporter);
+    	out.writeString(comment);
+    }
+
+	public static final Parcelable.Creator<RhusDocument> CREATOR
+	= new Parcelable.Creator<RhusDocument>() {
+		public RhusDocument createFromParcel(Parcel in) {
+			return new RhusDocument(in);
+		}
+
+		public RhusDocument[] newArray(int size) {
+			return new RhusDocument[size];
+		}
+	};
+
+	private RhusDocument(Parcel in) {
+    	id = in.readString();
+    	longitude = in.readString();
+    	latitude = in.readString();
+    	created_at = in.readString();
+    	deviceuser_identifier = in.readString();
+    	int thumbLength = in.readInt();
+    	thumb = new byte[thumbLength];
+    	in.readByteArray(thumb);
+    	int mediumLength = in.readInt();
+    	medium = new byte[mediumLength];
+    	in.readByteArray(medium);
+    	reporter = in.readString();
+    	comment = in.readString();
+	}
+
+
 }
diff --git a/src/net/winterroot/android/rhus/provider/RhusDocumentContentProvider.java b/src/net/winterroot/android/rhus/provider/RhusDocumentContentProvider.java
@@ -251,5 +251,6 @@ public int update(Uri uri, ContentValues values, String selection,
 	}
 
 
+
 
 }