tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor code cleanup.

master
Tomasz Półgrabia 2016-09-20 21:30:27 +02:00
parent ed21000b3b
commit 8d447ffb37
7 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
View File

@ -101,7 +101,7 @@ public class MainActivity extends ActionBarActivity {
currFrag = fragId == null ? MainActivityState.PANORAMIO : fragId;
lg.trace("Set final frag id: {}", fragId);
photoInfo = savedInstanceState != null ? (PanoramioImageInfo) savedInstanceState.getSerializable(AppConstants.PHOTO_INFO) : null;
savedConfiguration = savedInstanceState != null ? savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY) : false;
savedConfiguration = savedInstanceState != null && savedInstanceState.getBoolean(AppConstants.SAVED_CONFIG_KEY);
switchFragment();
updateSwipeHandler();
@ -147,7 +147,7 @@ public class MainActivity extends ActionBarActivity {
}
private void refreshFragment() {
final String tag = fragTags.get(currFrag);
final String tag = fragTags.get(currFrag.getOrder());
if (tag == null) {
lg.warn("Unknown fragment id");
hideProgress();

1
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/app/WikiAppObject.java
View File

@ -6,6 +6,7 @@ import java.io.Serializable;
* Created by tpolgrabia on 05.09.16.
*/
public class WikiAppObject implements Serializable {
private static final long serialVersionUID = 4012661137123526703L;
private String url;
private String thumbnail;
private String title;

2
app/src/main/java/pl/tpolgrabia/urbanexplorer/exceptions/PanoramioResponseNotExpected.java
View File

@ -4,6 +4,8 @@ package pl.tpolgrabia.urbanexplorer.exceptions;
* Created by tpolgrabia on 27.08.16.
*/
public class PanoramioResponseNotExpected extends RuntimeException {
private static final long serialVersionUID = 4518500758010368539L;
public PanoramioResponseNotExpected(String errorCause) {
super(errorCause);
}

20
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java
View File

@ -120,6 +120,12 @@ public class HomeFragment extends Fragment implements Refreshable {
}
Location currLocation = NetUtils.getLastKnownLocation(getActivity());
lg.debug("Current location is {}", currLocation);
if (currLocation == null) {
lg.debug("Current location is not available");
return;
}
LocationUtils.getGeoCodedLocation(getActivity(), currLocation.getLatitude(), currLocation.getLongitude(), new LocationGeoCoderCallback() {
@Override
public void callback(int code, String message, String googleStatus, String geocodedLocation) {
@ -177,7 +183,7 @@ public class HomeFragment extends Fragment implements Refreshable {
}
}
if (photos == null || photos.isEmpty()) {
if (photos.isEmpty()) {
// maybe we find something in our cache file
try (Reader br =
new InputStreamReader(
@ -243,7 +249,6 @@ public class HomeFragment extends Fragment implements Refreshable {
}
});
;
return inflatedView;
}
@ -278,7 +283,6 @@ public class HomeFragment extends Fragment implements Refreshable {
}
LocationManager locationService = (LocationManager)getActivity().getSystemService(Context.LOCATION_SERVICE);
final Location location = NetUtils.getLastKnownLocation(activity);
if (location == null) {
@ -384,7 +388,6 @@ public class HomeFragment extends Fragment implements Refreshable {
new PanoramioResponseCallback() {
@Override
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
Long pageSize = fetchLocationPageSize();
ArrayAdapter<PanoramioImageInfo> adapter = new PanoramioAdapter(activity,
R.layout.location_item,
@ -393,7 +396,12 @@ public class HomeFragment extends Fragment implements Refreshable {
if (images.isEmpty()) {
Toast.makeText(getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
ListView locations = (ListView)getView().findViewById(R.id.locations);
final View view = getView();
if (view == null) {
lg.trace("Fragment's view is not initialized");
return;
}
ListView locations = (ListView) view.findViewById(R.id.locations);
locations.setAdapter(adapter);
MainActivity mainActivity = (MainActivity) getActivity();
if (mainActivity == null) {
@ -407,7 +415,7 @@ public class HomeFragment extends Fragment implements Refreshable {
}
private Long fetchLocationPageSize() {
return new Long(getPanoramioBulkDataSize());
return Long.valueOf(getPanoramioBulkDataSize());
}
private Double fetchRadiusX() {

2
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java
View File

@ -255,7 +255,7 @@ public class WikiLocationsFragment extends Fragment implements Refreshable {
lg.warn("Activity shouldn't be null. No headless fragment");
return;
}
final Location location = NetUtils.getLastKnownLocation(activity);
currentLocation.setText(currentGeocodedLocation);
}

5
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java
View File

@ -85,6 +85,11 @@ public class LocationUtils {
}
JSONArray results = object.optJSONArray("results");
if (results == null) {
clbk.callback(status.getCode(), status.getMessage(), googleStatus, null);
return;
}
int n = results.length();
for (int i = 0; i < n; i++) {
result = results.optJSONObject(i);

25
app/src/main/java/pl/tpolgrabia/urbanexplorer/workers/FetchingPhotosWorker.java
View File

@ -1,25 +0,0 @@
package pl.tpolgrabia.urbanexplorer.workers;
import android.os.AsyncTask;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
/**
* Created by tpolgrabia on 11.09.16.
*/
public class FetchingPhotosWorker extends AsyncTask<Boolean, Integer, Boolean> {
private HomeFragment homeFragment;
public FetchingPhotosWorker(HomeFragment homeFragment) {
this.homeFragment = homeFragment;
}
@Override
protected Boolean doInBackground(Boolean... params) {
for (Boolean arg : params) {
}
return null;
}
}