diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java index d233a79..989bfe5 100644 --- a/src/it/reyboz/bustorino/ActivityMain.java +++ b/src/it/reyboz/bustorino/ActivityMain.java @@ -1,779 +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.FiveTScraperFetcher; +import it.reyboz.bustorino.backend.FiveTStopsFetcher; import it.reyboz.bustorino.backend.GTTJSONFetcher; import it.reyboz.bustorino.backend.Palina; +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.adapters.AdapterBusStops; 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; public class ActivityMain extends AppCompatActivity { - public class RecursionHelper { + 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; } } + private boolean isConnected() { + ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo networkInfo = connMgr.getActiveNetworkInfo(); + return networkInfo != null && networkInfo.isConnected(); + } + /* * 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"; /** * Last successfully searched bus stop ID */ private String lastSuccessfullySearchedBusStopID = null; - AsyncWgetBusStopSuggestions asyncWgetBusStopSuggestions; - /* // 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 the stuff 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 everything the Java way. */ private ArrivalsFetcher[] ArrivalFetchers = {new GTTJSONFetcher(), new FiveTScraperFetcher()}; private RecursionHelper ArrivalFetchersRecursionHelper = new RecursionHelper(); + private StopsFinderByName[] StopsFindersByName = {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); 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) { // TODO: do we need toggleSpinner(true) here? 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); + 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 (NEEDS REFACTORING) //////////////////////////////// + ///////////////////////////////// STOPS FINDER BY NAME ///////////////////////////////////////// /** - * It's pure magic <3 - * - * @param query Part of the busStopName + * See the other asyncWget method for documentation\comments. */ - private void asyncWgetBusStopSuggestions(String query) { - if (query == null || query.length() == 0) { + private void asyncWgetBusStopSuggestions(String query, boolean reset) { + toggleSpinner(true); // TODO: remove whatever else is starting the spinner before this + + 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 (!NetworkTools.isConnected(getApplicationContext())) { - NetworkTools.showNetworkError(getApplicationContext()); + + // TODO: implement offline search (it's possibile.) +// if (!NetworkTools.isConnected(getApplicationContext())) { +// NetworkTools.showNetworkError(getApplicationContext()); +// toggleSpinner(false); +// return; +// } + + + if(StopsFindersByNameRecursionHelper.getPos() >= ArrivalFetchers.length) { + // TODO: error message (tryed every fetcher and failed) + StopsFindersByNameRecursionHelper.reset(); toggleSpinner(false); return; } - if (asyncWgetBusStopSuggestions != null) { - asyncWgetBusStopSuggestions.cancel(true); - asyncWgetBusStopSuggestions = null; + + if(StopsFindersByNameRecursionHelper.RunningInstance != null) { + StopsFindersByNameRecursionHelper.RunningInstance.cancel(true); } - try { - asyncWgetBusStopSuggestions = new AsyncWgetBusStopSuggestions(query) { - public void onReceivedBusStopNames(BusStop[] busStops, int status) { - toggleSpinner(false); - - switch (status) { - case AsyncWgetBusStopSuggestions.ERROR_EMPTY_DOM: - case AsyncWgetBusStopSuggestions.ERROR_DOM: - Toast.makeText(getApplicationContext(), - R.string.parsing_error, Toast.LENGTH_SHORT).show(); - break; - - case AsyncWgetBusStopSuggestions.ERROR_NONE: - if (busStops.length == 0) { - Toast.makeText(getApplicationContext(), - R.string.no_bus_stop_have_this_name, Toast.LENGTH_SHORT).show(); - } else { - for (BusStop busStop : busStops) { - MyDB.DBBusStop.addBusStop(db, busStop); - } - populateBusStopsLayout(busStops); - } - break; + + StopsFindersByNameRecursionHelper.RunningInstance = new AsyncStopsFinderByName(StopsFindersByName[StopsFindersByNameRecursionHelper.getPos()], query, new AsyncStopsFinderByNameCallbackImplementation()).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: // TODO: better error message for this case + if(isConnected()) { + Toast.makeText(getApplicationContext(), + R.string.parsing_error, Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getApplicationContext(), + R.string.network_error, Toast.LENGTH_SHORT).show(); } - } - }; - } catch (UnsupportedEncodingException e) { - Toast.makeText(getApplicationContext(), - R.string.encoding_error, 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_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. + } + ArrivalFetchersRecursionHelper.increment(); + asyncWgetBusStopFromBusStopID(query, false); } } - private void populateBusStopsLayout(BusStop[] busStops) { - busStopNameTextView.setVisibility(View.GONE); - + private void populateBusStopsLayout(List busStops) { hideKeyboard(); + busStopNameTextView.setVisibility(View.GONE); + prepareGUIForBusStops(); - resultsListView.setAdapter(new AdapterBusStops(this, R.layout.entry_bus_stop, busStops)); + 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 */ - BusStop busStop = (BusStop) parent.getItemAtPosition(position); + Stop busStop = (Stop) parent.getItemAtPosition(position); - Intent intent = new Intent(ActivityMain.this, - ActivityMain.class); + Intent intent = new Intent(ActivityMain.this, ActivityMain.class); Bundle b = new Bundle(); - b.putString("bus-stop-ID", busStop.getBusStopID()); + 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) { Toast.makeText(getApplicationContext(), R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show(); toggleSpinner(false); return; } - // TODO: remove this once we're sure fetchers can handle this case - if (!NetworkTools.isConnected(getApplicationContext())) { - NetworkTools.showNetworkError(getApplicationContext()); - 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: - if (!NetworkTools.isConnected(getApplicationContext())) { - NetworkTools.showNetworkError(getApplicationContext()); - } + Toast.makeText(getApplicationContext(), + R.string.network_error, Toast.LENGTH_SHORT).show(); break; // goto recursion case SERVER_ERROR: // TODO: better error message for this case + if(isConnected()) { + 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 EMPTY_RESULT_SET: Toast.makeText(getApplicationContext(), R.string.no_passages, Toast.LENGTH_SHORT).show(); break; // goto recursion case OK: lastSuccessfullySearchedBusStopID = stopID; hideKeyboard(); //MyDB.DBBusStop.addBusStop(db, busStop); // TODO: determine why this was needed populateBusLinesLayout(p, stopID); toggleSpinner(false); // recursion terminated, remove spinner return; // RETURN. } // TODO: what do we do if a fetcher says no such stop/route exists? try next fetcher or give up? // indirect recursion through a callback. ...yeha. ArrivalFetchersRecursionHelper.increment(); asyncWgetBusStopFromBusStopID(stopID, false); } } private void populateBusLinesLayout(Palina p, String stopID) { /* TODO: determine if there was a reason to store everything in the database, other than * showing the last timetable when "resuming" the app (which wasn't currently done, I think * it just fetches new timetables every time) */ //BusStop dbBusStop = MyDB.DBBusStop.getBusStop(db, busStop.getBusStopID()); // 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)); // TODO: do something useful on click (e.g. refresh timetables and show only that route) /*resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { *//* * Casting because of Javamerda * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener *//* BusLine busLine = (BusLine) parent.getItemAtPosition(position); Log.i("ActivityMain", "Tapped busLine " + busLine.toString()); } });*/ } ///////////////////////////////// OTHER STUFF ////////////////////////////////////////////////// // TODO: 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/NetworkTools.java b/src/it/reyboz/bustorino/NetworkTools.java deleted file mode 100644 index b2b351c..0000000 --- a/src/it/reyboz/bustorino/NetworkTools.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - 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.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.widget.Toast; - -import it.reyboz.bustorino.R; - -public class NetworkTools { - - // Check network connection - public static boolean isConnected(Context c) { - ConnectivityManager connMgr = (ConnectivityManager) c - .getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo networkInfo = connMgr.getActiveNetworkInfo(); - return networkInfo != null && networkInfo.isConnected(); - } - - // «Turn on WiFi!» - public static void showNetworkError(Context c) { - Toast.makeText(c, R.string.network_error, Toast.LENGTH_SHORT).show(); - } -} \ No newline at end of file diff --git a/src/it/reyboz/bustorino/backend/Fetcher.java b/src/it/reyboz/bustorino/backend/Fetcher.java index 4ba084b..15b8623 100644 --- a/src/it/reyboz/bustorino/backend/Fetcher.java +++ b/src/it/reyboz/bustorino/backend/Fetcher.java @@ -1,40 +1,34 @@ /* 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; public interface Fetcher { /** * Status codes.
*
* OK: got a response, parsed correctly, obtained some data
* CLIENT_OFFLINE: can't connect to the internet
* SERVER_ERROR: the server replied anything other than HTTP 200, basically
* PARSER_ERROR: the server replied something that can't be parsed, probably it's not the data we're looking for (e.g. "PHP: Fatal Error")
- * EMPTY_RESULT_SET: the response is valid and indicates there are no stops\routes\"passaggi"
+ * EMPTY_RESULT_SET: the response is valid and indicates there are no stops\routes\"passaggi"\results for your query
*/ enum result { OK, CLIENT_OFFLINE, SERVER_ERROR, PARSER_ERROR, EMPTY_RESULT_SET } - - // moved to AsyncFetcher since shouldn't be reused on different runs - /* - * Reading this before doing anything is a bad idea, probably. - */ - //AtomicInteger result = new AtomicInteger(resultCodes.NULL.ordinal()); // how does this even work in an interface is a mystery to me. } diff --git a/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java b/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java index 5045412..91361e8 100644 --- a/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java +++ b/src/it/reyboz/bustorino/backend/FiveTScraperFetcher.java @@ -1,231 +1,182 @@ /* 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.backend; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; //import android.util.Log; /** * Contains large chunks of code taken from the old GTTSiteSucker, AsyncWget and AsyncWgetBusStopFromBusStopID classes.
*
* «BusTO, because sucking happens»
*
* @author Valerio Bozzolan */ -public class FiveTScraperFetcher extends FiveTNormalizer implements ArrivalsFetcher { +public class FiveTScraperFetcher implements ArrivalsFetcher { /** * Execute regexes. * * @param needle Regex * @param haystack Entire string * @return Matched string */ public static String grep(String needle, String haystack) { String matched = null; Matcher matcher = Pattern.compile( needle).matcher(haystack); if (matcher.find()) { matched = matcher.group(1); } return matched; } - /** - * Javammerda! Lasciami null senza suicidarti! - */ - public static Integer string2Integer(String str) { - try { - return Integer.parseInt(str); - } catch(NumberFormatException e) { - return null; - } - } - - private String getDOM(final String routeID, final AtomicReference res) { - //Log.d("asyncwget", "Catching URL in background: " + uri[0]); - HttpURLConnection urlConnection; - StringBuilder result = null; - try { - URL url = new URL("http://www.5t.torino.it/5t/trasporto/arrival-times-byline.jsp?action=getTransitsByLine&shortName=" + routeID); - urlConnection = (HttpURLConnection) url.openConnection(); - } catch(IOException e) { - res.set(Fetcher.result.CLIENT_OFFLINE); - return null; - } - - try { - InputStream in = new BufferedInputStream( - urlConnection.getInputStream()); - BufferedReader reader = new BufferedReader( - new InputStreamReader(in)); - result = new StringBuilder(); - String line; - while ((line = reader.readLine()) != null) { - result.append(line); - } - } catch (Exception e) { - //Log.e("asyncwget", e.getMessage()); - } finally { - if (urlConnection != null) { - urlConnection.disconnect(); - } - } - - if (result == null) { - res.set(Fetcher.result.PARSER_ERROR); - return null; - } - - res.set(Fetcher.result.SERVER_ERROR); // will be set to "OK" later, this is a safety net in case StringBuilder returns null, the website returns an HTTP 204 or something like that. - return result.toString(); - } - @Override public Palina ReadArrivalTimesAll(final String routeID, final AtomicReference res) { Palina p = new Palina(); int routeIndex; - String responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas = getDOM(routeID, res); + String responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas = null; + try { + responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas = networkTools.getDOM(new URL("http://www.5t.torino.it/5t/trasporto/arrival-times-byline.jsp?action=getTransitsByLine&shortName=" + routeID), res); + } catch (MalformedURLException e) { + res.set(result.PARSER_ERROR); + } if(responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas == null) { + // result already set in getDOM() return p; } Document doc = Jsoup.parse(responseInDOMFormatBecause5THaveAbsolutelyNoIdeaWhatJSONWas); Element span = doc.select("span").first(); String busStopID = grep("^(.+) ", span.html()); if (busStopID == null) { //Log.e("BusStop", "Empty busStopID from " + span.html()); res.set(result.EMPTY_RESULT_SET); return p; } // this also appears when no stops are found, but that case has already been handled above Element error = doc.select("p.errore").first(); if (error != null) { res.set(result.SERVER_ERROR); return p; } String busStopName = grep("^.+ (.+)", span.html()); // The first "dot" is the single strange space character in the middle of "39{HERE→} {←HERE}PORTA NUOVA" if (busStopName == null) { //Log.e("BusStop", "Empty busStopName from " + span.html()); res.set(result.SERVER_ERROR); return p; } p.setStopName(busStopName.trim()); // Every table row is a busLine Elements trs = doc.select("table tr"); for (Element tr : trs) { Element line = tr.select("td.line a").first(); if (!line.hasText()) { res.set(result.SERVER_ERROR); return p; } String busLineName = line.text(); // this is yet another ID, that has no known use so we can safely ignore it // Integer busLineID = string2Integer( // grep( // "([0-9]+)$", // line.attr("href") // ) // ); if (busLineName == null) { res.set(result.SERVER_ERROR); return p; } if(busLineName.equals("METRO")) { routeIndex = p.addRoute(busLineName, "", Route.Type.METRO); } else { routeIndex = p.addRoute(busLineName, "", Route.Type.BUS); } // Every busLine have passages Elements tds = tr.select("td:not(.line)"); for (Element td : tds) { //boolean isInRealTime = td.select("i").size() > 0; //td.select("i").remove(); // Stripping "*" String time = td.text().trim(); if (time.equals("")) { // Yes... Sometimes there is an EMPTY td ._. continue; } p.addPassaggio(time, routeIndex); } } res.set(result.OK); return p; } // preserved for future generations: // /* // * I've sent many emails to the public email info@5t.torino.it to write down something like: // * «YOUR SITE EXPLODE IF I USE **YOUR** BUS LINE IDs STARTING WITH ZERO!!!!!» // * So, waiting for a response, I must purge the busStopID from "0"s .__. // * IN YOUR FACE 5T/GTT. IN YOUR FACE. // * // * @param busStopID // * @return parseInt(busStopID) // * @antifeatured yep // * @notabug yep // * @wontfix yep // */ // protected final String getFilteredBusStopID(String busStopID) { // /* // * OK leds me ezplain why 'm dong this shot of shittt. OK zo swhy? // * Bhumm thads because the GTT/5T site-"developer" ids obviusli drunk. // */ // String enableGTTDeveloperSimulator = "on"; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // final char ZZZZZZZEEEEROOOOOO = '0'; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // char[] cinquettiBarraGtt = busStopID.toCharArray(); // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // int merda = 0; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // while (merda < cinquettiBarraGtt.length && cinquettiBarraGtt[merda] == ZZZZZZZEEEEROOOOOO) { // // COMPLETELELELLELEEELY DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // Log.i("AsyncWgetBusStop", "scimmie ubriache assunte per tirar su il sito 5T/GTT"); // DR // merda++; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // } // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // String trenoDiMerda = ""; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // for (; merda < cinquettiBarraGtt.length; merda++) { // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // trenoDiMerda += cinquettiBarraGtt[merda]; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // } // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // enableGTTDeveloperSimulator = "off"; // DRUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUNK // // return trenoDiMerda; // } } diff --git a/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java b/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java new file mode 100644 index 0000000..0f23209 --- /dev/null +++ b/src/it/reyboz/bustorino/backend/FiveTStopsFetcher.java @@ -0,0 +1,105 @@ +/* + 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.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) { + ArrayList busStops = new ArrayList<>(); + String stopID; + String stopName; + String stopLocation; + //Stop busStop; + + 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)); + } + + if(busStops.size() == 0) { + res.set(result.EMPTY_RESULT_SET); + } else { + res.set(result.OK); + } + + return busStops; + } +} diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByName.java b/src/it/reyboz/bustorino/backend/Stop.java similarity index 61% copy from src/it/reyboz/bustorino/backend/StopsFinderByName.java copy to src/it/reyboz/bustorino/backend/Stop.java index 32661f8..16481dd 100644 --- a/src/it/reyboz/bustorino/backend/StopsFinderByName.java +++ b/src/it/reyboz/bustorino/backend/Stop.java @@ -1,32 +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; - -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); +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; + +public class Stop { + public final @NonNull String ID; + public final @NonNull String name; + public final @Nullable String location; + + public Stop(final @NonNull String name, final @NonNull String ID, @Nullable final String location) { + this.ID = ID; + this.name = name; + this.location = (location != null && location.length() == 0) ? null : location; + } } diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByName.java b/src/it/reyboz/bustorino/backend/StopsFinderByName.java index 32661f8..b30a9ed 100644 --- a/src/it/reyboz/bustorino/backend/StopsFinderByName.java +++ b/src/it/reyboz/bustorino/backend/StopsFinderByName.java @@ -1,32 +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); + List FindByName(String name, AtomicReference res); } diff --git a/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java b/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java index 7fc5176..da2ead6 100644 --- a/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java +++ b/src/it/reyboz/bustorino/backend/StopsFinderByRoute.java @@ -1,32 +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 StopsFinderByRoute extends Fetcher { /** * Finds every stop in a route. Don't call this in UI thread! * * @param routeID route ID, in normalized form. * @return list of stops, in normalized form. * @see FiveTNormalizer */ - List FindByRoute(String routeID); + List FindByRoute(String routeID, AtomicReference res); } \ No newline at end of file diff --git a/src/it/reyboz/bustorino/backend/networkTools.java b/src/it/reyboz/bustorino/backend/networkTools.java new file mode 100644 index 0000000..8c9c169 --- /dev/null +++ b/src/it/reyboz/bustorino/backend/networkTools.java @@ -0,0 +1,68 @@ +/* + 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.backend; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.concurrent.atomic.AtomicReference; + +public abstract class networkTools { + static String getDOM(final URL url, final AtomicReference res) { + //Log.d("asyncwget", "Catching URL in background: " + uri[0]); + HttpURLConnection urlConnection; + StringBuilder result = null; + try { + urlConnection = (HttpURLConnection) url.openConnection(); + } catch(IOException e) { + res.set(Fetcher.result.CLIENT_OFFLINE); + return null; + } + + try { + InputStream in = new BufferedInputStream( + urlConnection.getInputStream()); + BufferedReader reader = new BufferedReader( + new InputStreamReader(in)); + result = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + result.append(line); + } + } catch (Exception e) { + //Log.e("asyncwget", e.getMessage()); + } finally { + if (urlConnection != null) { + urlConnection.disconnect(); + } + } + + if (result == null) { + res.set(Fetcher.result.PARSER_ERROR); + return null; + } + + res.set(Fetcher.result.SERVER_ERROR); // will be set to "OK" later, this is a safety net in case StringBuilder returns null, the website returns an HTTP 204 or something like that. + return result.toString(); + } +} diff --git a/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java b/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java new file mode 100644 index 0000000..3b7b2bc --- /dev/null +++ b/src/it/reyboz/bustorino/middleware/AsyncStopsFinderByName.java @@ -0,0 +1,59 @@ +/* + 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.StopsFinderByName; + +public class AsyncStopsFinderByName extends AsyncTask> { + private final StopsFinderByName sf; + private AtomicReference result; + private final String query; + private final AsyncStopsFinderByNameCallback callback; + + public AsyncStopsFinderByName(@NonNull StopsFinderByName sf, @NonNull String query, @NonNull AsyncStopsFinderByNameCallback callback) { + this.sf = sf; + this.query = query; + this.callback = callback; + this.result = new AtomicReference<>(); + } + + @Override protected List doInBackground(Void... useless) { + return sf.FindByName(this.query, this.result); + } + + @Override protected void onPostExecute(List stops) { + if(!this.isCancelled()) { // is this really needed? + 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/PalinaAdapter.java b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java index 2e998f3..681a614 100644 --- a/src/it/reyboz/bustorino/middleware/PalinaAdapter.java +++ b/src/it/reyboz/bustorino/middleware/PalinaAdapter.java @@ -1,138 +1,142 @@ /* 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.util.TypedValue; 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.Palina; import it.reyboz.bustorino.backend.Passaggio; import it.reyboz.bustorino.backend.Route; /** * This once was a ListView Adapter for BusLine[]. * * Thanks to Framentos developers for the guide: * http://www.framentos.com/en/android-tutorial/2012/07/16/listview-in-android-using-custom-listadapter-and-viewcache/# * * @author Valerio Bozzolan * @author Ludovico Pavesi */ public class PalinaAdapter extends ArrayAdapter { private LayoutInflater li; private static int row_layout = R.layout.entry_bus_line_passage; private static final int metroBg = R.drawable.route_background_metro; private static final int extraurbanoBg = R.drawable.route_background_bus_long_distance; 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; // hey look, a pattern! static class ViewHolder { TextView rowStopIcon; TextView rowRouteDestination; TextView rowRouteTimetable; } public PalinaAdapter(Context context, Palina p) { // TODO: find a more efficient way if there's one super(context, row_layout, p.queryAllRoutes()); li = LayoutInflater.from(context); } /** * Some parts taken from the AdapterBusLines class.
* Some parts inspired by these enlightening tutorials:
* http://www.simplesoft.it/android/guida-agli-adapter-e-le-listview-in-android.html
* https://www.codeofaninja.com/2013/09/android-viewholder-pattern-example.html
* And some other bits and bobs TIRATI FUORI DAL NULLA CON L'INTUIZIONE INTELLETTUALE PERCHÉ * SEMBRA CHE NESSUNO ABBIA LA MINIMA IDEA DI COME FUNZIONA UN ADAPTER SU ANDROID. */ @Override public View getView(int position, View convertView, ViewGroup parent) { ViewHolder vh; // TODO: determine why this is called twice with null and twice with a convertView, to display 2 rows. if(convertView == null) { // INFLATE! // setting a parent here is not supported and causes a fatal exception, apparently. convertView = li.inflate(row_layout, null); // STORE TEXTVIEWS! vh = new ViewHolder(); vh.rowStopIcon = (TextView) convertView.findViewById(R.id.routeID); vh.rowRouteDestination = (TextView) convertView.findViewById(R.id.routeDestination); vh.rowRouteTimetable = (TextView) convertView.findViewById(R.id.routeTimetable); // STORE VIEWHOLDER IN\ON\OVER\UNDER\ABOVE\BESIDE THE VIEW! convertView.setTag(vh); } else { // RECOVER THIS STUFF! vh = (ViewHolder) convertView.getTag(); } Route route = getItem(position); vh.rowStopIcon.setText(route.name); - vh.rowRouteDestination.setText(route.destinazione); + if(route.destinazione.length() == 0) { + vh.rowRouteDestination.setVisibility(View.GONE); + } else { + vh.rowRouteDestination.setText(route.destinazione); + } switch (route.type) { case BUS: default: vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0); break; case LONG_DISTANCE_BUS: vh.rowStopIcon.setBackgroundResource(extraurbanoBg); vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0); break; case METRO: vh.rowStopIcon.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); vh.rowStopIcon.setBackgroundResource(metroBg); vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0); break; case RAILWAY: vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0); break; case TRAM: // never used but whatever. vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0); break; } List passaggi = route.passaggi; if(passaggi.size() == 0) { vh.rowRouteTimetable.setText(R.string.no_passages); } else { String resultString = ""; for(Passaggio passaggio : passaggi) { // "+" calls concat() and some other stuff internally, this should be faster resultString = resultString.concat(passaggio.toString()).concat(" "); } vh.rowRouteTimetable.setText(resultString); } return convertView; } } diff --git a/src/it/reyboz/bustorino/middleware/StopAdapter.java b/src/it/reyboz/bustorino/middleware/StopAdapter.java new file mode 100644 index 0000000..5a8bc4b --- /dev/null +++ b/src/it/reyboz/bustorino/middleware/StopAdapter.java @@ -0,0 +1,103 @@ +/* + 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.util.TypedValue; +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.Palina; +import it.reyboz.bustorino.backend.Passaggio; +import it.reyboz.bustorino.backend.Route; +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; + + static class ViewHolder { + TextView busStopIDTextView; + TextView busStopNameTextView; + 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.busLineVehicleIcon = (TextView) convertView.findViewById(R.id.vehicleIcon); + vh.busStopLinesTextView = (TextView) convertView.findViewById(R.id.routeTimetable); + 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); +// } + + if (stop.location == null) { + vh.busStopLocaLityTextView.setVisibility(View.GONE); + } else { + vh.busStopLocaLityTextView.setText(stop.location); + } + + return convertView; + } +}