diff --git a/database_schema.txt b/database_schema.txt
index 9989f31..58eeacf 100644
--- a/database_schema.txt
+++ b/database_schema.txt
@@ -1,8 +1,9 @@
CREATE TABLE routemap
(
route TEXT NOT NULL,
stop TEXT NOT NULL
);
CREATE INDEX route_index ON routemap(route);
CREATE INDEX stop_index ON routemap(stop);
-CREATE UNIQUE INDEX double_index ON routemap(route, stop);
\ No newline at end of file
+CREATE UNIQUE INDEX double_index ON routemap(route, stop);
+CREATE TABLE stops (ID TEXT PRIMARY KEY, name TEXT, location TEXT, type TEXT, lat DOUBLE, lon DOUBLE);
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java
index 009debb..0117d09 100644
--- a/src/it/reyboz/bustorino/ActivityMain.java
+++ b/src/it/reyboz/bustorino/ActivityMain.java
@@ -1,819 +1,874 @@
/*
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.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
+import android.support.annotation.NonNull;
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 java.util.List;
import it.reyboz.bustorino.backend.ArrivalsFetcher;
import it.reyboz.bustorino.backend.Fetcher;
import it.reyboz.bustorino.backend.FiveTNormalizer;
import it.reyboz.bustorino.backend.FiveTScraperFetcher;
import it.reyboz.bustorino.backend.FiveTStopsFetcher;
import it.reyboz.bustorino.backend.GTTJSONFetcher;
import it.reyboz.bustorino.backend.GTTStopsFetcher;
import it.reyboz.bustorino.backend.Palina;
import it.reyboz.bustorino.backend.Route;
import it.reyboz.bustorino.backend.Stop;
import it.reyboz.bustorino.backend.StopsFinderByName;
import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop;
import it.reyboz.bustorino.lab.MyDB;
import it.reyboz.bustorino.lab.asyncwget.AsyncWgetBusStopSuggestions;
import it.reyboz.bustorino.middleware.AsyncArrivalsFetcherAll;
import it.reyboz.bustorino.middleware.AsyncStopsFinderByName;
import it.reyboz.bustorino.middleware.PalinaAdapter;
import it.reyboz.bustorino.middleware.StopAdapter;
import it.reyboz.bustorino.middleware.StopsDB;
public class ActivityMain extends AppCompatActivity {
private class RecursionHelper {
private int pos = 0;
public AsyncTask, ?, ?> RunningInstance = null; // the only one that hasn't been cancelled
public void reset() {
this.pos = 0;
if(RunningInstance != null) {
RunningInstance.cancel(true);
}
}
public void increment() {
pos++;
}
public int getPos() {
return pos;
}
}
/*
* 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;
/*
* Serach mode
*/
private static final int SEARCH_BY_NAME = 0;
private static final int SEARCH_BY_ID = 1;
private static final int SEARCH_BY_ROUTE = 2; // TODO: implement this (bug #1512948)
private int searchMode;
/*
* Options
*/
private final String OPTION_SHOW_LEGEND = "show_legend";
private StopsDB stopsDB;
/**
* Last successfully searched bus stop ID
*/
private String lastSuccessfullySearchedBusStopID = null;
+ private String lastSuccessfullySearchedBusStopDisplayName = null; // TODO: set to null when renaming a stop
/* // useful for testing:
public class MockFetcher implements ArrivalsFetcher {
@Override
public Palina ReadArrivalTimesAll(String routeID, AtomicReference res) {
SystemClock.sleep(5000);
res.set(result.SERVER_ERROR);
return new Palina();
}
}
private ArrivalsFetcher[] ArrivalFetchers = {new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher()};*/
/*
* I tried to wrap everything in a class and it didn't work right no matter what.
* Or it kinda worked, but accessing things became very ugly, especially if you wanted to
* hide the internal structure of the class.
* At least I've managed to shoehorn two variables and a method in there, the array will stay
* outside.
*
* I don't know if I should be surprised that handling recursion the C way looks a lot cleaner
* than wrapping and extending and implementing everything the Java way.
*/
private ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher(), new FiveTScraperFetcher()};
private RecursionHelper ArrivalFetchersRecursionHelper = new RecursionHelper();
private StopsFinderByName[] StopsFindersByName = {new GTTStopsFetcher(), new FiveTStopsFetcher()};
private RecursionHelper StopsFindersByNameRecursionHelper = new RecursionHelper();
private SQLiteDatabase db;
///////////////////////////////// EVENT HANDLERS ///////////////////////////////////////////////
/*
* @see swipeRefreshLayout
*/
private Handler handler = new Handler();
private final Runnable refreshing = new Runnable() {
public void run() {
asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, true);
}
};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.stopsDB = new StopsDB(getApplicationContext());
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
// TODO: did I accidentally remove the warning?
ArrivalFetchersRecursionHelper.reset();
}
} else {
// If you are here an intent has worked successfully
setBusStopSearchByIDEditText(busStopID);
asyncWgetBusStopFromBusStopID(busStopID, true);
}
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) {
setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStopID);
asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStopID, true);
}
}
@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);
}
/**
* OK this is pure shit
*
* @param v View clicked
*/
public void onSearchClick(View v) {
if (searchMode == SEARCH_BY_ID) {
String busStopID = busStopSearchByIDEditText.getText().toString();
asyncWgetBusStopFromBusStopID(busStopID, true);
} else { // searchMode == SEARCH_BY_NAME
String query = busStopSearchByNameEditText.getText().toString();
asyncWgetBusStopSuggestions(query, true);
}
}
/**
* QR scan button clicked
*
* @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);
asyncWgetBusStopFromBusStopID(busStopID, true);
}
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();
}
}
}
///////////////////////////////// STOPS FINDER BY NAME /////////////////////////////////////////
/**
* See the other asyncWget method for documentation\comments.
*/
private void asyncWgetBusStopSuggestions(String query, boolean reset) {
toggleSpinner(true);
if(reset) {
StopsFindersByNameRecursionHelper.reset();
}
if(query == null || query.length() == 0) {
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show();
toggleSpinner(false);
return;
}
if(StopsFindersByNameRecursionHelper.getPos() >= StopsFindersByName.length) {
// TODO: error message (tryed every fetcher and failed)
StopsFindersByNameRecursionHelper.reset();
toggleSpinner(false);
return;
}
if(StopsFindersByNameRecursionHelper.RunningInstance != null) {
StopsFindersByNameRecursionHelper.RunningInstance.cancel(true);
}
StopsFindersByNameRecursionHelper.RunningInstance = new AsyncStopsFinderByName(StopsFindersByName[StopsFindersByNameRecursionHelper.getPos()], query, new AsyncStopsFinderByNameCallbackImplementation(), stopsDB).execute();
}
private class AsyncStopsFinderByNameCallbackImplementation implements AsyncStopsFinderByName.AsyncStopsFinderByNameCallback {
public void call(List stops, Fetcher.result res, String query) {
toggleSpinner(false);
switch (res) {
case CLIENT_OFFLINE:
Toast.makeText(getApplicationContext(),
R.string.network_error, Toast.LENGTH_SHORT).show();
break; // goto recursion
case SERVER_ERROR:
if(isConnected()) {
// TODO: better error message for this case
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getApplicationContext(),
R.string.network_error, Toast.LENGTH_SHORT).show();
}
break;
case PARSER_ERROR:
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
break; // goto recursion
case QUERY_TOO_SHORT:
Toast.makeText(getApplicationContext(),
R.string.query_too_short, Toast.LENGTH_SHORT).show();
break;
case EMPTY_RESULT_SET:
Toast.makeText(getApplicationContext(),
R.string.no_bus_stop_have_this_name, Toast.LENGTH_SHORT).show();
break; // goto recursion
case OK:
populateBusStopsLayout(stops);
toggleSpinner(false); // recursion terminated, remove spinner
return; // RETURN.
}
StopsFindersByNameRecursionHelper.increment();
asyncWgetBusStopSuggestions(query, false);
}
}
private void populateBusStopsLayout(List busStops) {
hideKeyboard();
busStopNameTextView.setVisibility(View.GONE);
prepareGUIForBusStops();
resultsListView.setAdapter(new StopAdapter(this, 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
*/
Stop busStop = (Stop) parent.getItemAtPosition(position);
Intent intent = new Intent(ActivityMain.this, ActivityMain.class);
Bundle b = new Bundle();
b.putString("bus-stop-ID", busStop.ID);
intent.putExtras(b);
startActivity(intent);
}
});
}
///////////////////////////////// ARRIVALS FETCHER /////////////////////////////////////////////
/**
* Try every fetcher until you get something usable.
*
* @param busStopID the ID
* @param reset set to true if you want to live (set to false during recursion)
*/
private void asyncWgetBusStopFromBusStopID(String busStopID, boolean reset) {
toggleSpinner(true);
if(reset) {
ArrivalFetchersRecursionHelper.reset();
}
if(busStopID == null || busStopID.length() == 0) { // TODO: this should be run only on first recursive call
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
toggleSpinner(false);
return;
}
if(ArrivalFetchersRecursionHelper.getPos() >= ArrivalFetchers.length) {
// TODO: error message (tryed every fetcher and failed)
ArrivalFetchersRecursionHelper.reset();
toggleSpinner(false);
return;
}
// cancel whatever is still running
if(ArrivalFetchersRecursionHelper.RunningInstance != null) {
// cancel() should hopefully only kill the background thread, not the one we're using for this same recursion...
ArrivalFetchersRecursionHelper.RunningInstance.cancel(true);
}
// create new task, run it, store the running instance. Don't try to reorder these calls even though it's unreadable, trust me.
ArrivalFetchersRecursionHelper.RunningInstance = new AsyncArrivalsFetcherAll(ArrivalFetchers[ArrivalFetchersRecursionHelper.getPos()], busStopID, new AsyncArrivalsFetcherAllCallbackImplementation()).execute();
}
private class AsyncArrivalsFetcherAllCallbackImplementation implements AsyncArrivalsFetcherAll.AsyncArrivalsFetcherAllCallback {
public void call(Palina p, Fetcher.result res, String stopID) {
switch (res) {
case CLIENT_OFFLINE:
Toast.makeText(getApplicationContext(),
R.string.network_error, Toast.LENGTH_SHORT).show();
break; // goto recursion
case SERVER_ERROR:
if(isConnected()) {
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
} else { // TODO: better error message for this case
Toast.makeText(getApplicationContext(),
R.string.network_error, Toast.LENGTH_SHORT).show();
}
break;
case QUERY_TOO_SHORT: // should never happen here, but to err on the side of caution...
Toast.makeText(getApplicationContext(),
R.string.query_too_short, Toast.LENGTH_SHORT).show();
break;
case PARSER_ERROR:
Toast.makeText(getApplicationContext(),
R.string.parsing_error, Toast.LENGTH_SHORT).show();
break; // goto recursion
case EMPTY_RESULT_SET:
Toast.makeText(getApplicationContext(),
R.string.no_passages, Toast.LENGTH_SHORT).show();
break; // goto recursion
case OK:
- lastSuccessfullySearchedBusStopID = stopID;
- hideKeyboard();
- populateBusLinesLayout(p, stopID);
- toggleSpinner(false); // recursion terminated, remove spinner
- return; // RETURN.
+ new populateBusLinesLayout(p, stopID).execute();
+ return; // RETURN. populateBusLinesLayout will do the rest.
}
// indirect recursion through a callback. ...yeha.
ArrivalFetchersRecursionHelper.increment();
asyncWgetBusStopFromBusStopID(stopID, false);
}
}
- private void populateBusLinesLayout(Palina p, String stopID) {
- // TODO: implement favorites username
- /*if(dbBusStop != null && dbBusStop.getBusStopUsername() != null) {
- busStopNameDisplay = dbBusStop.getBusStopUsername();
- } else if (busStop.getBusStopName() != null) {
- busStopNameDisplay = busStop.getBusStopName();
- } else {
- busStopNameDisplay = String.valueOf(busStopID);
- }*/
+ private class populateBusLinesLayout extends AsyncTask {
+ private final Palina p;
+ private final String stopID;
+ private String stopName;
+ private final Context c;
- hideKeyboard();
+ populateBusLinesLayout(@NonNull Palina p, @NonNull String stopID) {
+ this.p = p;
+ this.stopID = stopID;
+ this.c = getApplicationContext();
+ if(stopID.equals(lastSuccessfullySearchedBusStopID)) {
+ this.stopName = lastSuccessfullySearchedBusStopDisplayName;
+ }
+ }
- busStopNameTextView.setText(String.format(
- getString(R.string.passages), p.getStopName().length() == 0 ? stopID : stopID.concat(" - ").concat(p.getStopName())));
+ @Override
+ protected String doInBackground(Void... useless) {
+ // extreme memoization techniques.
+ if(this.stopName != null) {
+ return this.stopName;
+ }
- // Shows hints
- if(getOption(OPTION_SHOW_LEGEND, true)) {
- showHints();
- } else {
- hideHints();
+ // TODO: search favorites, get (user)name if set, set this.stopName, p.setStopName() and lastSuccessfullySearchedBusStopDisplayName, return
+
+ String nameMaybe = p.getStopName();
+
+ if(nameMaybe != null && nameMaybe.length() > 0) {
+ this.stopName = nameMaybe;
+ lastSuccessfullySearchedBusStopDisplayName = nameMaybe;
+ return this.stopName;
+ }
+
+ // Palina doesn't know anything, let's see what the database has to say...
+
+ StopsDB db = new StopsDB(this.c);
+
+ db.openIfNeeded();
+ nameMaybe = db.getNameFromID(this.stopID);
+ db.closeIfNeeded();
+
+ if(nameMaybe != null && nameMaybe.length() > 0) {
+ p.setStopName(nameMaybe);
+ this.stopName = nameMaybe;
+ lastSuccessfullySearchedBusStopDisplayName = nameMaybe;
+ return this.stopName;
+ }
+
+ p.setStopName("");
+ lastSuccessfullySearchedBusStopDisplayName = "";
+ return "";
}
- prepareGUIForBusLines();
+ @Override
+ protected void onPostExecute(String displayName) {
+ hideKeyboard();
+ String displayStuff;
+
+ if(displayName != null && displayName.length() > 0) {
+ displayStuff = stopID.concat(" - ").concat(p.getStopName());
+ } else {
+ displayStuff = stopID;
+ }
- resultsListView.setAdapter(new PalinaAdapter(this, p));
+ busStopNameTextView.setText(String.format(
+ getString(R.string.passages), displayStuff));
- resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ // Shows hints
+ if(getOption(OPTION_SHOW_LEGEND, true)) {
+ showHints();
+ } else {
+ hideHints();
+ }
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- String routeName;
+ prepareGUIForBusLines();
- Route r = (Route) parent.getItemAtPosition(position);
- routeName = FiveTNormalizer.routeInternalToDisplay(r.name);
- if(routeName == null) {
- routeName = r.name;
- }
- if(r.destinazione == null || r.destinazione.length() == 0) {
- Toast.makeText(getApplicationContext(),
- getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show();
- } else {
- Toast.makeText(getApplicationContext(),
- getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show();
+ resultsListView.setAdapter(new PalinaAdapter(this.c, p));
+
+ resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+ @Override
+ public void onItemClick(AdapterView> parent, View view, int position, long id) {
+ String routeName;
+
+ Route r = (Route) parent.getItemAtPosition(position);
+ routeName = FiveTNormalizer.routeInternalToDisplay(r.name);
+ if(routeName == null) {
+ routeName = r.name;
+ }
+ if(r.destinazione == null || r.destinazione.length() == 0) {
+ Toast.makeText(getApplicationContext(),
+ getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(getApplicationContext(),
+ getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show();
+ }
}
- }
- });
+ });
+
+ lastSuccessfullySearchedBusStopID = stopID;
+
+ toggleSpinner(false);
+ }
}
///////////////////////////////// OTHER STUFF //////////////////////////////////////////////////
private boolean isConnected() {
ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
return networkInfo != null && networkInfo.isConnected();
}
// TODO: try to move these 3 methods to a separate class
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);
}
////////////////////////////////////// GUI HELPERS /////////////////////////////////////////////
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 void toggleSpinner(boolean enable) {
if (enable) {
//already set by the RefreshListener when needed
//swipeRefreshLayout.setRefreshing(true);
progressBar.setVisibility(View.VISIBLE);
} else {
swipeRefreshLayout.setRefreshing(false);
progressBar.setVisibility(View.GONE);
}
}
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);
}
///////////////////// INTENT HELPER ////////////////////////////////////////////////////////////
/**
* 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/Palina.java b/src/it/reyboz/bustorino/backend/Palina.java
index a60b606..19161d8 100644
--- a/src/it/reyboz/bustorino/backend/Palina.java
+++ b/src/it/reyboz/bustorino/backend/Palina.java
@@ -1,226 +1,226 @@
/*
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 java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* Timetable for multiple routes.
*
* Apparently "palina" and a bunch of other terms can't really be translated into English.
* Not in a way that makes sense and keeps the code readable, at least.
*/
-public class Palina {
+public class Palina { // TODO: extend Stop, maybe?
//private final String stopID;
private String stopName = "";
private ArrayList routes = new ArrayList<>();
// public Palina(String stopID) {
// this.stopID = stopID;
// }
public final void setStopName(String name) {
this.stopName = name;
}
public final String getStopName() {
return stopName;
}
/**
* Adds a route to the timetable.
*
* @param routeID name
* @param type bus, underground, railway, ...
* @param destinazione end of line\terminus (underground stations have the same ID for both directions)
* @return array index for this route
*/
public int addRoute(String routeID, String destinazione, Route.Type type) {
this.routes.add(new Route(routeID, destinazione, type, new ArrayList(6)));
return this.routes.size() - 1; // last inserted element and pray that direct access to ArrayList elements really is direct
}
/**
* Adds a timetable entry to a route.
*
* @param TimeGTT time in GTT format (e.g. "11:22*")
* @param arrayIndex position in the array for this route (returned by addRoute)
*/
public void addPassaggio(String TimeGTT, int arrayIndex) {
this.routes.get(arrayIndex).addPassaggio(TimeGTT);
}
// /**
// * Clears a route timetable (or creates an empty route) and returns its index
// *
// * @param routeID name
// * @param destinazione end of line\terminus
// * @return array index for this route
// */
// public int updateRoute(String routeID, String destinazione) {
// int s = this.routes.size();
// RouteInternal r;
//
// for(int i = 0; i < s; i++) {
// r = routes.get(i);
// if(r.name.compareTo(routeID) == 0 && r.destinazione.compareTo(destinazione) == 0) {
// // capire se รจ possibile che ci siano stessa linea e stessa destinazione su 2 righe diverse del sito e qui una sovrascrive l'altra (probabilmente no)
// r.updateFlag();
// r.deletePassaggio();
// return i;
// }
// }
//
// return this.addRoute(routeID, destinazione);
// }
//
// /**
// * Deletes routes marked as "not updated" (= disappeared from the GTT website\API\whatever).
// * Sets all remaining routes to "not updated" because that's how this contraption works.
// */
// public void finishUpdatingRoutes() {
// RouteInternal r;
//
// for(Iterator itr = this.routes.iterator(); itr.hasNext(); ) {
// r = itr.next();
// if(r.unupdateFlag()) {
// itr.remove();
// }
// }
// }
/**
* Gets the current timetable for a route. Returns null if the route doesn't exist.
* This is slower than queryRouteByIndex.
*
* @return timetable (passaggi)
*/
public List queryRoute(String routeID) {
for(Route r : this.routes) {
if(routeID.equals(r.name)) {
return r.getPassaggi();
}
}
return null;
}
/**
* Gets the current timetable for this route, from its index in the array.
*
* @return timetable (passaggi)
*/
public List queryRouteByIndex(int index) {
return this.routes.get(index).getPassaggi();
}
/**
* Gets every route and its timetable.
*
* @return routes and timetables.
*/
public List queryAllRoutes() {
return this.routes;
}
public void sortRoutes() {
Collections.sort(this.routes);
}
// /**
// * Route with terminus (destinazione) and timetables (passaggi), internal implementation.
// *
// * Contains mostly the same data as the Route public class, but methods are quite different and extending Route doesn't really work, here.
// */
// private final class RouteInternal {
// public final String name;
// public final String destinazione;
// private boolean updated;
// private List passaggi;
//
// /**
// * Creates a new route and marks it as "updated", since it's new.
// *
// * @param routeID name
// * @param destinazione end of line\terminus
// */
// public RouteInternal(String routeID, String destinazione) {
// this.name = routeID;
// this.destinazione = destinazione;
// this.passaggi = new LinkedList<>();
// this.updated = true;
// }
//
// /**
// * Adds a time (passaggio) to the timetable for this route
// *
// * @param TimeGTT time in GTT format (e.g. "11:22*")
// */
// public void addPassaggio(String TimeGTT) {
// this.passaggi.add(new Passaggio(TimeGTT));
// }
//
// /**
// * Deletes al times (passaggi) from the timetable.
// */
// public void deletePassaggio() {
// this.passaggi = new LinkedList<>();
// this.updated = true;
// }
//
// /**
// * Sets the "updated" flag to false.
// *
// * @return previous state
// */
// public boolean unupdateFlag() {
// if(this.updated) {
// this.updated = false;
// return true;
// } else {
// return false;
// }
// }
//
// /**
// * Sets the "updated" flag to true.
// *
// * @return previous state
// */
// public boolean updateFlag() {
// if(this.updated) {
// return true;
// } else {
// this.updated = true;
// return false;
// }
// }
//
// /**
// * Exactly what it says on the tin.
// *
// * @return times from the timetable
// */
// public List getPassaggi() {
// return this.passaggi;
// }
// }
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/backend/StopsDBInterface.java b/src/it/reyboz/bustorino/backend/StopsDBInterface.java
index e59414c..eb76e7d 100644
--- a/src/it/reyboz/bustorino/backend/StopsDBInterface.java
+++ b/src/it/reyboz/bustorino/backend/StopsDBInterface.java
@@ -1,35 +1,44 @@
/*
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 java.util.List;
/**
* No reference to SQLite whatsoever, here.
* Don't get StopsDB inside the backend, use this interface instead.
*/
public interface StopsDBInterface {
/**
* Given a stop ID, get which routes stop there (as strings, there's no sane way to determine their destination\terminus from the database)
*
* @param stopID stop ID
* @return list of routes or null if none
*/
List getRoutesByStop(String stopID);
+
+ /**
+ * Stop ID goes in, stop name comes out.
+ * GTT API doesn't return this useful piece of information, so here we go, get it from the database!
+ *
+ * @param stopID stop ID, in normalized form
+ * @return stop name or null if not found
+ */
+ String getNameFromID(String stopID);
}
diff --git a/src/it/reyboz/bustorino/middleware/StopsDB.java b/src/it/reyboz/bustorino/middleware/StopsDB.java
index b65dace..be51fef 100644
--- a/src/it/reyboz/bustorino/middleware/StopsDB.java
+++ b/src/it/reyboz/bustorino/middleware/StopsDB.java
@@ -1,175 +1,238 @@
/*
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 android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteOpenHelper;
import android.support.annotation.Nullable;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import it.reyboz.bustorino.backend.StopsDBInterface;
/**
* There's just one single difference between this and SQLiteAssetHelper: this implementation works,
* instead of crashing the app without any error message or exception whatsoever as soon as you try
* to open the database.
*
* @see http://blog.reigndesign.com/blog/using-your-own-sqlite-database-in-android-applications/
*/
public class StopsDB extends SQLiteOpenHelper implements StopsDBInterface {
private final Context c;
- private final String PATH;
private static String DB_NAME = "busto.sqlite";
private static int DB_VERSION = 1;
+ private final File filename;
private SQLiteDatabase db;
private AtomicInteger openCounter = new AtomicInteger();
public StopsDB(Context context) {
super(context, DB_NAME, null, DB_VERSION);
this.c = context;
- this.PATH = this.c.getFilesDir().getPath();
+ this.filename = new File(this.c.getFilesDir(), DB_NAME);
}
private void createDb() {
+ //this.getReadableDatabase();
+
+ InputStream is;
+ OutputStream os;
+
try {
- this.getReadableDatabase();
- copyTables();
- } catch (IOException ignored) {}
- }
+ is = c.getAssets().open(DB_NAME);
+ } catch(IOException e) {
+ /* in case an upgrade is failing, nuke everything rather than leaving an old database
+ * in place (should save us lots of headaches related to absurd non-reproducible bugs)
+ */
+ //noinspection ResultOfMethodCallIgnored
+ filename.delete();
+ return;
+ }
- private void copyTables() throws IOException {
- InputStream is = c.getAssets().open(DB_NAME);
- OutputStream os = new FileOutputStream(this.PATH.concat(DB_NAME));
+ try {
+ os = new FileOutputStream(filename);
+ } catch(FileNotFoundException e) {
+ //noinspection ResultOfMethodCallIgnored
+ filename.delete();
+ return;
+ }
byte[] buffer = new byte[1024];
int length;
- while ((length = is.read(buffer)) > 0) {
- os.write(buffer, 0, length);
- }
- os.flush();
- os.close();
- is.close();
+ try {
+ while ((length = is.read(buffer)) > 0) {
+ os.write(buffer, 0, length);
+ }
+ os.flush();
+ os.close();
+ is.close();
+ } catch(IOException e) {
+ //noinspection ResultOfMethodCallIgnored
+ filename.delete();
+ }
}
/**
* Through the magic of an atomic counter, the database gets opened and closed without race
* conditions between threads (HOPEFULLY).
*
* @return database or null if cannot be opened
*/
@Nullable
public synchronized SQLiteDatabase openIfNeeded() {
openCounter.incrementAndGet();
if(this.db == null) {
this.db = openRecursive(false);
}
return this.db;
}
/**
* Making this function recursive is just a pointless exercise in style, since it calls itself exactly once.
*
* @param retrying set to true during recursion
* @return SQLiteDatabase or null
*/
@Nullable
private SQLiteDatabase openRecursive(boolean retrying) {
try {
- return SQLiteDatabase.openDatabase(this.PATH.concat(DB_NAME), null, SQLiteDatabase.OPEN_READONLY);
+ /* I have no idea why it worked without NO_LOCALIZED_COLLATORS, since it's mandatory
+ * unless you place some Android-specific metadata tables that aren't that well documented...
+ * Also, apparently there's no openDatabase() method that takes a File.
+ */
+ return SQLiteDatabase.openDatabase(this.filename.getPath(), null, SQLiteDatabase.OPEN_READONLY | SQLiteDatabase.NO_LOCALIZED_COLLATORS);
} catch(SQLiteException e) {
if(retrying) {
// failed a 2nd time, give up
return null;
} else {
// create it
createDb();
return openRecursive(true);
}
}
}
/**
* Through the magic of an atomic counter, the database gets really closed only when no thread
* is using it anymore (HOPEFULLY).
*/
public synchronized void closeIfNeeded() {
// is anybody still using the database or can we close it?
if(openCounter.decrementAndGet() <= 0) {
if (this.db != null && this.db.isOpen()) {
this.db.close();
}
super.close();
this.db = null;
}
}
@Override
public void onCreate(SQLiteDatabase db) {
- // TODO: implement (do we even need to do anything?)
+ // copy database (new install)
+ createDb();
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- // TODO: implement
+ // destroy old database, replace with new
+ createDb();
}
@Override
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- // TODO: implement
+ // destroy new database, replace with old
+ createDb();
}
@Override
public List getRoutesByStop(String stopID) {
String[] uselessArray = {stopID};
int count;
+ Cursor result;
if(db == null) {
return null;
}
- Cursor result = db.rawQuery("SELECT route FROM routemap WHERE stop = ?", uselessArray);
+ try {
+ result = db.rawQuery("SELECT route FROM routemap WHERE stop = ?", uselessArray);
+ } catch(SQLiteException e) {
+ return null;
+ }
count = result.getCount();
if(count == 0) {
return null;
}
List routes = new ArrayList<>(count);
while(result.moveToNext()) {
routes.add(result.getString(0));
}
result.close();
return routes;
}
+
+ @Override
+ public String getNameFromID(String stopID) {
+ String[] uselessArray = {stopID};
+ int count;
+ String name;
+ Cursor result;
+
+ if(db == null) {
+ return null;
+ }
+
+ try {
+ result = db.rawQuery("SELECT name FROM stops WHERE ID = ?", uselessArray);
+ } catch(SQLiteException e) {
+ return null;
+ }
+
+ count = result.getCount();
+ if(count == 0) {
+ return null;
+ }
+
+ result.moveToNext();
+ name = result.getString(0);
+
+ result.close();
+
+ return name;
+ }
}