95 app/src/main/java/edu/wsu/lar/airpact_fire/data/realm/object/RealmPostObject.java
View file
@@ -16,14 +16,16 @@
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import edu.wsu.lar.airpact_fire.Reference;

import edu.wsu.lar.airpact_fire.data.manager.DataManager;
import edu.wsu.lar.airpact_fire.data.object.ImageObject;
import edu.wsu.lar.airpact_fire.data.object.PostObject;
import edu.wsu.lar.airpact_fire.data.object.UserObject;
import edu.wsu.lar.airpact_fire.data.realm.model.Coordinate;
import edu.wsu.lar.airpact_fire.data.realm.model.Image;
import edu.wsu.lar.airpact_fire.data.realm.model.Post;
import edu.wsu.lar.airpact_fire.data.realm.model.Target;
import edu.wsu.lar.airpact_fire.debug.manager.DebugManager;
import edu.wsu.lar.airpact_fire.server.manager.ServerManager;
import edu.wsu.lar.airpact_fire.util.Util;
import io.realm.Realm;
import io.realm.RealmList;
@@ -71,6 +73,13 @@ public Date getDate() {
return mPost.date;
}

@Override
public void setDate(Date value) {
mRealm.beginTransaction();
mPost.date = value;
mRealm.commitTransaction();
}

@Override
public long getImageServerId() {
return 0;
@@ -93,7 +102,7 @@ public void setMetric(int value) {

@Override
public int getAlgorithm() {
return 0;
return 1;
}

@Override
@@ -114,8 +123,8 @@ public void setMode(int value) {
}

@Override
public Bitmap getImage() {
String fileLocation = mPost.imageLocation;
public Bitmap getImageBitmap() {
String fileLocation = mPost.images.get(0).imageLocation;
Bitmap bitmap = null;
try {
bitmap = MediaStore.Images.Media.getBitmap(mDataManager.getActivity()
@@ -126,6 +135,14 @@ public Bitmap getImage() {
return bitmap;
}

/*
@Override
public ImageObject getImage() {
//return new ImageObject(mPost.images.get(0));
return null;
}
*/

@Override
public Uri createImage() {

@@ -141,7 +158,10 @@ public Uri createImage() {

// Save image location
mRealm.beginTransaction();
mPost.imageLocation = imageUri.toString();
Image imageModel = mRealm.createObject(Image.class, imageUri.toString());
RealmList imageList = new RealmList();
imageList.add(imageModel);
mPost.images = imageList;
mRealm.commitTransaction();

return imageUri;
@@ -173,7 +193,7 @@ private void setImage(Bitmap value) {

// Store image location in DB
mRealm.beginTransaction();
mPost.imageLocation = fileLocation;
//mPost.imageLocation = fileLocation;
mRealm.commitTransaction();
}

@@ -183,7 +203,7 @@ public void setGPS(double[] values) {
Coordinate coordinate = mRealm.createObject(Coordinate.class);
coordinate.x = values[0];
coordinate.y = values[1];
mPost.geoCoordinate = coordinate;
mPost.images.get(0).gpsCoordinate = coordinate;
mRealm.commitTransaction();
}

@@ -219,7 +239,7 @@ public void setComputedVisualRange(float value) {

@Override
public double[] getGPS() {
Coordinate coordinate = mPost.geoCoordinate;
Coordinate coordinate = mPost.images.get(0).gpsCoordinate;
return new double[] {coordinate.x, coordinate.y};
}

@@ -245,17 +265,6 @@ public void setTargetsCoorindates(float[][] values) {
// TODO
}

@Override
public int[] getTargetsColors() {
RealmList<Target> targets = mPost.targets;
return null;
}

@Override
public void setTargetsColors(int[] values) {

}

@Override
public String getDescription() {
return null;
@@ -276,45 +285,51 @@ public void setLocation(String value) {

}

// TODO: Something cooler so that this Data object doesn't need to know any server specs!

@Override
public JSONObject toJSON() {

// Intermediate objects
int[] targetColors = getTargetsColors();
float[][] splitTargetCoordinates = Util.splitXY(getTargetsCoordinates());
float[][] targetCoordinates = getTargetsCoordinates();

// TODO: Adapt post for many images and visual ranges and fields
// TODO: Dynamically change JSON for algorithm type
// TODO: Maybe send radii for the targets

// Post submission field vars => JSON
JSONObject root = new JSONObject();
root.put("user", getUser().getUsername());
root.put("description", getDescription());
root.put("image", Util.bitmapToString(getImage()));
root.put("image", Util.bitmapToString(getImageBitmap()));
root.put("secretKey", getSecretKey());
root.put("distanceMetric", getMetric());
root.put("location", getLocation());
// TODO: Ensure this is the time the image was taken
root.put("time", new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(getDate()));
root.put("time", new SimpleDateFormat(ServerManager.DATE_FORMAT).format(getDate()));

// TODO: Send int representing algorithm; adapt my docs to
// algorithm #1 = two-in-one
// algorithm #2 = one-for-one
root.put("algorithmType", getAlgorithm());

// TODO: Maybe send radii for the targets

// If algorithmType == 1
// TODO: Adapt all fields
root.put("nearTargetX", Util.joinArray(splitTargetCoordinates[0], ","));
root.put("nearTargetY", Util.joinArray(splitTargetCoordinates[0], ","));
root.put("nearTargetEstimatedDistance", Util.joinArray(getDistances(), ","));
root.put("farTargetX", Util.joinArray(splitTargetCoordinates[0], ","));
root.put("farTargetY", Util.joinArray(splitTargetCoordinates[0], ","));
root.put("farTargetEstimatedDistance", Util.joinArray(getDistances(), ","));
root.put("estimatedVisualRange", getEstimatedVisualRange());
root.put("gpsLongitude", Util.joinArray(getGPS(), ","));
root.put("gpsLatitude", Util.joinArray(getGPS(), ","));
int algorithm = getAlgorithm();
root.put("algorithmType", algorithm);
switch (algorithm) {

case 1: // Two-in-one
root.put("nearTargetX", 1.0); //getImageBitmap(). targetCoordinates[0][0]);
root.put("nearTargetY", 2.0); //targetCoordinates[0][1]);
root.put("nearTargetEstimatedDistance", 3.0);
root.put("farTargetX", 4.0); //targetCoordinates[1][0]);
root.put("farTargetY", 5.0); //targetCoordinates[1][1]);
root.put("farTargetEstimatedDistance", 6.0); //Util.joinArray(getDistances(), ","));
root.put("estimatedVisualRange", 7.0); //getEstimatedVisualRange());
root.put("gpsLongitude", 8.0); //Util.joinArray(getGPS(), ","));
root.put("gpsLatitude", 9.0); //Util.joinArray(getGPS(), ","));
break;

case 2: // One-for-one
// TODO
break;
}

return root;
}
2 app/src/main/java/edu/wsu/lar/airpact_fire/manager/AIRPACTFireAppManager.java
View file
@@ -101,7 +101,7 @@ public void onActivityStart(Object... args) {
// Construct managers
mDebugManager = new DebugManager(isDebugging());
mDataManager = new RealmDataManager(mDebugManager, mActivity);
mServerManager = new HTTPServerManager();
mServerManager = new HTTPServerManager(mDebugManager, mActivity);

mDebugManager.printLog("Started activity = " + context.toString());

8 app/src/main/java/edu/wsu/lar/airpact_fire/server/ServerPost.java
View file
@@ -0,0 +1,8 @@
package edu.wsu.lar.airpact_fire.server;

public interface ServerPost {

// TODO: Make this the interface object between DataManager and ServerManager

String toJSON();
}
49 app/src/main/java/edu/wsu/lar/airpact_fire/server/manager/HTTPServerManager.java
View file
@@ -1,5 +1,6 @@
package edu.wsu.lar.airpact_fire.server.manager;

import android.app.Activity;
import android.app.IntentService;
import android.app.ProgressDialog;
import android.content.Context;
@@ -24,9 +25,18 @@
import edu.wsu.lar.airpact_fire.data.manager.PostDataManager;
import edu.wsu.lar.airpact_fire.data.object.PostObject;
import edu.wsu.lar.airpact_fire.data.object.UserObject;
import edu.wsu.lar.airpact_fire.debug.manager.DebugManager;

public class HTTPServerManager implements ServerManager {

private DebugManager mDebugManager;
private Activity mActivity;

public HTTPServerManager(DebugManager debugManager, Activity activity) {
mDebugManager = debugManager;
mActivity = activity;
}

@Override
public void onAppStart(Object... args) {

@@ -60,7 +70,8 @@ public void onLogout(Object... args) {
@Override
public void onAuthenticate(Context context, String username, String password,
ServerCallback callback) {
AuthenticationManager authenticationManager = new AuthenticationManager(context, callback);
Log.d("MUCHWOW", "pre AuthenticationManager");
AuthenticationManager authenticationManager = new AuthenticationManager(mActivity, callback);
authenticationManager.execute(username, password);
}

@@ -73,8 +84,8 @@ public void onSubmit(Context context, PostObject postObject, ServerCallback call
UserObject userObject = postObject.getUser();
ArrayList<Object> authenticationObjects;

// Attempt authentication, obtain secretKey for posting
AuthenticationManager authenticationManager = new AuthenticationManager(context,
// Attempt authentication
AuthenticationManager authenticationManager = new AuthenticationManager(mActivity,
new ServerCallback() {
@Override
public Object onStart(Object... args) { return null; }
@@ -83,40 +94,45 @@ public void onSubmit(Context context, PostObject postObject, ServerCallback call
});
authenticationManager.execute(userObject.getUsername(), userObject.getPassword());

boolean isUser = false;
// Attempt to obtain secret key for posting
String secretKey = "";
try {
// Wait for authentication to occur
authenticationObjects = authenticationManager.get();
isUser = (Boolean) authenticationObjects.get(0);
boolean isUser = (Boolean) authenticationObjects.get(0);
if (!isUser) { return; }
secretKey = (String) authenticationObjects.get(1);
} catch (InterruptedException e) {
e.printStackTrace();
return;
} catch (ExecutionException e) {
e.printStackTrace();
return;
}

// Attempt submission
SubmissionManager submissionManager = new SubmissionManager(context, callback);
SubmissionManager submissionManager = new SubmissionManager(mActivity, callback);
submissionManager.execute(postObject, secretKey);
}

// Gets run when new credentials are found that are not in the database
private class AuthenticationManager extends AsyncTask<String, Void, ArrayList<Object>> {

private Context mContext;
private Activity mActivity;
private ServerCallback mCallback;
private String mUsername, mPassword;

public AuthenticationManager(Context context, ServerCallback callback) {
mContext = context;
public AuthenticationManager(Activity activity, ServerCallback callback) {
mActivity = activity;
mCallback = callback;
}

@Override
protected void onPreExecute() {
super.onPreExecute();
mCallback.onStart(mContext);

mCallback.onStart(mActivity);
Log.d("MUCHWOW", "AuthenticationManager.onPreExecute()");
}

@Override
@@ -195,38 +211,40 @@ protected ArrayList<Object> doInBackground(String... params) {
resultArrayList.add(isUser);
resultArrayList.add(secretKey);

Log.d("MUCHWOW", "AuthenticationManager.doInBackground()");
return resultArrayList;
}

@Override
protected void onPostExecute(ArrayList result) {
protected void onPostExecute(ArrayList<Object> result) {
boolean isUser = (Boolean) result.get(0);
String secretKey = (String) result.get(1);
mCallback.onFinish(isUser, mUsername, mPassword, secretKey);
Log.d("MUCHWOW", "AuthenticationManager.onPostExecute()");
}
}

// TODO: Refactor this and create interface between a DataManager and ServerManager for posting
// Takes Post object, converts this into JSON, and submits it
private class SubmissionManager extends AsyncTask<Object, Void, Void> {

private Context mContext;
private Activity mActivity;
private ServerCallback mCallback;
private PostObject mPostObject;
private boolean mDidSubmit;
private String mSecretKey;
private double mServerOutput;
private long mImageServerId;

public SubmissionManager(Context context, ServerCallback callback) {
mContext = context;
public SubmissionManager(Activity activity, ServerCallback callback) {
mActivity = activity;
mCallback = callback;
}

@Override
protected void onPreExecute() {
super.onPreExecute();
mCallback.onStart(mContext);
mCallback.onStart(mActivity);
}

@Override
@@ -288,7 +306,6 @@ protected Void doInBackground(Object... args) {
mDidSubmit = postStatus.equals("success");

// Get algorithm result
// TODO: Have this naming adapted on server side
mServerOutput = Double.parseDouble(
postReceiveJSON.get("output").toString());

14 app/src/main/java/edu/wsu/lar/airpact_fire/server/manager/ServerManager.java
View file
@@ -14,19 +14,7 @@
*/
public interface ServerManager {

String[] SUBMISSION_FIELDS = {
"user", // String
"description", // String
"image", // String
"secretKey", // String
"highColor", // int
"highX", "highY", // float
"lowColor", // int
"lowX", "lowY", // float
"visualRange", // float
"geoX", "geoY", // float
"tags" // String
};
String DATE_FORMAT = "yyyy.MM.dd.HH.mm.ss";

/**
* Communication interface between app and some authenticating and submission-accepting entity