diff --git a/src/it/reyboz/bustorino/ActivityFavorites.java b/src/it/reyboz/bustorino/ActivityFavorites.java index 874475e..a3a65da 100644 --- a/src/it/reyboz/bustorino/ActivityFavorites.java +++ b/src/it/reyboz/bustorino/ActivityFavorites.java @@ -1,211 +1,211 @@ /* 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 it.reyboz.bustorino.lab.GTTSiteSucker.BusStop; -import it.reyboz.bustorino.lab.MyDB; -import it.reyboz.bustorino.lab.MyDB.DBBusStop; +import it.reyboz.bustorino.middleware.UserDB; +import it.reyboz.bustorino.middleware.UserDB.DBBusStop; import it.reyboz.bustorino.lab.adapters.AdapterBusStops; import android.app.AlertDialog; import android.content.DialogInterface; import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.EditText; import android.widget.ListView; import android.widget.TextView; import android.content.Intent; import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; public class ActivityFavorites extends AppCompatActivity { private ListView favoriteListView; private SQLiteDatabase db; private EditText bus_stop_name; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_favorites); ActionBar ab = getSupportActionBar(); assert ab != null; ab.setIcon(R.drawable.ic_launcher); ab.setDisplayHomeAsUpEnabled(true); // Back button - MyDB mDbHelper = new MyDB(this); + UserDB mDbHelper = new UserDB(this); db = mDbHelper.getWritableDatabase(); favoriteListView = (ListView) findViewById(R.id.favoriteListView); createFavoriteList(); } @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { super.onCreateContextMenu(menu, v, menuInfo); if (v.getId() == R.id.favoriteListView) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.menu_favourites_entry, menu); } } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { // Respond to the action bar's Up/Home button case android.R.id.home: NavUtils.navigateUpFromSameTask(this); return true; } return super.onOptionsItemSelected(item); } @Override public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); BusStop busStop = (BusStop) favoriteListView.getItemAtPosition(info.position); switch (item.getItemId()) { case R.id.action_favourite_entry_delete: busStop.setIsFavorite(false); - MyDB.DBBusStop.addBusStop(db, busStop); + UserDB.DBBusStop.addBusStop(db, busStop); createFavoriteList(); return true; case R.id.action_rename_bus_stop_username: showBusStopUsernameInputDialog(busStop); return true; default: return super.onContextItemSelected(item); } } void createFavoriteList() { - BusStop[] busStops = MyDB.DBBusStop.getFavoriteBusStops(db); + BusStop[] busStops = UserDB.DBBusStop.getFavoriteBusStops(db); // If no data is found show a friendly message if (busStops.length == 0) { favoriteListView.setVisibility(View.INVISIBLE); TextView favoriteTipTextView = (TextView) findViewById(R.id.favoriteTipTextView); assert favoriteTipTextView != null; favoriteTipTextView.setVisibility(View.VISIBLE); } // Show results favoriteListView.setAdapter(new AdapterBusStops(this, R.layout.entry_bus_stop, busStops)); favoriteListView .setOnItemClickListener(new AdapterView.OnItemClickListener() { public void onItemClick(AdapterView parent, View view, int position, long id) { /** * Casting because of Javamerda * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener */ BusStop busStop = (BusStop) parent.getItemAtPosition(position); Intent intent = new Intent(ActivityFavorites.this, ActivityMain.class); Bundle b = new Bundle(); b.putString("bus-stop-ID", busStop.getBusStopID()); intent.putExtras(b); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); Log.d("FavoritesActivity", "Tapped on bus stop: " + busStop.getBusStopID()); startActivity(intent); finish(); } }); registerForContextMenu(favoriteListView); } private class BusStopUsernameOnClickListener implements DialogInterface.OnClickListener { private BusStop busStop; BusStopUsernameOnClickListener(BusStop busStop) { this.busStop = busStop; } @Override public void onClick(DialogInterface dialog, int which) { } } public void showBusStopUsernameInputDialog(BusStop busStop) { AlertDialog.Builder builder = new AlertDialog.Builder(this); LayoutInflater inflater = this.getLayoutInflater(); View renameDialogLayout = inflater.inflate(R.layout.rename_dialog, null); bus_stop_name = (EditText) renameDialogLayout.findViewById(R.id.rename_dialog_bus_stop_name); bus_stop_name.setText(busStop.getBusStopUsername()); bus_stop_name.setHint(busStop.getBusStopName()); builder.setTitle(getString(R.string.dialog_rename_bus_stop_username_title)); builder.setView(renameDialogLayout); builder.setPositiveButton(getString(android.R.string.ok), new BusStopUsernameOnClickListener(busStop) { @Override public void onClick(DialogInterface dialog, int which) { String busStopUsername = bus_stop_name.getText().toString(); if (busStopUsername.length() == 0) { busStopUsername = null; } super.busStop.setBusStopUsername(busStopUsername); - MyDB.DBBusStop.addBusStop(db, super.busStop, DBBusStop.FORCE_NULL_BUSSTOP_USERNAME); + UserDB.DBBusStop.addBusStop(db, super.busStop, DBBusStop.FORCE_NULL_BUSSTOP_USERNAME); createFavoriteList(); } }); builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.cancel(); } }); builder.setNeutralButton(R.string.dialog_rename_bus_stop_username_reset_button, new BusStopUsernameOnClickListener(busStop) { @Override public void onClick(DialogInterface dialog, int which) { super.busStop.setBusStopUsername(null); - MyDB.DBBusStop.addBusStop(db, super.busStop, DBBusStop.FORCE_NULL_BUSSTOP_USERNAME); + UserDB.DBBusStop.addBusStop(db, super.busStop, DBBusStop.FORCE_NULL_BUSSTOP_USERNAME); createFavoriteList(); } }); builder.show(); } } diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java index c9cdd10..0000a3e 100644 --- a/src/it/reyboz/bustorino/ActivityMain.java +++ b/src/it/reyboz/bustorino/ActivityMain.java @@ -1,861 +1,861 @@ /* 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.Bundle; import android.os.Handler; import android.support.annotation.NonNull; import android.support.annotation.Nullable; 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.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.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.MyDB; +import it.reyboz.bustorino.middleware.UserDB; import it.reyboz.bustorino.middleware.AsyncWget; import it.reyboz.bustorino.middleware.PalinaAdapter; import it.reyboz.bustorino.middleware.RecursionHelper; import it.reyboz.bustorino.middleware.StopAdapter; import it.reyboz.bustorino.middleware.StopsDB; public class ActivityMain extends AppCompatActivity { /* * Layout elements */ private EditText busStopSearchByIDEditText; private EditText busStopSearchByNameEditText; private TextView busStopNameTextView; private ProgressBar progressBar; private TextView howDoesItWorkTextView; private Button hideHintButton; private MenuItem actionHelpMenuItem; private SwipeRefreshLayout swipeRefreshLayout; private ListView resultsListView; private FloatingActionButton floatingActionButton; /* * 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 @Nullable Stop lastSuccessfullySearchedBusStop = 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()};*/ private RecursionHelper ArrivalFetchersRecursionHelper = new RecursionHelper<>(new ArrivalsFetcher[] {new GTTJSONFetcher(), new FiveTScraperFetcher()}); private RecursionHelper StopsFindersByNameRecursionHelper = new RecursionHelper<>(new StopsFinderByName[] {new GTTStopsFetcher(), new FiveTStopsFetcher()}); private SQLiteDatabase db; ///////////////////////////////// EVENT HANDLERS /////////////////////////////////////////////// /* * @see swipeRefreshLayout */ private Handler handler = new Handler(); private final Runnable refreshing = new Runnable() { public void run() { if (lastSuccessfullySearchedBusStop == null) { Toast.makeText(getApplicationContext(), R.string.query_too_short, Toast.LENGTH_SHORT).show(); } else { new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); } } }; @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); + UserDB mDbHelper = new UserDB(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); new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); } 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: " + lastSuccessfullySearchedBusStop); if (searchMode == SEARCH_BY_ID && lastSuccessfullySearchedBusStop != null) { setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStop.ID); new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); } } @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(); new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); } else { // searchMode == SEARCH_BY_NAME String query = busStopSearchByNameEditText.getText().toString(); new asyncWgetBusStopSuggestions(query, stopsDB, StopsFindersByNameRecursionHelper); } } /** * 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); new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop); } 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 ///////////////////////////////////////// private class asyncWgetBusStopSuggestions extends AsyncWget { private final String query; private AtomicReference res; private List s; private StopsDB db; public asyncWgetBusStopSuggestions(@Nullable String query, @NonNull StopsDB sdb, @NonNull RecursionHelper r) { super(getApplicationContext(), r); toggleSpinner(true); this.query = query; this.res = new AtomicReference<>(); this.db = sdb; r.reset(); if(query == null || query.length() <= 0) { Toast.makeText(this.c, R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show(); toggleSpinner(false); } else { this.execute(); } } @Override protected boolean tryFetcher(StopsFinderByName f) { // gets opened multiple times, whatever. this.db.openIfNeeded(); this.s = f.FindByName(this.query, this.db, this.res); this.db.closeIfNeeded(); switch (this.res.get()) { case CLIENT_OFFLINE: publishProgress(R.string.network_error); return false; case SERVER_ERROR: if (isConnected()) { publishProgress(R.string.parsing_error); } else { publishProgress(R.string.network_error); } return false; case PARSER_ERROR: default: publishProgress(R.string.internal_error); return false; case QUERY_TOO_SHORT: publishProgress(R.string.query_too_short); return false; case EMPTY_RESULT_SET: publishProgress(R.string.no_bus_stop_have_this_name); return false; case OK: return true; } } @Override protected void onPostExecute(Void useless) { // something really bad happened if(this.isCancelled() || !this.terminated || this.s == null) { toggleSpinner(false); this.onCancelled(); return; } // no results if(this.failedAll) { toggleSpinner(false); // TODO: an error message would be a good idea, here return; } hideKeyboard(); busStopNameTextView.setVisibility(View.GONE); prepareGUIForBusStops(); resultsListView.setAdapter(new StopAdapter(this.c, this.s)); 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); } }); toggleSpinner(false); } @Override protected void onCancelled() { toggleSpinner(false); } } ///////////////////////////////// ARRIVALS FETCHER ///////////////////////////////////////////// private class asyncWgetBusStopFromBusStopID extends AsyncWget { private final String stopID; private AtomicReference res; private Palina p; /** * Begins its life as a copy of lastSuccessfullySearchedBusStop, ends as null if it needs * replacing or stays the same if it stayed the same */ private Stop lastSearchedBusStop; asyncWgetBusStopFromBusStopID(@Nullable String stopID, @NonNull RecursionHelper r, @Nullable Stop lastSearchedBusStop) { super(getApplicationContext(), r); toggleSpinner(true); this.stopID = stopID; this.lastSearchedBusStop = lastSearchedBusStop; this.res = new AtomicReference<>(); if(stopID == null || stopID.length() <= 0) { // we're still in UI thread, no need to mess with Progress Toast.makeText(this.c, R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show(); toggleSpinner(false); } else { this.execute(); } } @Override protected boolean tryFetcher(ArrivalsFetcher f) { this.p = f.ReadArrivalTimesAll(this.stopID, this.res); switch(this.res.get()) { case CLIENT_OFFLINE: publishProgress(R.string.network_error); return false; case SERVER_ERROR: if(isConnected()) { publishProgress(R.string.parsing_error); } else { publishProgress(R.string.network_error); } return false; case QUERY_TOO_SHORT: // should never happen here, but to err on the side of caution... publishProgress(R.string.query_too_short); return false; case PARSER_ERROR: default: // there are no other cases but Android Studio is still complaining... publishProgress(R.string.internal_error); return false; case EMPTY_RESULT_SET: publishProgress(R.string.no_passages); return false; case OK: // WARNING: lots of branches ahead. // did we search for anything? if(this.lastSearchedBusStop != null) { // different stop? if(!this.lastSearchedBusStop.ID.equals(p.ID)) { // remove it, get new name this.lastSearchedBusStop = null; getNameOrGetRekt(); } else { // searched and it's the same String sn = lastSearchedBusStop.getStopName(); if(sn == null) { // something really bad happened, start from scratch this.lastSearchedBusStop = null; getNameOrGetRekt(); } else { // "merge" Stop over Palina and we're good to go this.p.setStopName(sn); } } } else { // not searched yet getNameOrGetRekt(); } return true; } } /** * Run this in a background thread.
* Sets a stop name for this.p, guaranteed not to be null! */ private void getNameOrGetRekt() { String nameMaybe; // TODO: search favorites, get (user)name if set, set what's needed, return // does it already have a name (for fetchers that support it)? nameMaybe = this.p.getStopName(); if(nameMaybe != null && nameMaybe.length() > 0) { return; } // let's try StopsDB StopsDB db = new StopsDB(this.c); db.openIfNeeded(); nameMaybe = db.getNameFromID(this.p.ID); db.closeIfNeeded(); if(nameMaybe != null && nameMaybe.length() > 0) { this.p.setStopName(nameMaybe); return; } // no name to be found anywhere, don't bother searching it next time this.p.setStopName(""); } @Override protected void onPostExecute(Void useless) { // something really bad happened if(this.isCancelled() || !this.terminated || this.p == null) { toggleSpinner(false); this.onCancelled(); return; } // no results if(this.failedAll) { toggleSpinner(false); // TODO: an error message would be a good idea, here return; } hideKeyboard(); if(this.lastSearchedBusStop == null) { // did we gather any new information about this Stop? Then update it (casting from Palina) lastSuccessfullySearchedBusStop = this.p; } String displayName = p.getStopName(); String displayStuff; if (displayName != null && displayName.length() > 0) { displayStuff = p.ID.concat(" - ").concat(displayName); } else { displayStuff = p.ID; } busStopNameTextView.setText(String.format( getString(R.string.passages), displayStuff)); // Shows hints if (getOption(OPTION_SHOW_LEGEND, true)) { showHints(); } //else { // hideHints(); //} prepareGUIForBusLines(); resultsListView.setAdapter(new PalinaAdapter(this.c, p)); resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { String routeName; Route r = (Route) parent.getItemAtPosition(position); routeName = FiveTNormalizer.routeInternalToDisplay(r.name); if (routeName == null) { routeName = r.name; } if (r.destinazione == null || r.destinazione.length() == 0) { Toast.makeText(getApplicationContext(), getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show(); } else { Toast.makeText(getApplicationContext(), getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show(); } } }); toggleSpinner(false); } @Override protected void onCancelled() { toggleSpinner(false); } } ///////////////////////////////// OTHER STUFF ////////////////////////////////////////////////// private boolean isConnected() { ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo networkInfo = connMgr.getActiveNetworkInfo(); return networkInfo != null && networkInfo.isConnected(); } // TODO: try to move these 3 methods to a separate class public void addInFavorites(View v) { // TODO: fix this // if (lastSuccessfullySearchedBusStop != null) { // MyDB.DBBusStop.addBusStop(db, lastSuccessfullySearchedBusStop); // // 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/lab/MyDB.java b/src/it/reyboz/bustorino/middleware/UserDB.java similarity index 98% rename from src/it/reyboz/bustorino/lab/MyDB.java rename to src/it/reyboz/bustorino/middleware/UserDB.java index 165d70b..feb010c 100644 --- a/src/it/reyboz/bustorino/lab/MyDB.java +++ b/src/it/reyboz/bustorino/middleware/UserDB.java @@ -1,441 +1,441 @@ /* 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.lab; +package it.reyboz.bustorino.middleware; import it.reyboz.bustorino.lab.GTTSiteSucker.BusStop; import it.reyboz.bustorino.lab.GTTSiteSucker.BusLine; import android.database.Cursor; import android.database.SQLException; import android.provider.BaseColumns; import android.util.Log; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.content.ContentValues; import android.content.Context; import java.util.ArrayList; /** * Manage SQLite * * @author Valerio Bozzolan */ -public class MyDB extends SQLiteOpenHelper { +public class UserDB extends SQLiteOpenHelper { // If you change the database schema, you must increment the database // version. public static final int DATABASE_VERSION = 8; public static final String DATABASE_NAME = "bustorino.db"; public static final String COMMA = ", "; public static final String DOT = "."; public static final String EQUALS = " = "; public static final String CREATE_TABLE_IF_NOT_EXISTS = "CREATE TABLE IF NOT EXISTS "; public static final String DROP_TABLE = "DROP TABLE IF EXISTS "; public static final String TEXT_TYPE = " TEXT"; public static final String INTEGER_TYPE = " INTEGER"; public static final String REAL_TYPE = " REAL "; public static final String PRIMARY_KEY = " PRIMARY KEY"; public static final String NOT_NULL = " NOT NULL"; public static final String WHERE = " WHERE "; public static final String AND = " AND "; public static final String SELECT = "SELECT "; public static final String FROM = " FROM "; public static final String SELECT_ALL_FROM = "SELECT * FROM "; public static final String ORDER_BY = " ORDER BY "; public static final String ASC = " ASC"; public static final String DESC = " DESC"; public static String getDefault(String i) { return " DEFAULT " + String.valueOf(i); } /** * @deprecated CAUSES CRASHES IN PARAMETRIC QUERIES * @param columnName * @return */ public static String somethingEqualsString(String columnName) { return " " + columnName + "=\"?\""; } public static String somethingEqualsWithoutQuotes(String columnName) { return " " + columnName + "=?"; } - public MyDB(Context context) { + public UserDB(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); } public void onCreate(SQLiteDatabase db) { db.execSQL(DBBusStop.SQL_CREATE_ENTRIES); db.execSQL(DBBusLine.SQL_CREATE_ENTRIES); db.execSQL(DBBusStopServeLine.SQL_CREATE_ENTRIES); } public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { boolean somethingTerribleIsGoingToHappen = false; if(oldVersion == 6 && newVersion == 7) { // Added two tables. It's OK! oldVersion = 7; } if(oldVersion == 7 && newVersion == 8) { /****** TOO MANY CHANGES. SORRY ME! THIS WILL CAUSE THE DROP OF YOUR CURRENT DB! ******/ somethingTerribleIsGoingToHappen = true; } if (oldVersion != DATABASE_VERSION || somethingTerribleIsGoingToHappen){ // Do you hear these cries? :'( db.execSQL(DBBusStop.SQL_DROP_TABLE); db.execSQL(DBBusLine.SQL_DROP_TABLE); db.execSQL(DBBusStopServeLine.SQL_DROP_TABLE); } onCreate(db); } public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { onUpgrade(db, oldVersion, newVersion); } public static boolean rowExists(SQLiteDatabase db, String tableName, String columnName, String columnValue) { Cursor c = db.rawQuery(SELECT_ALL_FROM + tableName + WHERE + somethingEqualsWithoutQuotes(columnName), new String[]{columnValue}); boolean success = c.moveToFirst(); c.close(); return success; } /** * Store bus stops. */ public static abstract class DBBusStop implements BaseColumns { public static final String TABLE_NAME = "busstop"; public static final String COLUMN_NAME_BUSSTOP_ID = "busstop_ID"; public static final String COLUMN_NAME_BUSSTOP_NAME = "busstop_name"; public static final String COLUMN_NAME_BUSSTOP_USERNAME = "busstop_username"; // User manually edit it public static final String COLUMN_NAME_BUSSTOP_LOCALITY = "busstop_locality"; public static final String COLUMN_NAME_BUSSTOP_LATITUDE = "busstop_latitude"; public static final String COLUMN_NAME_BUSSTOP_LONGITUDE = "busstop_longitude"; public static final String COLUMN_NAME_BUSSTOP_ISFAVORITE = "busstop_isfavorite"; public static final String IS_FAVORITE = "1"; public static final String IS_NOT_FAVORITE = "0"; private static final String SQL_CREATE_ENTRIES = CREATE_TABLE_IF_NOT_EXISTS + TABLE_NAME + " (" + COLUMN_NAME_BUSSTOP_ID + TEXT_TYPE + PRIMARY_KEY + NOT_NULL + COMMA + COLUMN_NAME_BUSSTOP_NAME + TEXT_TYPE + NOT_NULL + COMMA + COLUMN_NAME_BUSSTOP_USERNAME + TEXT_TYPE + COMMA + COLUMN_NAME_BUSSTOP_ISFAVORITE + INTEGER_TYPE + NOT_NULL + getDefault(IS_NOT_FAVORITE) + COMMA + COLUMN_NAME_BUSSTOP_LOCALITY + TEXT_TYPE + COMMA + COLUMN_NAME_BUSSTOP_LATITUDE + REAL_TYPE + COMMA + COLUMN_NAME_BUSSTOP_LONGITUDE + REAL_TYPE + ")"; private static final String SQL_DROP_TABLE = DROP_TABLE + TABLE_NAME; public static boolean busStopExists(SQLiteDatabase db, String busStopID) { return rowExists(db, TABLE_NAME, getColumn(COLUMN_NAME_BUSSTOP_ID), busStopID); } public final static int FORCE_NULL_BUSSTOP_USERNAME = 1; /** * Add a bus stop or replace the existing bus stop. * It also add its bus lines! * * @param db * @param busStop * @param forceNULL * @return * @throws SQLException */ public static void addBusStop(SQLiteDatabase db, BusStop busStop, int forceNULL) throws SQLException { ContentValues values = new ContentValues(); if(busStop.getBusStopName() != null) { values.put(COLUMN_NAME_BUSSTOP_NAME, busStop.getBusStopName()); } if(busStop.getBusStopUsername() != null) { values.put(COLUMN_NAME_BUSSTOP_USERNAME, busStop.getBusStopUsername()); } else if((forceNULL & FORCE_NULL_BUSSTOP_USERNAME) != 0) { values.putNull(COLUMN_NAME_BUSSTOP_USERNAME); } if (busStop.getBusStopLocality() != null) { values.put(COLUMN_NAME_BUSSTOP_LOCALITY, busStop.getBusStopLocality()); } if (busStop.getIsFavorite() != null) { values.put(COLUMN_NAME_BUSSTOP_ISFAVORITE, busStop.getIsFavorite() ? IS_FAVORITE : IS_NOT_FAVORITE); } if(busStop.getLatitude() != null && busStop.getLongitude() != null) { values.put(COLUMN_NAME_BUSSTOP_LATITUDE, busStop.getLatitude()); values.put(COLUMN_NAME_BUSSTOP_LONGITUDE, busStop.getLongitude()); } if(busStopExists(db, busStop.getBusStopID())) { db.update(TABLE_NAME, values, somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ID), new String[]{busStop.getBusStopID()}); Log.d("MyDB", "busStop with busStopID " + busStop.getBusStopID() + " updated"); } else { values.put(COLUMN_NAME_BUSSTOP_ID, busStop.getBusStopID()); long lastInserted = db.insert(TABLE_NAME, null, values); Log.d("MyDB", "busStop with busStopID " + busStop.getBusStopID() + " inserted as " + lastInserted); } // Javamerda if(busStop.getBusLines() != null) { for (BusLine busLine : busStop.getBusLines()) { DBBusLine.addBusLine(db, busLine); DBBusStopServeLine.addBusStopServeLine(db, busStop.getBusStopID(), busLine.getBusLineID()); } } } public static void addBusStop(SQLiteDatabase db, BusStop busStop) throws SQLException { addBusStop(db, busStop, 0); } public static BusStop[] getFavoriteBusStops(SQLiteDatabase db) { ArrayList busStops = new ArrayList(); - String query = MyDB.SELECT_ALL_FROM + String query = UserDB.SELECT_ALL_FROM + TABLE_NAME + WHERE + somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ISFAVORITE) + ORDER_BY + COLUMN_NAME_BUSSTOP_NAME + ASC; Cursor c = db.rawQuery(query, new String[]{DBBusStop.IS_FAVORITE}); while (c.moveToNext()) { String busStopID = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_ID)); String busStopName = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_NAME)); String busStopUsername = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_USERNAME)); String busStopLocality = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_LOCALITY)); BusLine[] busLines = DBBusStopServeLine.getBusLinesServedByBusStopID(db, busStopID); BusStop busStop = new BusStop(busStopID, busStopName, busLines); busStop.setBusStopUsername(busStopUsername); busStop.setBusStopLocality(busStopLocality); busStops.add(busStop); } c.close(); return busStops.toArray(new BusStop[busStops.size()]); } public static BusStop getBusStop(SQLiteDatabase db, String searchBusStopID) { BusStop busStop = null; - String query = MyDB.SELECT_ALL_FROM + String query = UserDB.SELECT_ALL_FROM + TABLE_NAME + WHERE + somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ID); Cursor c = db.rawQuery(query, new String[]{searchBusStopID}); while (c.moveToNext()) { String busStopID = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_ID)); String busStopName = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_NAME)); String busStopUsername = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_USERNAME)); String busStopLocality = c.getString(c.getColumnIndex(COLUMN_NAME_BUSSTOP_LOCALITY)); BusLine[] busLines = DBBusStopServeLine.getBusLinesServedByBusStopID(db, busStopID); busStop = new BusStop(busStopID, busStopName, busLines); busStop.setBusStopUsername(busStopUsername); busStop.setBusStopLocality(busStopLocality); } c.close(); return busStop; } public static String getColumn(String columnName) { return TABLE_NAME + DOT + columnName; } } /** * Store bus lines. */ public static abstract class DBBusLine implements BaseColumns { public static final String TABLE_NAME = "busline"; public static final String COLUMN_NAME_BUSLINE_ID = "busline_ID"; public static final String COLUMN_NAME_BUSLINE_NAME = "busline_name"; public static final String COLUMN_NAME_BUSLINE_USERNAME = "busline_username"; public static final String COLUMN_NAME_BUSLINE_TYPE = "busline_type"; private static final String SQL_CREATE_ENTRIES = CREATE_TABLE_IF_NOT_EXISTS + TABLE_NAME + " (" + COLUMN_NAME_BUSLINE_ID + TEXT_TYPE + PRIMARY_KEY + NOT_NULL + COMMA + COLUMN_NAME_BUSLINE_NAME + TEXT_TYPE + NOT_NULL + COMMA + COLUMN_NAME_BUSLINE_USERNAME + TEXT_TYPE + COMMA + COLUMN_NAME_BUSLINE_TYPE + INTEGER_TYPE + ")"; private static final String SQL_DROP_TABLE = DROP_TABLE + TABLE_NAME; public static String getColumn(String columnName) { return TABLE_NAME + DOT + columnName; } public static boolean busLineExists(SQLiteDatabase db, Integer busLineID) { return rowExists(db, TABLE_NAME, getColumn(COLUMN_NAME_BUSLINE_ID), busLineID.toString()); } public static void addBusLine(SQLiteDatabase db, BusLine busLine) throws SQLException { ContentValues values = new ContentValues(); values.put(COLUMN_NAME_BUSLINE_NAME, busLine.getBusLineName()); if(busLine.getBusLineUsername() != null) { values.put(COLUMN_NAME_BUSLINE_USERNAME, busLine.getBusLineUsername()); } if(busLine.getBusLineType() != null) { values.put(COLUMN_NAME_BUSLINE_TYPE, busLine.getBusLineType()); } if(busLineExists(db, busLine.getBusLineID())) { db.update(TABLE_NAME, values, somethingEqualsWithoutQuotes(COLUMN_NAME_BUSLINE_ID), new String[] { String.valueOf(busLine.getBusLineID()) }); Log.d("MyDB", "BusLine with busLineID " + busLine.getBusLineID() + " updated"); } else { values.put(COLUMN_NAME_BUSLINE_ID, busLine.getBusLineID()); long lastInserted = db.insert(TABLE_NAME, null, values); Log.d("MyDB", "BusLine with busLineID " + busLine.getBusLineID() + " inserted as " + lastInserted); } } } /** * Associate every bus stop on every bus line served */ public static abstract class DBBusStopServeLine { public static final String TABLE_NAME = "busstopserveline"; public static final String COLUMN_NAME_BUSSTOP_ID = "busstop_ID"; public static final String COLUMN_NAME_BUSLINE_ID = "busline_ID"; private static final String SQL_CREATE_ENTRIES = CREATE_TABLE_IF_NOT_EXISTS + TABLE_NAME + " (" + COLUMN_NAME_BUSSTOP_ID + INTEGER_TYPE + NOT_NULL + COMMA + COLUMN_NAME_BUSLINE_ID + INTEGER_TYPE + NOT_NULL + COMMA + PRIMARY_KEY + " (" + COLUMN_NAME_BUSSTOP_ID + COMMA + COLUMN_NAME_BUSLINE_ID + "))"; // Add primary key on two columns private static final String SQL_DROP_TABLE = DROP_TABLE + TABLE_NAME; /** * Serve a bus stop by a bus line (if it don't exists) * @param db * @param busStopID * @param busLineID */ public static void addBusStopServeLine(SQLiteDatabase db, String busStopID, Integer busLineID) { String queryExists = SELECT + getColumn(COLUMN_NAME_BUSSTOP_ID) + COMMA + getColumn(COLUMN_NAME_BUSLINE_ID) + FROM + TABLE_NAME + WHERE + somethingEqualsWithoutQuotes(COLUMN_NAME_BUSSTOP_ID) + AND + somethingEqualsWithoutQuotes(COLUMN_NAME_BUSLINE_ID); Cursor cursor = db.rawQuery(queryExists, new String[] { String.valueOf(busStopID), String.valueOf(busLineID) }); boolean exists = cursor.moveToNext(); cursor.close(); if(exists) { Log.d("MyDB", "busStopServeLine relation between busStopID " + busStopID + " and busLineID " + busLineID + " already inserted"); } else { ContentValues values = new ContentValues(); values.put(COLUMN_NAME_BUSSTOP_ID, busStopID); values.put(COLUMN_NAME_BUSLINE_ID, busLineID); long inserted = db.insert(TABLE_NAME, null, values); Log.d("MyDB", "busStopServeLine relation between busStopID " + busStopID + " and busLineID " + busLineID + " inserted as " + inserted); } } public static String getColumn(String columnName) { return TABLE_NAME + DOT + columnName; } /** * Get bus lines server by a bus stop. * @param db * @param busStopID * @return */ public static BusLine[] getBusLinesServedByBusStopID(SQLiteDatabase db, String busStopID) { ArrayList busLines = new ArrayList(); String queryLines = SELECT + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_ID) + COMMA + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_NAME) + FROM + TABLE_NAME + COMMA + DBBusLine.TABLE_NAME + WHERE + somethingEqualsWithoutQuotes(getColumn(COLUMN_NAME_BUSSTOP_ID)) + AND + getColumn(COLUMN_NAME_BUSLINE_ID) + EQUALS + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_ID) + ORDER_BY + DBBusLine.getColumn(DBBusLine.COLUMN_NAME_BUSLINE_NAME) + ASC; Cursor cursor = db.rawQuery(queryLines, new String[] { String.valueOf(busStopID) }); while (cursor.moveToNext()) { Integer busLineID = cursor.getInt(0); String busLineName = cursor.getString(1); busLines.add(new BusLine(busLineID, busLineName)); } cursor.close(); return busLines.toArray(new BusLine[busLines.size()]); } } }