mirror-github-bspeice/itcs4180
1
0
Fork 0
mirror of https://github.com/bspeice/itcs4180 synced 2024-11-08 16:38:14 -05:00
Code Issues Releases Wiki Activity

RestLocations created correctly from the server.

Browse Source
This commit is contained in:
Bradlee Speice 2014-04-21 09:40:24 -04:00
parent 6e2ad36f09
commit 60062298bc
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java
View File

@ -53,6 +53,7 @@ public class MainActivity extends Activity {
/*End Test Code*/
// And kick off contacting to server to see if there are any new ones
locationList = (ListView)findViewById(R.id.listLocations);
new LocationClient.LocationsDownloader(this) {
@Override
protected void onPostExecute(List<RestLocation> result) {

2
UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java
View File

@ -138,7 +138,7 @@ public class SearchActivity extends Activity {
}
else
{
new ImageDownloader().execute(restLocation.getRiddleImageURL());
new ImageDownloader().execute(restLocation.getRiddleImageUrl());
}
}

8
UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
View File

@ -11,7 +11,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import retrofit.RestAdapter;
import retrofit.converter.GsonConverter;
import android.content.Context;
import android.os.AsyncTask;
import edu.uncc.scavenger.R;
@ -20,7 +25,10 @@ public class LocationClient {
private static LocationService getAdapter(Context ctx) {
String endpoint = ctx.getString(R.string.endpoint);
Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
.create();
RestAdapter ra = new RestAdapter.Builder().setEndpoint(endpoint)
.setConverter(new GsonConverter(gson))
.build();
return ra.create(LocationService.class);
}

10
UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
View File

@ -18,7 +18,7 @@ public class RestLocation implements Serializable{
private String riddle;
private double locationLong;
private double locationLat;
private String riddleImageURL;
private String riddleImageUrl;
private String key;
public int getId() {
@ -57,11 +57,11 @@ public class RestLocation implements Serializable{
public void setKey(String key) {
this.key = key;
}
public String getRiddleImageURL() {
return riddleImageURL;
public String getRiddleImageUrl() {
return riddleImageUrl;
}
public void setRiddleImageURL(String riddleImageURL) {
this.riddleImageURL = riddleImageURL;
public void setRiddleImageUrl(String riddleImageUrl) {
this.riddleImageUrl = riddleImageUrl;
}
public Location getLocation() {