diff --git a/build.gradle b/build.gradle index 13c513a..ee6ac15 100644 --- a/build.gradle +++ b/build.gradle @@ -1,48 +1,48 @@ buildscript { repositories { mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:2.0.0' } } apply plugin: 'com.android.application' android { compileSdkVersion 23 buildToolsVersion '23.0.3' // was 23.0.2 compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] } } lintOptions { abortOnError false } repositories { mavenCentral() mavenLocal() } dependencies { - compile 'com.android.support:support-v4:23.2.1' // was 21 - compile 'com.android.support:appcompat-v7:23.2.1' // was 21 + compile 'com.android.support:support-v4:23.2.1' + compile 'com.android.support:appcompat-v7:23.2.1' compile 'com.melnykov:floatingactionbutton:1.1.0' } } \ No newline at end of file diff --git a/database_schema.txt b/database_schema.txt new file mode 100644 index 0000000..35e9664 --- /dev/null +++ b/database_schema.txt @@ -0,0 +1,7 @@ +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); diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java index 288ed67..009debb 100644 --- a/src/it/reyboz/bustorino/ActivityMain.java +++ b/src/it/reyboz/bustorino/ActivityMain.java @@ -1,827 +1,819 @@ /* 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.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; /* // 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; } - // TODO: implement offline search (it's possibile.) -// if (!NetworkTools.isConnected(getApplicationContext())) { -// NetworkTools.showNetworkError(getApplicationContext()); -// 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()).execute(); + 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: - //for (BusStop busStop : busStops) { - // MyDB.DBBusStop.addBusStop(db, busStop); - //} - 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. } // 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); }*/ hideKeyboard(); busStopNameTextView.setText(String.format( getString(R.string.passages), p.getStopName().length() == 0 ? stopID : stopID.concat(" - ").concat(p.getStopName()))); - // 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) { 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(); } } }); } ///////////////////////////////// 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/FiveTStopsFetcher.java b/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java index 2171196..aeb4f6d 100644 --- a/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java +++ b/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java @@ -1,115 +1,115 @@ /* 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 org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import java.net.URL; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; /** * Once was asynchronous BusStop[] fetcher from a query, code mostly taken from * AsyncWgetBusStopSuggestions (by Valerio Bozzolan) * * @see FiveTScraperFetcher */ public class FiveTStopsFetcher implements StopsFinderByName { @Override - public List FindByName(String name, AtomicReference res) { + public List FindByName(String name, StopsDBInterface db, AtomicReference res) { // API apparently limited to 20 results ArrayList busStops = new ArrayList<>(20); String stopID; String stopName; String stopLocation; //Stop busStop; if(name.length() < 3) { res.set(result.QUERY_TOO_SHORT); return busStops; } String responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas; URL u; try { u = new URL("http://www.5t.torino.it/5t/trasporto/stop-lookup.jsp?action=search&stopShortName=" + URLEncoder.encode(name, "utf-8")); } catch(Exception e) { res.set(Fetcher.result.PARSER_ERROR); return busStops; } responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas = networkTools.getDOM(u, res); if (responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas == null) { // result already set in getDOM() return busStops; } Document doc = Jsoup.parse(responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas); // Find bus stops Elements lis = doc.getElementsByTag("li"); for(Element li : lis) { Elements spans = li.getElementsByTag("span"); // busStopID try { stopID = FiveTNormalizer.FiveTNormalizeRoute(spans.eq(0).text()); } catch(Exception e) { //Log.e("Suggestions", "Empty busStopID"); stopID = ""; } // busStopName try { stopName = spans.eq(1).text(); } catch(Exception e) { //Log.e("Suggestions", "Empty busStopName"); stopName = ""; } // busStopLocation try { stopLocation = (spans.eq(2).text()); } catch(Exception e) { //Log.e("Suggestions", "Empty busStopLocation"); stopLocation = null; } - busStops.add(new Stop(stopName, stopID, stopLocation, null)); + busStops.add(new Stop(stopName, stopID, stopLocation, null, db.getRoutesByStop(stopID))); } if(busStops.size() == 0) { res.set(result.EMPTY_RESULT_SET); } else { res.set(result.OK); } Collections.sort(busStops); // TODO: remove duplicates? (see GTTStopsFetcher) return busStops; } } diff --git a/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java b/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java index 594082f..43f8f99 100644 --- a/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java +++ b/src/it/reyboz/bustorino/backend/GTTStopsFetcher.java @@ -1,184 +1,185 @@ /* 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 org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.net.URL; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; public class GTTStopsFetcher implements StopsFinderByName { @Override @NonNull - public List FindByName(String name, AtomicReference res) { + public List FindByName(String name, StopsDBInterface db, AtomicReference res) { URL url; // sorting an ArrayList should be faster than a LinkedList and the API is limited to 15 results List s = new ArrayList<>(15); List s2 = new ArrayList<>(15); String fullname; String content; String bacino; String localita; Route.Type type; JSONArray json; int howManyStops, i; JSONObject thisstop; if(name.length() < 3) { res.set(result.QUERY_TOO_SHORT); return s; } try { url = new URL("http://www.gtt.to.it/cms/components/com_gtt/views/palinejson/view.html.php?term=" + URLEncoder.encode(name, "utf-8")); } catch (Exception e) { res.set(result.PARSER_ERROR); return s; } content = networkTools.queryURL(url, res); if(content == null) { return s; } try { json = new JSONArray(content); } catch(JSONException e) { if(content.contains("[]")) { // when no results are found, server returns a PHP Warning and an empty array. In case they fix the warning, we're looking for the array. res.set(result.EMPTY_RESULT_SET); } else { res.set(result.PARSER_ERROR); } return s; } howManyStops = json.length(); if(howManyStops == 0) { res.set(result.EMPTY_RESULT_SET); return s; } try { for(i = 0; i < howManyStops; i++) { thisstop = json.getJSONObject(i); fullname = thisstop.getString("data"); try { localita = thisstop.getString("localita"); if(localita.equals("[MISSING]")) { localita = null; } } catch(JSONException e) { localita = null; } try { bacino = thisstop.getString("bacino"); } catch (JSONException ignored) { bacino = "U"; } if(fullname.startsWith("Metro ")) { type = Route.Type.METRO; } else if(fullname.length() >= 6 && fullname.startsWith("S00")) { type = Route.Type.RAILWAY; } else if(fullname.startsWith("ST")) { type = Route.Type.RAILWAY; } else { type = FiveTNormalizer.decodeType("", bacino); } - s.add(new Stop(fullname, thisstop.getString("value"), localita, type)); + String ID = thisstop.getString("value"); + s.add(new Stop(fullname, ID, localita, type, db.getRoutesByStop(ID))); } } catch (JSONException e) { res.set(result.PARSER_ERROR); return s; } if(s.size() < 1) { // shouldn't happen but prevents the next part from catching fire res.set(result.EMPTY_RESULT_SET); return s; } Collections.sort(s); // the next loop won't work with less than 2 items if(s.size() < 2) { res.set(result.OK); return s; } /* There are some duplicate stops returned by this API. * Long distance buses have stop IDs with 5 digits. Always. They are zero-padded if there * aren't enough. E.g. stop 631 becomes 00631. * * Unfortunately you can't use padded stops to query any API. * Fortunately, unpadded stops return both normal and long distance bus timetables. * FiveTNormalizer is already removing padding (there may be some padded stops for which the * API doesn't return an unpadded equivalent), here we'll remove duplicates by skipping * padded stops, which also never have a location. * * I had to draw a finite state machine on a piece of paper to understand how to implement * this loop. */ for(i = 1; i < howManyStops; ) { Stop current = s.get(i); Stop previous = s.get(i-1); // same stop: let's see which one to keep... if(current.ID.equals(previous.ID)) { if(previous.location == null) { // previous one is useless: discard it, increment i++; } else if(current.location == null) { // this one is useless: add previous and skip one s2.add(previous); i += 2; } else { // they aren't really identical: to err on the side of caution, keep them both. s2.add(previous); i++; } } else { // different: add previous, increment s2.add(previous); i++; } } // unless the last one was garbage (i would be howManyStops+1 in that case), add it if(i == howManyStops) { s2.add(s.get(i-1)); } res.set(result.OK); return s2; } } diff --git a/src/it/reyboz/bustorino/backend/Route.java b/src/it/reyboz/bustorino/backend/Route.java index 8289cd8..ab62767 100644 --- a/src/it/reyboz/bustorino/backend/Route.java +++ b/src/it/reyboz/bustorino/backend/Route.java @@ -1,101 +1,111 @@ /* 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 java.util.List; public class Route implements Comparable { public final String name; public final String destinazione; public final List passaggi; public final Type type; public enum Type { // "long distance" sono gli extraurbani. BUS, LONG_DISTANCE_BUS, METRO, RAILWAY, TRAM } /** * Constructor. * * @param name route ID * @param destinazione terminus\end of line * @param type bus, long distance bus, underground, and so on * @param passaggi timetable, a good choice is an ArrayList of size 6 * @see Palina Palina.addRoute() method */ public Route(String name, String destinazione, Type type, List passaggi) { this.name = name; this.destinazione = destinazione; this.passaggi = passaggi; this.type = type; } /** * Exactly what it says on the tin. * * @return times from the timetable */ public List getPassaggi() { return this.passaggi; } /** * 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)); } @Override public int compareTo(@NonNull Route other) { int res; - int thisAsInt = networkTools.failsafeParseInt(this.name); - int otherAsInt = networkTools.failsafeParseInt(other.name); + int thisAsInt, otherAsInt; + + // sorting by numbers alone yields a far more "natural" result (36N goes before 2024, 95B next to 95, and the like) + + thisAsInt = networkTools.failsafeParseInt(this.name.replaceAll("[^0-9]", "")); + otherAsInt = networkTools.failsafeParseInt(other.name.replaceAll("[^0-9]", "")); + + // compare. // numeric route IDs if(thisAsInt != 0 && otherAsInt != 0) { res = thisAsInt - otherAsInt; if(res != 0) { return res; } } else { // non-numeric res = this.name.compareTo(other.name); if (res != 0) { return res; } } + // try comparing their destination + res = this.destinazione.compareTo(other.destinazione); if(res != 0) { return res; } + // probably useless, but... last attempt. + if(this.type != other.type) { // ordinal() is evil or whatever, who cares. return this.type.ordinal() - other.type.ordinal(); } return 0; } } diff --git a/src/it/reyboz/bustorino/backend/Stop.java b/src/it/reyboz/bustorino/backend/Stop.java index e365117..eba8816 100644 --- a/src/it/reyboz/bustorino/backend/Stop.java +++ b/src/it/reyboz/bustorino/backend/Stop.java @@ -1,63 +1,111 @@ /* 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 java.util.List; + public class Stop implements Comparable { public final @NonNull String ID; public final @NonNull String name; public final @Nullable String location; public final @Nullable Route.Type type; + private @Nullable String routesThatStopHereString = null; + private final @Nullable List routesThatStopHere; + + /** + * Hey, look, method overloading! + */ + public Stop(final @NonNull String name, final @NonNull String ID, @Nullable final String location, @Nullable final Route.Type type, @Nullable final List routesThatStopHere) { + this.ID = ID; + this.name = name; + this.location = (location != null && location.length() == 0) ? null : location; + this.type = type; + this.routesThatStopHere = routesThatStopHere; + } + /** + * Hey, look, method overloading! + */ public Stop(final @NonNull String name, final @NonNull String ID, @Nullable final String location, @Nullable final Route.Type type) { this.ID = ID; this.name = name; this.location = (location != null && location.length() == 0) ? null : location; this.type = type; + this.routesThatStopHere = null; + } + + public @Nullable String routesThatStopHereToString() { + // M E M O I Z A T I O N + if(this.routesThatStopHereString != null) { + return this.routesThatStopHereString; + } + + // no string yet? build it! + return buildString(); + } + private @Nullable String buildString() { + // no routes => no string + if(this.routesThatStopHere == null || this.routesThatStopHere.size() == 0) { + return null; + } + + StringBuilder sb = new StringBuilder(); + int i, lenMinusOne = routesThatStopHere.size() - 1; + + for (i = 0; i < lenMinusOne; i++) { + sb.append(routesThatStopHere.get(i)).append(", "); + } + + // last one: + sb.append(routesThatStopHere.get(i)); + + this.routesThatStopHereString = sb.toString(); + + return this.routesThatStopHereString; } @Override public int compareTo(@NonNull Stop other) { int res; int thisAsInt = networkTools.failsafeParseInt(this.ID); int otherAsInt = networkTools.failsafeParseInt(other.ID); // numeric stop IDs if(thisAsInt != 0 && otherAsInt != 0) { return thisAsInt - otherAsInt; } else { // non-numeric res = this.ID.compareTo(other.ID); if (res != 0) { return res; } } // try with name, then res = this.name.compareTo(other.name); // and give up return res; } } diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByName.java b/src/it/reyboz/bustorino/backend/StopsDBInterface.java similarity index 65% copy from src/it/reyboz/bustorino/backend/StopsFinderByName.java copy to src/it/reyboz/bustorino/backend/StopsDBInterface.java index b30a9ed..e59414c 100644 --- a/src/it/reyboz/bustorino/backend/StopsFinderByName.java +++ b/src/it/reyboz/bustorino/backend/StopsDBInterface.java @@ -1,33 +1,35 @@ /* 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; -import java.util.concurrent.atomic.AtomicReference; -public interface StopsFinderByName extends Fetcher { +/** + * No reference to SQLite whatsoever, here. + * Don't get StopsDB inside the backend, use this interface instead. + */ +public interface StopsDBInterface { /** - * Finds stops by name. Don't call this in UI thread! + * 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 name the string to search for - * @return list of stops, in normalized form. - * @see FiveTNormalizer + * @param stopID stop ID + * @return list of routes or null if none */ - List FindByName(String name, AtomicReference res); + List getRoutesByStop(String stopID); } diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByName.java b/src/it/reyboz/bustorino/backend/StopsFinderByName.java index b30a9ed..61f2848 100644 --- a/src/it/reyboz/bustorino/backend/StopsFinderByName.java +++ b/src/it/reyboz/bustorino/backend/StopsFinderByName.java @@ -1,33 +1,33 @@ /* 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; import java.util.concurrent.atomic.AtomicReference; public interface StopsFinderByName extends Fetcher { /** * Finds stops by name. Don't call this in UI thread! * * @param name the string to search for * @return list of stops, in normalized form. * @see FiveTNormalizer */ - List FindByName(String name, AtomicReference res); + List FindByName(String name, StopsDBInterface db, AtomicReference res); } diff --git a/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java b/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java index 3b7b2bc..2648f31 100644 --- a/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java +++ b/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java @@ -1,59 +1,73 @@ /* 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.os.AsyncTask; import android.support.annotation.NonNull; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import it.reyboz.bustorino.backend.ArrivalsFetcher; import it.reyboz.bustorino.backend.Fetcher; import it.reyboz.bustorino.backend.Palina; import it.reyboz.bustorino.backend.Stop; +import it.reyboz.bustorino.backend.StopsDBInterface; import it.reyboz.bustorino.backend.StopsFinderByName; public class AsyncStopsFinderByName extends AsyncTask> { private final StopsFinderByName sf; private AtomicReference result; + private final StopsDB db; private final String query; private final AsyncStopsFinderByNameCallback callback; - public AsyncStopsFinderByName(@NonNull StopsFinderByName sf, @NonNull String query, @NonNull AsyncStopsFinderByNameCallback callback) { + /** + * Run a StopsFinderByName in a background thread + * + * @param sf some concrete implementation of StopsFinderByName + * @param query the string to search for + * @param callback callback (you don't say) + * @param sdb StopsDB + */ + public AsyncStopsFinderByName(@NonNull StopsFinderByName sf, @NonNull String query, @NonNull AsyncStopsFinderByNameCallback callback, @NonNull StopsDB sdb) { this.sf = sf; this.query = query; this.callback = callback; this.result = new AtomicReference<>(); + this.db = sdb; } @Override protected List doInBackground(Void... useless) { - return sf.FindByName(this.query, this.result); + this.db.openIfNeeded(); + List ret = sf.FindByName(this.query, this.db, this.result); + this.db.closeIfNeeded(); + return ret; } @Override protected void onPostExecute(List stops) { - if(!this.isCancelled()) { // is this really needed? + if(!this.isCancelled()) { this.callback.call(stops, result.get(), this.query); } } public interface AsyncStopsFinderByNameCallback { void call(List stops, Fetcher.result res, String query); } } \ No newline at end of file diff --git a/src/it/reyboz/bustorino/middleware/StopAdapter.java b/src/it/reyboz/bustorino/middleware/StopAdapter.java index dcc60f1..4213d6f 100644 --- a/src/it/reyboz/bustorino/middleware/StopAdapter.java +++ b/src/it/reyboz/bustorino/middleware/StopAdapter.java @@ -1,123 +1,114 @@ /* 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.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; import java.util.List; import it.reyboz.bustorino.R; import it.reyboz.bustorino.backend.Stop; /** * @see PalinaAdapter */ public class StopAdapter extends ArrayAdapter { private LayoutInflater li; private static int row_layout = R.layout.entry_bus_stop; private static final int busIcon = R.drawable.bus; private static final int trainIcon = R.drawable.subway; private static final int tramIcon = R.drawable.tram; private static final int cityIcon = R.drawable.city; static class ViewHolder { TextView busStopIDTextView; TextView busStopNameTextView; - TextView busLineVehicleIcon; + //TextView busLineVehicleIcon; TextView busStopLinesTextView; TextView busStopLocaLityTextView; } public StopAdapter(Context context, List stops) { super(context, row_layout, stops); li = LayoutInflater.from(context); } @Override public View getView(int position, View convertView, ViewGroup parent) { ViewHolder vh; if(convertView == null) { convertView = li.inflate(row_layout, null); vh = new ViewHolder(); vh.busStopIDTextView = (TextView) convertView.findViewById(R.id.busStopID); vh.busStopNameTextView = (TextView) convertView.findViewById(R.id.busStopName); vh.busStopLinesTextView = (TextView) convertView.findViewById(R.id.routesThatStopHere); vh.busStopLocaLityTextView = (TextView) convertView.findViewById(R.id.busStopLocality); convertView.setTag(vh); } else { vh = (ViewHolder) convertView.getTag(); } Stop stop = getItem(position); vh.busStopIDTextView.setText(stop.ID); // NOTE: intentionally ignoring stop username: if it's in the favorites, why are you searching for it? vh.busStopNameTextView.setText(stop.name); -// TODO: implement this -// TextView busStopLinesTextView = (TextView) convertView.findViewById(R.id.routeTimetable); -// if(busStop.getBusLines() != null) { -// String busLines = ""; -// for(BusLine busLine: busStop.getBusLines()) { -// if(busLines.length() > 0) { -// busLines += ", "; -// } -// busLines += busLine.getBusLineName(); -// } - vh.busStopLinesTextView.setText("TEST TEST TEST"); -// } else { -// busStopLinesTextView.setVisibility(View.GONE); -// busLineVehicleIcon.setVisibility(View.INVISIBLE); -// } + String whatStopsHere = stop.routesThatStopHereToString(); + if(whatStopsHere == null) { + vh.busStopLinesTextView.setVisibility(View.GONE); + } else { + vh.busStopLinesTextView.setText(whatStopsHere); + } if(stop.type == null) { vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0); } else { switch(stop.type) { case BUS: default: vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0); break; case METRO: case RAILWAY: vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0); break; case TRAM: vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0); break; case LONG_DISTANCE_BUS: // è l'opposto della città ma va beh, dettagli. vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(cityIcon, 0, 0, 0); } } if (stop.location == null) { vh.busStopLocaLityTextView.setVisibility(View.GONE); } else { vh.busStopLocaLityTextView.setText(stop.location); } return convertView; } } diff --git a/src/it/reyboz/bustorino/middleware/StopsDB.java b/src/it/reyboz/bustorino/middleware/StopsDB.java new file mode 100644 index 0000000..aa041aa --- /dev/null +++ b/src/it/reyboz/bustorino/middleware/StopsDB.java @@ -0,0 +1,171 @@ +/* + 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.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 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(); + } + + private void createDb() { + try { + this.getReadableDatabase(); + copyTables(); + } catch (IOException ignored) {} + } + + private void copyTables() throws IOException { + InputStream is = c.getAssets().open(DB_NAME); + OutputStream os = new FileOutputStream(this.PATH.concat(DB_NAME)); + + byte[] buffer = new byte[1024]; + int length; + while ((length = is.read(buffer)) > 0) { + os.write(buffer, 0, length); + } + + os.flush(); + os.close(); + is.close(); + } + + /** + * 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); + } 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?) + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + // TODO: implement + } + + @Override + public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { + // TODO: implement + } + + @Override + public List getRoutesByStop(String stopID) { + String[] uselessArray = {stopID}; + int count; + + Cursor result = db.rawQuery("SELECT route FROM routemap WHERE stop = ?", uselessArray); + + 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; + } +}