diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java
index 2ffbc76..f3cdd85 100644
--- a/src/it/reyboz/bustorino/ActivityMain.java
+++ b/src/it/reyboz/bustorino/ActivityMain.java
@@ -1,756 +1,779 @@
/*
BusTO - Arrival times for Turin public transports.
Copyright (C) 2014 Valerio Bozzolan
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.NavUtils;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.melnykov.fab.FloatingActionButton;
import java.io.UnsupportedEncodingException;
import it.reyboz.bustorino.backend.ArrivalsFetcher;
import it.reyboz.bustorino.backend.Fetcher;
import it.reyboz.bustorino.backend.GTTJSONFetcher;
import it.reyboz.bustorino.backend.Palina;
import it.reyboz.bustorino.lab.GTTSiteSucker.BusLine;
import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop;
import it.reyboz.bustorino.lab.MyDB;
import it.reyboz.bustorino.lab.adapters.AdapterBusStops;
import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopSuggestions;
import it.reyboz.bustorino.middleware.AsyncArrivalsFetcherAll;
import it.reyboz.bustorino.middleware.PalinaAdapter;
public class ActivityMain extends AppCompatActivity {
/*
* Layout elements
*/
private EditText busStopSearchByIDEditText;
private EditText busStopSearchByNameEditText;
private TextView busStopNameTextView;
private ProgressBar progressBar;
private TextView howDoesItWorkTextView;
private Button hideHintButton;
private MenuItem actionHelpMenuItem;
private SwipeRefreshLayout swipeRefreshLayout;
private ListView resultsListView;
private FloatingActionButton floatingActionButton;
/*
* @see swipeRefreshLayout
*/
private Handler handler = new Handler();
private final Runnable refreshing = new Runnable() {
public void run() {
showSpinner(DOUBLE_SPINNER);
- asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID);
+ asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, 0);
}
};
/*
* To toggle alphabetical
*/
private static final int SEARCH_BY_ID = 1;
private static final int SEARCH_BY_NAME = 0;
private int searchMode; // int seems more appropriate (was boolean)
/*
* Options
*/
private final String OPTION_SHOW_LEGEND = "show_legend";
/**
* Last successfully searched bus stop ID
*/
private String lastSuccessfullySearchedBusStopID = null;
AsyncWgetBusStopSuggestions asyncWgetBusStopSuggestions;
//AsyncWgetBusStopFromBusStopID asyncWgetBusStopFromBusStopID;
/*
* Arrays of fetchers, tryed in this order (slightly overengineered, maybe?)
*/
- ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher()};
+ private ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher()};
+ int ArrivalFetchersPos; // position in the array
+ private AsyncArrivalsFetcherAll AsyncArrivalsFetcherRunningInstance;
private SQLiteDatabase db;
///////////////////////////////// EVENT HANDLERS ///////////////////////////////////////////////
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
busStopSearchByIDEditText = (EditText) findViewById(R.id.busStopSearchByIDEditText);
busStopSearchByNameEditText = (EditText) findViewById(R.id.busStopSearchByNameEditText);
busStopNameTextView = (TextView) findViewById(R.id.busStopNameTextView);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
howDoesItWorkTextView = (TextView) findViewById(R.id.howDoesItWorkTextView);
hideHintButton = (Button) findViewById(R.id.hideHintButton);
resultsListView = (ListView) findViewById(R.id.resultsListView);
swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout);
floatingActionButton = (FloatingActionButton) findViewById(R.id.floatingActionButton);
if (floatingActionButton != null) {
floatingActionButton.attachToListView(resultsListView);
}
busStopSearchByIDEditText.setSelectAllOnFocus(true);
busStopSearchByIDEditText
.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId,
KeyEvent event) {
// IME_ACTION_SEARCH alphabetical option
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
onSearchClick(v);
return true;
}
return false;
}
});
busStopSearchByNameEditText
.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId,
KeyEvent event) {
// IME_ACTION_SEARCH alphabetical option
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
onSearchClick(v);
return true;
}
return false;
}
});
// Get database in write mode
MyDB mDbHelper = new MyDB(this);
db = mDbHelper.getWritableDatabase();
// Called when the layout is pulled down
swipeRefreshLayout
.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
handler.post(refreshing);
}
});
/**
* @author Marco Gagino!!!
*/
swipeRefreshLayout.setColorSchemeColors(R.color.blue_500, R.color.orange_500); // setColorScheme is deprecated, setColorSchemeColors isn't
setSearchModeBusStopID();
//---------------------------- START INTENT CHECK QUEUE ------------------------------------
// Intercept calls from URL intent
boolean tryedFromIntent = false;
String busStopID = null;
Uri data = getIntent().getData();
if (data != null) {
busStopID = getBusStopIDFromUri(data);
tryedFromIntent = true;
}
// Intercept calls from other activities
if (!tryedFromIntent) {
Bundle b = getIntent().getExtras();
if (b != null) {
busStopID = b.getString("bus-stop-ID");
/**
* I'm not very sure if you are coming from an Intent.
* Some launchers work in strange ways.
*/
tryedFromIntent = busStopID != null;
}
}
//---------------------------- END INTENT CHECK QUEUE --------------------------------------
if (busStopID == null) {
// Show keyboard if can't start from intent
showKeyboard();
// You haven't obtained anything... from an intent?
if (tryedFromIntent) {
// This shows a luser warning
- asyncWgetBusStopFromBusStopID(null);
+ asyncWgetBusStopFromBusStopIDReset();
}
} else {
// If you are here an intent has worked successfully
setBusStopSearchByIDEditText(busStopID);
showSpinner();
- asyncWgetBusStopFromBusStopID(busStopID);
+ asyncWgetBusStopFromBusStopID(busStopID, 0);
}
Log.d("MainActivity", "Created");
}
/**
* Reload bus stop timetable when it's fulled resumed from background.
*/
@Override
protected void onPostResume() {
super.onPostResume();
Log.d("ActivityMain", "onPostResume fired. Last successfully bus stop ID: " + lastSuccessfullySearchedBusStopID);
if (searchMode == SEARCH_BY_ID && lastSuccessfullySearchedBusStopID != null && lastSuccessfullySearchedBusStopID.length() != 0) {
showSpinner();
setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStopID);
- asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID);
+ asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, 0);
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
actionHelpMenuItem = menu.findItem(R.id.action_help);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
switch (item.getItemId()) {
case android.R.id.home:
// Respond to the action bar's Up/Home button
NavUtils.navigateUpFromSameTask(this);
return true;
case R.id.action_help:
showHints();
return true;
case R.id.action_favorites:
startActivity(new Intent(ActivityMain.this, ActivityFavorites.class));
return true;
case R.id.action_about:
startActivity(new Intent(ActivityMain.this, ActivityAbout.class));
return true;
case R.id.action_news:
openIceweasel("http://blog.reyboz.it/tag/busto/");
return true;
case R.id.action_bugs:
openIceweasel("https://bugs.launchpad.net/bus-torino");
return true;
case R.id.action_source:
openIceweasel("https://code.launchpad.net/bus-torino");
return true;
case R.id.action_licence:
openIceweasel("http://www.gnu.org/licenses/gpl-3.0.html");
return true;
case R.id.action_author:
openIceweasel("http://boz.reyboz.it?lovebusto");
return true;
}
return super.onOptionsItemSelected(item);
}
///////////////////////////////// THIS NEEDS REFACTORING ///////////////////////////////////////
/**
* It's pure magic <3
*
* @param query Part of the busStopName
*/
private void asyncWgetBusStopSuggestions(String query) {
if (query == null || query.length() == 0) {
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show();
hideSpinner();
return;
}
if (!NetworkTools.isConnected(getApplicationContext())) {
NetworkTools.showNetworkError(getApplicationContext());
hideSpinner();
return;
}
if (asyncWgetBusStopSuggestions != null) {
asyncWgetBusStopSuggestions.cancel(true);
asyncWgetBusStopSuggestions = null;
}
try {
asyncWgetBusStopSuggestions = new AsyncWgetBusStopSuggestions(query) {
public void onReceivedBusStopNames(BusStop[] busStops, int status) {
hideSpinner();
switch (status) {
case AsyncWgetBusStopSuggestions.ERROR_EMPTY_DOM:
case AsyncWgetBusStopSuggestions.ERROR_DOM:
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
break;
case AsyncWgetBusStopSuggestions.ERROR_NONE:
if (busStops.length == 0) {
Toast.makeText(getApplicationContext(),
R.string.no_bus_stop_have_this_name, Toast.LENGTH_SHORT).show();
} else {
for (BusStop busStop : busStops) {
MyDB.DBBusStop.addBusStop(db, busStop);
}
populateBusStopsLayout(busStops);
}
break;
}
}
};
} catch (UnsupportedEncodingException e) {
Toast.makeText(getApplicationContext(),
R.string.encoding_error, Toast.LENGTH_SHORT).show();
}
}
///////////////////////////////// ARRIVALS FETCHER /////////////////////////////////////////////
/**
- * It's pure magic <3
+ * Try every fetcher until you get something usable.
*
- * @param busStopID the ID as a String
+ * @param busStopID the ID
+ * @param whichArrivalsFetcher set to 0 if you want to live (used internally by the recursion)
*/
- private void asyncWgetBusStopFromBusStopID(String busStopID) {
- if (busStopID == null || busStopID.length() == 0) {
+ private void asyncWgetBusStopFromBusStopID(String busStopID, int whichArrivalsFetcher) {
+ // TODO: move showSpinner here
+
+ // using a "global" variable to avoid adding parameters to AsyncArrivalsFetcherAll: the fact
+ // that this method uses recursion is a mere implementation detail.
+ this.ArrivalFetchersPos = whichArrivalsFetcher;
+
+ if(busStopID == null || busStopID.length() == 0) {
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
hideSpinner();
return;
}
+
+ // TODO: remove this once we're sure fetchers can handle this case
if (!NetworkTools.isConnected(getApplicationContext())) {
NetworkTools.showNetworkError(getApplicationContext());
hideSpinner();
return;
}
- // TODO: handle cancellation if needed
-// if (asyncWgetBusStopFromBusStopID != null) {
-// asyncWgetBusStopFromBusStopID.cancel(true);
-// //asyncWgetBusStopFromBusStopID = null;
-// return;
-// }
+ if(whichArrivalsFetcher >= ArrivalFetchers.length) {
+ // TODO: error message (tryed every fetcher and failed)
+ asyncWgetBusStopFromBusStopIDReset();
+ hideSpinner();
+ return;
+ }
- for(ArrivalsFetcher af : ArrivalFetchers) {
- new AsyncArrivalsFetcherAll(af, busStopID, new AsyncArrivalsFetcherAllCallbackImplementation());
+ // cancel whatever is still running
+ if(AsyncArrivalsFetcherRunningInstance != null) {
+ // cancel() should hopefully only kill the background thread, not the one we're using for this same recursion...
+ AsyncArrivalsFetcherRunningInstance.cancel(true);
}
+ AsyncArrivalsFetcherRunningInstance = new AsyncArrivalsFetcherAll(ArrivalFetchers[whichArrivalsFetcher], busStopID, new AsyncArrivalsFetcherAllCallbackImplementation());
+ AsyncArrivalsFetcherRunningInstance.execute();
+ }
+ private void asyncWgetBusStopFromBusStopIDReset() {
+ this.ArrivalFetchersPos = 0;
+ if(AsyncArrivalsFetcherRunningInstance != null) {
+ AsyncArrivalsFetcherRunningInstance.cancel(true);
+ }
}
private class AsyncArrivalsFetcherAllCallbackImplementation implements AsyncArrivalsFetcherAll.AsyncArrivalsFetcherAllCallback {
public void call(Palina p, Fetcher.result res, String stopID) {
- hideSpinner();
+ hideSpinner(); // TODO: remove this once showSpinner() is in asyncWgetBusStopFromBusStopID()
switch (res) {
case CLIENT_OFFLINE:
if (!NetworkTools.isConnected(getApplicationContext())) {
NetworkTools.showNetworkError(getApplicationContext());
hideSpinner();
- return;
}
+ break; // goto recursion
case SERVER_ERROR: // TODO: better error message for these 2 cases
case SERVER_OFFLINE:
case PARSER_ERROR:
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
- break;
+ break; // goto recursion
case EMPTY_RESULT_SET:
Toast.makeText(getApplicationContext(),
R.string.no_passages, Toast.LENGTH_SHORT).show();
- break;
+ break; // goto recursion
case OK:
lastSuccessfullySearchedBusStopID = stopID;
hideKeyboard();
//MyDB.DBBusStop.addBusStop(db, busStop); // TODO: determine why this was needed
populateBusLinesLayout(p, stopID);
- break;
+ return; // RETURN.
}
+ // indirect recursion through a callback. ...yeha.
+ asyncWgetBusStopFromBusStopID(stopID, ArrivalFetchersPos+1);
}
}
private void populateBusLinesLayout(Palina p, String stopID) {
// should be already ordered, no need for this
//busStop.orderBusLinesByFirstArrival();
// Remember last successfully searched busStopID
//String busStopID = busStop.getBusStopID();
// Retrieve passages
//BusLine[] busLines = busStop.getBusLines();
/*
* asyncWgetBusStopFromBusStopID was already checking for this (now it's done in
* AsyncArrivalsFetcherAllCallbackImplementation)!
// No passages?
if(busLines.length == 0) {
Toast.makeText(getApplicationContext(),
R.string.no_arrival_times, Toast.LENGTH_SHORT).show();
return;
}*/
/* TODO: determine if there was a reason to store everything in the database, other than
* showing the last timetable when "resuming" the app (which wasn't currently done, I think
* it just fetches new timetables every time)
*/
//BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID());
String busStopNameDisplay;
// TODO: implement favorites username
// TODO: implement bus stop name (if can be fetched)
/*if(dbBusStop != null && dbBusStop.getBusStopUsername() != null) {
busStopNameDisplay = dbBusStop.getBusStopUsername();
} else if (busStop.getBusStopName() != null) {
busStopNameDisplay = busStop.getBusStopName();
} else {
busStopNameDisplay = String.valueOf(busStopID);
}*/
busStopNameDisplay = stopID;
busStopNameTextView.setText(String.format(
getString(R.string.passages), busStopNameDisplay));
// keyboard is already hidden, at this point
// Shows hints
if(getOption(OPTION_SHOW_LEGEND, true)) {
showHints();
} else {
hideHints();
}
prepareGUIForBusLines();
resultsListView.setAdapter(new PalinaAdapter(this, p));
resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView> parent, View view, int position, long id) {
/**
* Casting because of Javamerda
* @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
*/
BusLine busLine = (BusLine) parent.getItemAtPosition(position);
Log.i("ActivityMain", "Tapped busLine " + busLine.toString());
}
});
}
///////////////////////////////// OTHER STUFF? /////////////////////////////////////////////////
// TODO: look into this stuff, possibly move handlers together with other handlers
private void populateBusStopsLayout(BusStop[] busStops) {
busStopNameTextView.setVisibility(View.GONE);
hideKeyboard();
prepareGUIForBusStops();
resultsListView.setAdapter(new AdapterBusStops(this, R.layout.entry_bus_stop, busStops));
resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView> parent, View view, int position, long id) {
/**
* Casting because of Javamerda
* @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
*/
BusStop busStop = (BusStop) parent.getItemAtPosition(position);
Intent intent = new Intent(ActivityMain.this,
ActivityMain.class);
Bundle b = new Bundle();
b.putString("bus-stop-ID", busStop.getBusStopID());
intent.putExtras(b);
startActivity(intent);
}
});
}
/**
* OK this is pure shit
*
* @param v View clicked
*/
public void onSearchClick(View v) {
showSpinner();
if (searchMode == SEARCH_BY_ID) {
String busStopID = busStopSearchByIDEditText.getText().toString();
- asyncWgetBusStopFromBusStopID(busStopID);
+ asyncWgetBusStopFromBusStopID(busStopID, 0);
} else { // searchMode == SEARCH_BY_NAME
String query = busStopSearchByNameEditText.getText().toString();
asyncWgetBusStopSuggestions(query);
}
}
/**
* QR scan button clocked
*
* @param v View QRButton clicked
*/
public void onQRButtonClick(View v) {
IntentIntegrator integrator = new IntentIntegrator(this);
integrator.initiateScan();
}
/**
* Receive the Barcode Scanner Intent
*
*/
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
Uri uri;
try {
uri = Uri.parse(scanResult != null ? scanResult.getContents() : null); // this apparently prevents NullPointerException. Somehow.
} catch (NullPointerException e) {
Toast.makeText(getApplicationContext(),
R.string.no_qrcode, Toast.LENGTH_SHORT).show();
return;
}
String busStopID = getBusStopIDFromUri(uri);
busStopSearchByIDEditText.setText(busStopID);
showSpinner();
- asyncWgetBusStopFromBusStopID(busStopID);
+ asyncWgetBusStopFromBusStopID(busStopID, 0);
}
public void onHideHint(View v) {
hideHints();
setOption(OPTION_SHOW_LEGEND, false);
}
public void onToggleKeyboardLayout(View v) {
if (searchMode == SEARCH_BY_NAME) {
setSearchModeBusStopID();
if (busStopSearchByIDEditText.requestFocus()) {
showKeyboard();
}
} else { // searchMode == SEARCH_BY_ID
setSearchModeBusStopName();
if (busStopSearchByNameEditText.requestFocus()) {
showKeyboard();
}
}
}
public void addInFavorites(View v) {
if (lastSuccessfullySearchedBusStopID != null) {
BusStop busStop = new BusStop(lastSuccessfullySearchedBusStopID);
busStop.setIsFavorite(true);
MyDB.DBBusStop.addBusStop(db, busStop);
BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID());
if (dbBusStop == null || dbBusStop.getBusStopLocality() == null) {
// This will also scrape the busStopLocality
try {
new AsyncWgetBusStopSuggestions(busStop.getBusStopID()) {
@Override
public void onReceivedBusStopNames(BusStop[] busStops, int status) {
if (status == AsyncWgetBusStopSuggestions.ERROR_NONE) {
for (BusStop busStop : busStops) {
MyDB.DBBusStop.addBusStop(db, busStop);
}
}
}
};
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
Toast.makeText(getApplicationContext(),
R.string.added_in_favorites, Toast.LENGTH_SHORT).show();
}
}
private void setOption(String optionName, boolean value) {
SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
editor.putBoolean(optionName, value);
editor.commit();
}
private boolean getOption(String optionName, boolean optDefault) {
SharedPreferences preferences = getPreferences(MODE_PRIVATE);
return preferences.getBoolean(optionName, optDefault);
}
private void showKeyboard() {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View view = searchMode == SEARCH_BY_ID ? busStopSearchByIDEditText : busStopSearchByNameEditText;
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
}
private void hideKeyboard() {
View view = getCurrentFocus();
if (view != null) {
((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
.hideSoftInputFromWindow(view.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS);
}
}
private void setSearchModeBusStopID() {
searchMode = SEARCH_BY_ID;
busStopSearchByNameEditText.setVisibility(View.GONE);
busStopSearchByNameEditText.setText("");
busStopSearchByIDEditText.setVisibility(View.VISIBLE);
floatingActionButton.setImageResource(R.drawable.alphabetical);
}
private void setSearchModeBusStopName() {
searchMode = SEARCH_BY_NAME;
busStopSearchByIDEditText.setVisibility(View.GONE);
busStopSearchByIDEditText.setText("");
busStopSearchByNameEditText.setVisibility(View.VISIBLE);
floatingActionButton.setImageResource(R.drawable.numeric);
}
/**
* Having that cursor at the left of the edit text makes me cancer.
* @param busStopID bus stop ID
*/
private void setBusStopSearchByIDEditText(String busStopID) {
busStopSearchByIDEditText.setText(busStopID);
busStopSearchByIDEditText.setSelection(busStopID.length());
}
private void showHints() {
howDoesItWorkTextView.setVisibility(View.VISIBLE);
hideHintButton.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(false);
}
private void hideHints() {
howDoesItWorkTextView.setVisibility(View.GONE);
hideHintButton.setVisibility(View.GONE);
actionHelpMenuItem.setVisible(true);
}
private final static boolean DOUBLE_SPINNER = true;
private final static boolean NORMAL_SPINNER = false;
private void showSpinner(boolean swipeSpinner) {
if (swipeSpinner) { // swipeSpinner == DOUBLE_SPINNER
swipeRefreshLayout.setRefreshing(true);
} else { // NORMAL_SPINNER
progressBar.setVisibility(View.VISIBLE);
}
}
private void showSpinner() {
showSpinner(NORMAL_SPINNER);
}
private void hideSpinner() {
swipeRefreshLayout.setRefreshing(false);
progressBar.setVisibility(View.INVISIBLE);
}
private void prepareGUIForBusLines() {
busStopNameTextView.setVisibility(View.VISIBLE);
busStopNameTextView.setClickable(true);
swipeRefreshLayout.setEnabled(true);
swipeRefreshLayout.setVisibility(View.VISIBLE);
resultsListView.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(true);
}
private void prepareGUIForBusStops() {
busStopNameTextView.setText(getString(R.string.results));
busStopNameTextView.setClickable(false);
busStopNameTextView.setVisibility(View.VISIBLE);
swipeRefreshLayout.setEnabled(false);
swipeRefreshLayout.setVisibility(View.VISIBLE);
resultsListView.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(false);
}
/**
* Open an URL in the default browser.
*
* @param url URL
*/
public void openIceweasel(String url) {
Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
startActivity(browserIntent1);
}
/**
* Try to extract the bus stop ID from a URi
*
* @param uri The URL
* @return bus stop ID or null
*/
public static String getBusStopIDFromUri(Uri uri) {
String busStopID;
switch (uri.getHost()) {
case "m.gtt.to.it":
// http://m.gtt.to.it/m/it/arrivi.jsp?n=1254
busStopID = uri.getQueryParameter("n");
if (busStopID == null) {
Log.e("ActivityMain", "Expected ?n from: " + uri);
}
break;
case "www.gtt.to.it":
case "gtt.to.it":
// http://www.gtt.to.it/cms/percorari/arrivi?palina=1254
busStopID = uri.getQueryParameter("palina");
if (busStopID == null) {
Log.e("ActivityMain", "Expected ?palina from: " + uri);
}
break;
default:
Log.e("ActivityMain", "Unexpected intent URL: " + uri);
busStopID = null;
}
return busStopID;
}
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java b/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
index f5ac694..6a0005f 100644
--- a/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
+++ b/src/it/reyboz/bustorino/backend/GTTJSONFetcher.java
@@ -1,134 +1,134 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.backend;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Scanner;
import java.util.concurrent.atomic.AtomicReference;
public class GTTJSONFetcher implements ArrivalsFetcher {
// @Override
// public Palina ReadArrivalTimesRoute(String stopID, String routeID, AtomicReference res) {
// return this.ReadArrivalTimesAll(routeID, res); // TODO: implement this when it's needed (never?)
// }
@Override @NonNull
public Palina ReadArrivalTimesAll(String routeID, AtomicReference res) {
URL url;
Palina p = new Palina();
JSONArray json;
int howManyRoutes, howManyPassaggi, i, j, pos; // il misto inglese-italiano รจ un po' ridicolo ma tanto vale...
JSONObject thisroute;
JSONArray passaggi;
try {
url = new URL("http://www.gtt.to.it/cms/index.php?option=com_gtt&task=palina.getTransiti&palina=" + routeID + "&realtime=true");
} catch (MalformedURLException e) {
res.set(result.PARSER_ERROR);
return p;
}
json = queryURL(url, res);
if(json == null) {
return p;
}
howManyRoutes = json.length();
if(howManyRoutes == 0) {
res.set(result.EMPTY_RESULT_SET);
return p;
}
try {
for(i = 0; i < howManyRoutes; i++) {
thisroute = json.getJSONObject(i);
pos = p.addRoute(thisroute.getString("Linea"), thisroute.getString("Direzione"));
passaggi = thisroute.getJSONArray("PassaggiRT");
howManyPassaggi = passaggi.length();
for(j = 0; j < howManyPassaggi; i++) {
p.addPassaggio(passaggi.getString(j).concat("*"), pos);
}
passaggi = thisroute.getJSONArray("Passaggi"); // now the non-real-time ones
howManyPassaggi = passaggi.length();
for(j = 0; j < howManyPassaggi; i++) {
p.addPassaggio(passaggi.getString(j), pos);
}
}
} catch (JSONException e) {
res.set(result.PARSER_ERROR);
return p;
}
res.set(result.OK);
return p;
}
@Nullable
private JSONArray queryURL(URL url, AtomicReference res) {
HttpURLConnection urlConnection;
JSONArray json;
try {
urlConnection = (HttpURLConnection) url.openConnection();
} catch(IOException e) {
res.set(result.SERVER_OFFLINE); // TODO: can we assume this is CLIENT_OFFLINE?
return null;
}
try {
InputStream in = urlConnection.getInputStream();
json = new JSONArray(streamToString(in));
} catch (Exception e) {
res.set(result.PARSER_ERROR);
return null;
} finally {
urlConnection.disconnect();
}
try {
// returns [{"PassaggiRT":[],"Passaggi":[]}] for non existing stops!
json.getJSONObject(0).getString("Linea"); // if we can get this, then there's something useful in the array.
} catch(JSONException e) {
- res.set(result.EMPTY_RESULT_SET); // could also use NOT_FOUND
+ res.set(result.EMPTY_RESULT_SET);
return null;
}
return json;
}
// https://stackoverflow.com/a/14585883
private static String streamToString(InputStream is) {
Scanner s = new Scanner(is); // TODO: test this
return s.hasNext() ? s.next() : "";
}
}
diff --git a/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java b/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
index c825cd7..4d338bf 100644
--- a/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
+++ b/src/it/reyboz/bustorino/middleware/AsyncArrivalsFetcherAll.java
@@ -1,62 +1,62 @@
/*
BusTO (backend components)
Copyright (C) 2016 Ludovico Pavesi
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
package it.reyboz.bustorino.middleware;
import it.reyboz.bustorino.backend.ArrivalsFetcher;
import it.reyboz.bustorino.backend.Fetcher;
import it.reyboz.bustorino.backend.Palina;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import java.util.concurrent.atomic.AtomicReference;
public class AsyncArrivalsFetcherAll extends AsyncTask {
private final ArrivalsFetcher af;
private AtomicReference result;
private final String stopID;
private final AsyncArrivalsFetcherAllCallback callback;
- public AsyncArrivalsFetcherAll(@NonNull ArrivalsFetcher af, @NonNull String stopID, AsyncArrivalsFetcherAllCallback callback) {
+ public AsyncArrivalsFetcherAll(@NonNull ArrivalsFetcher af, @NonNull String stopID, @NonNull AsyncArrivalsFetcherAllCallback callback) {
this.af = af;
this.stopID = stopID;
this.callback = callback;
}
@Override protected Palina doInBackground(Void... useless) {
return af.ReadArrivalTimesAll(this.stopID, this.result); // TODO: reuse the same Palina object and update it
}
@Override protected void onPostExecute(Palina p) {
if(!this.isCancelled()) { // is this really needed?
this.callback.call(p, result.get(), this.stopID);
}
}
/**
* Android doesn't really support JDK 8, so we have to use this hack\workaround.
*
* I've already tested 4 different solutions, this is the cleanest-looking so far...
*
* The only purpose of this interface is to glue together the AsyncArrivalsFetcherAll and whatver ActivityMain needs to do after obraining results, change parameters liberally if needed.
*/
public interface AsyncArrivalsFetcherAllCallback {
void call(Palina p, Fetcher.result res, String stopID);
}
}
\ No newline at end of file