diff --git a/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java b/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java
index 02df227..1e7de7b 100644
--- a/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java
+++ b/src/it/reyboz/bustorino/fragments/ArrivalsFragment.java
@@ -1,201 +1,221 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2018 Fabio Mazza
 
     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 <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments;
 
 
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.util.Log;
 import android.widget.TextView;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.DBStatusManager;
 import it.reyboz.bustorino.middleware.AppDataProvider;
 import it.reyboz.bustorino.middleware.NextGenDB;
 import it.reyboz.bustorino.middleware.UserDB;
 
 public class ArrivalsFragment extends ResultListFragment implements LoaderManager.LoaderCallbacks<Cursor> {
 
     private final static String KEY_STOP_ID = "stopid";
     private final static String KEY_STOP_NAME = "stopname";
     private final static String DEBUG_TAG = "BUSTOArrivalsFragment";
     private final static int loaderFavId = 2;
     private final static int loaderStopId = 1;
     private @Nullable String stopID,stopName;
     private TextView messageTextView;
     private DBStatusManager prefs;
     private DBStatusManager.OnDBUpdateStatusChangeListener listener;
     private boolean justCreated = false;
 
     public static ArrivalsFragment newInstance(String stopID){
         Bundle args = new Bundle();
         args.putString(KEY_STOP_ID,stopID);
         ArrivalsFragment fragment = new ArrivalsFragment();
         //parameter for ResultListFragment
         args.putSerializable(LIST_TYPE,FragmentKind.ARRIVALS);
         fragment.setArguments(args);
         return fragment;
     }
     public static ArrivalsFragment newInstance(String stopID,String stopName){
         ArrivalsFragment fragment = newInstance(stopID);
         Bundle args = fragment.getArguments();
         args.putString(KEY_STOP_NAME,stopName);
         fragment.setArguments(args);
         return fragment;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         stopID = getArguments().getString(KEY_STOP_ID);
         //this might really be null
         stopName = getArguments().getString(KEY_STOP_NAME);
         final ArrivalsFragment f = this;
         listener = new DBStatusManager.OnDBUpdateStatusChangeListener() {
             @Override
             public void onDBStatusChanged(boolean updating) {
                 if(!updating){
                     getLoaderManager().restartLoader(loaderFavId,getArguments(),f);
                 } else {
                     final LoaderManager lm = getLoaderManager();
                     lm.destroyLoader(loaderFavId);
                     lm.destroyLoader(loaderStopId);
                 }
             }
 
             @Override
             public boolean defaultStatusValue() {
                 return true;
             }
         };
         prefs = new DBStatusManager(getContext().getApplicationContext(),listener);
         justCreated = true;
 
     }
 
     @Override
     public void onResume() {
         super.onResume();
         LoaderManager loaderManager  = getLoaderManager();
 
         if(stopID!=null){
             //refresh the arrivals
             if(!justCreated)
                 mListener.createFragmentForStop(stopID);
             else justCreated = false;
             //start the loader
             if(prefs.isDBUpdating(true)){
                 prefs.registerListener();
             } else {
                 loaderManager.restartLoader(loaderFavId, getArguments(), this);
             }
             updateMessage();
         }
     }
 
     @Nullable
     public String getStopID() {
         return stopID;
     }
 
+    /**
+     * Update the message in the fragment
+     *
+     * It may eventually change the "Add to Favorite" icon
+     */
     private void updateMessage(){
         String message = null;
         if (stopName != null && stopID != null && stopName.length() > 0) {
             message = (stopID.concat(" - ").concat(stopName));
         } else if(stopID!=null) {
             message = stopID;
         } else {
             Log.e("ArrivalsFragm"+getTag(),"NO ID FOR THIS FRAGMENT - something went horribly wrong");
         }
-        if(message!=null) setTextViewMessage(getString(R.string.passages,message));
+        if(message!=null) {
+            setTextViewMessage(getString(R.string.passages,message));
+
+            /**
+             * If the Bus Stop is already in the favorites, change somehow the UX
+             *
+             * TODO https://gitpull.it/T18
+             */
+            if(isStopInFavorites(stopID)) {
+                // TODO fill the favorite star and remove this log
+                Log.d("ArrivalsFragm"+getTag(), "Bus stop IS in the favorites");
+            } else {
+                // TODO do not fill the favorite star and remove this log
+                Log.d("ArrivalsFragm"+getTag(), "Bus stop IS NOT in the favorites");
+            }
+        }
     }
 
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         if(args.getString(KEY_STOP_ID)==null) return null;
         final String stopID = args.getString(KEY_STOP_ID);
         final Uri.Builder builder = AppDataProvider.getUriBuilderToComplete();
         CursorLoader cl;
         switch (id){
             case loaderFavId:
                 builder.appendPath("favorites").appendPath(stopID);
                 cl = new CursorLoader(getContext(),builder.build(),UserDB.getFavoritesColumnNamesAsArray,null,null,null);
 
                 break;
             case loaderStopId:
                 builder.appendPath("stop").appendPath(stopID);
                 cl = new CursorLoader(getContext(),builder.build(),new String[]{NextGenDB.Contract.StopsTable.COL_NAME},
                         null,null,null);
                 break;
             default:
                 return null;
         }
         cl.setUpdateThrottle(500);
         return cl;
     }
 
     @Override
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
 
         switch (loader.getId()){
             case loaderFavId:
                 final int colUserName = data.getColumnIndex(UserDB.getFavoritesColumnNamesAsArray[1]);
                 if(data.getCount()>0){
                     data.moveToFirst();
                     final String probableName = data.getString(colUserName);
                     if(probableName!=null && !probableName.isEmpty()){
                     stopName = probableName;
                     updateMessage();
                     }
                 }
                 if(stopName == null){
                     //stop is not inside the favorites and wasn't provided
                     Log.d("ArrivalsFragment"+getTag(),"Stop wasn't in the favorites and has no name, looking in the DB");
                     getLoaderManager().restartLoader(loaderStopId,getArguments(),this);
                 }
                 break;
             case loaderStopId:
                 if(data.getCount()>0){
                     data.moveToFirst();
                     stopName = data.getString(data.getColumnIndex(
                             NextGenDB.Contract.StopsTable.COL_NAME
                     ));
                     updateMessage();
                 } else {
                     Log.w("ArrivalsFragment"+getTag(),"Stop is not inside the database... CLOISTER BELL");
                 }
         }
 
     }
 
     @Override
     public void onPause() {
         if(listener!=null)
             prefs.unregisterListener();
         super.onPause();
     }
 
     @Override
     public void onLoaderReset(Loader<Cursor> loader) {
         //NOTHING TO DO
     }
 }
diff --git a/src/it/reyboz/bustorino/fragments/ResultListFragment.java b/src/it/reyboz/bustorino/fragments/ResultListFragment.java
index 382fe30..7c59579 100644
--- a/src/it/reyboz/bustorino/fragments/ResultListFragment.java
+++ b/src/it/reyboz/bustorino/fragments/ResultListFragment.java
@@ -1,293 +1,312 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2016 Fabio Mazza
 
     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 <http://www.gnu.org/licenses/>.
  */
 
 
 package it.reyboz.bustorino.fragments;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import android.widget.*;
 import android.support.design.widget.FloatingActionButton;
 import it.reyboz.bustorino.ActivityMain;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.FiveTNormalizer;
 import it.reyboz.bustorino.backend.Palina;
 import it.reyboz.bustorino.backend.Route;
 import it.reyboz.bustorino.backend.Stop;
+import it.reyboz.bustorino.middleware.UserDB;
 
 /**
  *  This is a generalized fragment that can be used both for
  *
  *
  */
 public class ResultListFragment extends Fragment{
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
     static final String LIST_TYPE = "list-type";
     private static final String STOP_TITLE = "messageExtra";
     protected static final String LIST_STATE = "list_state";
 
 
     private static final String MESSAGE_TEXT_VIEW = "message_text_view";
     private FragmentKind adapterKind;
 
     private boolean adapterSet = false;
     protected FragmentListener mListener;
     private TextView messageTextView;
 
     private FloatingActionButton fabutton;
     private ListView resultsListView;
     private ListAdapter mListAdapter = null;
     boolean listShown;
     private Parcelable mListInstanceState = null;
 
     public ResultListFragment() {
         // Required empty public constructor
     }
 
     public ListView getResultsListView() {
         return resultsListView;
     }
 
     /**
      * Use this factory method to create a new instance of
      * this fragment using the provided parameters.
      *
      * @param listType whether the list is used for STOPS or LINES (Orari)
      * @return A new instance of fragment ResultListFragment.
      */
     public static ResultListFragment newInstance(FragmentKind listType, String eventualStopTitle) {
         ResultListFragment fragment = new ResultListFragment();
         Bundle args = new Bundle();
         args.putSerializable(LIST_TYPE, listType);
-        if (eventualStopTitle != null)
+        if (eventualStopTitle != null) {
             args.putString(STOP_TITLE, eventualStopTitle);
+        }
         fragment.setArguments(args);
         return fragment;
     }
 
     public static ResultListFragment newInstance(FragmentKind listType) {
         return newInstance(listType, null);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             adapterKind = (FragmentKind) getArguments().getSerializable(LIST_TYPE);
         }
     }
 
+    /**
+     * Check if the last Bus Stop is in the favorites
+     * @return
+     */
+    public boolean isStopInFavorites(String busStopId) {
+        boolean found = false;
+
+        // no stop no party
+        if(busStopId != null) {
+            SQLiteDatabase userDB = new UserDB(getContext()).getReadableDatabase();
+            found = UserDB.isStopinFavorites(userDB, busStopId);
+        }
+
+        return found;
+    }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_list_view, container, false);
         messageTextView = (TextView) root.findViewById(R.id.messageTextView);
+
         if (adapterKind != null) {
             resultsListView = (ListView) root.findViewById(R.id.resultsListView);
             switch (adapterKind) {
                 case STOPS:
                     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);
                             mListener.createFragmentForStop(busStop.ID);
                         }
                     });
 
                     //set the textviewMessage
                     setTextViewMessage(getString(R.string.results));
                     break;
                 case ARRIVALS:
                     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.getNameForDisplay());
                             if (routeName == null) {
                                 routeName = r.getNameForDisplay();
                             }
                             if (r.destinazione == null || r.destinazione.length() == 0) {
                                 Toast.makeText(getContext(),
                                         getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show();
                             } else {
                                 Toast.makeText(getContext(),
                                         getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show();
                             }
                         }
                     });
                     String displayName = getArguments().getString(STOP_TITLE);
                     setTextViewMessage(String.format(
                             getString(R.string.passages), displayName));
                     break;
                 default:
                     throw new IllegalStateException("Argument passed was not of a supported type");
             }
 
             String probablemessage = getArguments().getString(MESSAGE_TEXT_VIEW);
             if (probablemessage != null) {
                 //Log.d("BusTO fragment " + this.getTag(), "We have a possible message here in the savedInstaceState: " + probablemessage);
                 messageTextView.setText(probablemessage);
                 messageTextView.setVisibility(View.VISIBLE);
             }
 
         } else
             Log.d(getString(R.string.list_fragment_debug), "No content root for fragment");
         return root;
     }
 
     public boolean isFragmentForTheSameStop(Palina p) {
         return adapterKind.equals(FragmentKind.ARRIVALS) && getTag().equals(getFragmentTag(p));
     }
 
     public static String getFragmentTag(Palina p) {
         return p.ID;
     }
 
 
     @Override
     public void onResume() {
         super.onResume();
         //Log.d(getString(R.string.list_fragment_debug),"Fragment restored, saved listAdapter is "+(mListAdapter));
         if (mListAdapter != null) {
 
             ListAdapter adapter = mListAdapter;
             mListAdapter = null;
             setListAdapter(adapter);
         }
         if (mListInstanceState != null) {
             Log.d("resultsListView", "trying to restore instance state");
             resultsListView.onRestoreInstanceState(mListInstanceState);
         }
         switch (adapterKind) {
             case ARRIVALS:
                 resultsListView.setOnScrollListener(new CommonScrollListener(mListener, true));
                 fabutton.show();
                 break;
             case STOPS:
                 resultsListView.setOnScrollListener(new CommonScrollListener(mListener, false));
                 break;
             default:
                 //NONE
         }
         mListener.readyGUIfor(adapterKind);
 
     }
 
     @Override
     public void onPause() {
         if (adapterKind.equals(FragmentKind.ARRIVALS)) {
             SwipeRefreshLayout reflay = (SwipeRefreshLayout) getActivity().findViewById(R.id.listRefreshLayout);
             reflay.setEnabled(false);
             Log.d("BusTO Fragment " + this.getTag(), "RefreshLayout disabled");
         }
         super.onPause();
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         if (context instanceof FragmentListener) {
             mListener = (FragmentListener) context;
             fabutton = (FloatingActionButton) getActivity().findViewById(R.id.floatingActionButton);
         } else {
             throw new RuntimeException(context.toString()
                     + " must implement ResultFragmentListener");
         }
 
     }
 
 
     @Override
     public void onDetach() {
         mListener = null;
         if (fabutton != null)
             fabutton.show();
         super.onDetach();
     }
 
 
     @Override
     public void onDestroyView() {
         resultsListView = null;
         //Log.d(getString(R.string.list_fragment_debug), "called onDestroyView");
         getArguments().putString(MESSAGE_TEXT_VIEW, messageTextView.getText().toString());
         super.onDestroyView();
     }
 
 
     @Override
     public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
         Log.d("ResultListFragment", "onViewStateRestored");
         if (savedInstanceState != null) {
             mListInstanceState = savedInstanceState.getParcelable(LIST_STATE);
             Log.d("ResultListFragment", "listInstanceStatePresent :" + mListInstanceState);
         }
     }
 
     public void setListAdapter(ListAdapter adapter) {
         boolean hadAdapter = mListAdapter != null;
         mListAdapter = adapter;
         if (resultsListView != null) {
             resultsListView.setAdapter(adapter);
             resultsListView.setVisibility(View.VISIBLE);
         }
     }
 
     /**
      * Set the message textView
      * @param message the whole message to write in the textView
      */
     public void setTextViewMessage(String message) {
         messageTextView.setText(message);
         switch (adapterKind) {
             case ARRIVALS:
                 final ActivityMain activ = (ActivityMain) getActivity();
                 messageTextView.setClickable(true);
                 messageTextView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         mListener.addLastStopToFavorites();
                     }
                 });
                 break;
             case STOPS:
                 messageTextView.setClickable(false);
                 break;
         }
 
         messageTextView.setVisibility(View.VISIBLE);
     }
 }
diff --git a/src/it/reyboz/bustorino/middleware/UserDB.java b/src/it/reyboz/bustorino/middleware/UserDB.java
index f038098..2f66ccb 100644
--- a/src/it/reyboz/bustorino/middleware/UserDB.java
+++ b/src/it/reyboz/bustorino/middleware/UserDB.java
@@ -1,249 +1,274 @@
 /*
 	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 <http://www.gnu.org/licenses/>.
  */
 
 package it.reyboz.bustorino.middleware;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.content.Context;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.backend.StopsDBInterface;
 
 public class UserDB extends SQLiteOpenHelper {
 	public static final int DATABASE_VERSION = 1;
 	private static final String DATABASE_NAME = "user.db";
 	static final String TABLE_NAME = "favorites";
     private final Context c; // needed during upgrade
     private final static String[] usernameColumnNameAsArray = {"username"};
     public final static String[] getFavoritesColumnNamesAsArray = {"ID", "username"};
 
 	public UserDB(Context context) {
 		super(context, DATABASE_NAME, null, DATABASE_VERSION);
         this.c = context;
 	}
 
     @Override
 	public void onCreate(SQLiteDatabase db) {
         // exception intentionally left unhandled
 		db.execSQL("CREATE TABLE favorites (ID TEXT PRIMARY KEY NOT NULL, username TEXT)");
 
         if(OldDB.doesItExist(this.c)) {
             upgradeFromOldDatabase(db);
         }
 	}
 
     private void upgradeFromOldDatabase(SQLiteDatabase newdb) {
         OldDB old;
         try {
             old = new OldDB(this.c);
         } catch(IllegalStateException e) {
             // can't create database => it doesn't really exist, no matter what doesItExist() says
             return;
         }
 
         int ver = old.getOldVersion();
 
         /* version 8 was the previous version, OldDB "upgrades" itself to 1337 but unless the app
          * has crashed midway through the upgrade and the user is retrying, that should never show
          * up here. And if it does, try to recover favorites anyway.
          * Versions < 8 already got dropped during the update process, so let's do the same.
          *
          * Edit: Android runs getOldVersion() then, after a while, onUpgrade(). Just to make it
          * more complicated. Workaround added in OldDB.
          */
         if(ver >= 8) {
             ArrayList<String> ID = new ArrayList<>();
             ArrayList<String> username = new ArrayList<>();
             int len;
             int len2;
 
             try {
                 Cursor c = old.getReadableDatabase().rawQuery("SELECT busstop_ID, busstop_username FROM busstop WHERE busstop_isfavorite = 1 ORDER BY busstop_name ASC", new String[] {});
 
                 int zero = c.getColumnIndex("busstop_ID");
                 int one = c.getColumnIndex("busstop_username");
 
                 while(c.moveToNext()) {
                     try {
                         ID.add(c.getString(zero));
                     } catch(Exception e) {
                         // no ID = can't add this
                         continue;
                     }
 
                     if(c.getString(one) == null || c.getString(one).length() <= 0) {
                         username.add(null);
                     } else {
                         username.add(c.getString(one));
                     }
                 }
 
                 c.close();
                 old.close();
             } catch(Exception ignored) {
                 // there's no hope, go ahead and nuke old database.
             }
 
             len = ID.size();
             len2 = username.size();
             if(len2 < len) {
                 len = len2;
             }
 
 
             if (len > 0) {
 
                 try {
                     Stop stopStopStopStopStop;
                     for (int i = 0; i < len; i++) {
                         stopStopStopStopStop = new Stop(ID.get(i));
                         stopStopStopStopStop.setStopUserName(username.get(i));
                         addOrUpdateStop(stopStopStopStopStop, newdb);
                     }
                 } catch(Exception ignored) {
                     // partial data is better than no data at all, no transactions here
                 }
             }
         }
 
         if(!OldDB.destroy(this.c)) {
             // TODO: notify user somehow?
             Log.e("UserDB", "Failed to delete old database, you should really uninstall and reinstall the app. Unfortunately I have no way to tell the user.");
         }
     }
 
     @Override
 	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         // nothing to do yet
 	}
 
     @Override
 	public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         // nothing to do yet
 	}
 
+    /**
+     * Check if a stop ID is in the favorites
+     *
+     * @param db readable database
+     * @param stopId stop ID
+     * @return boolean
+     */
+    public static boolean isStopinFavorites(SQLiteDatabase db, String stopId) {
+        boolean found = false;
+
+        try {
+            Cursor c = db.query(TABLE_NAME, usernameColumnNameAsArray, "ID = ?", new String[] {stopId}, null, null, null);
+
+            if(c.moveToNext()) {
+                found = true;
+            }
+
+            c.close();
+        } catch(SQLiteException ignored) {
+            // don't care
+        }
+
+        return found;
+    }
+
     /**
      * Gets stop name set by the user.
      *
      * @param db readable database
      * @param stopID stop ID
      * @return name set by user, or null if not set\not found
      */
     public static String getStopUserName(SQLiteDatabase db, String stopID) {
         String username = null;
 
         try {
             Cursor c = db.query(TABLE_NAME, usernameColumnNameAsArray, "ID = ?", new String[] {stopID}, null, null, null);
 
             if(c.moveToNext()) {
                 username = c.getString(c.getColumnIndex("username"));
             }
             c.close();
         } catch(SQLiteException ignored) {}
 
         return username;
     }
 
     public static List<Stop> getFavorites(SQLiteDatabase db, StopsDBInterface dbi) {
         List<Stop> l = new ArrayList<>();
         Stop s;
         String stopID, stopUserName;
 
         try {
             Cursor c = db.query(TABLE_NAME, getFavoritesColumnNamesAsArray, null, null, null, null, null, null);
             int colID = c.getColumnIndex("ID");
             int colUser = c.getColumnIndex("username");
 
             while(c.moveToNext()) {
                 stopUserName = c.getString(colUser);
                 stopID = c.getString(colID);
 
                 s = dbi.getAllFromID(stopID);
 
                 if(s == null) {
                     // can't find it in database
                     l.add(new Stop(stopUserName, stopID, null, null, null));
                 } else {
                     // setStopName() already does sanity checks
                     s.setStopUserName(stopUserName);
                     l.add(s);
                 }
             }
 
             c.close();
         } catch(SQLiteException ignored) {}
 
         // comparison rules are too complicated to let SQLite do this (e.g. it outputs: 3234, 34, 576, 67, 8222) and stop name is in another database
         Collections.sort(l);
 
         return l;
     }
 
     public static boolean addOrUpdateStop(Stop s, SQLiteDatabase db) {
         ContentValues cv = new ContentValues();
         long result = -1;
         String un = s.getStopUserName();
 
         cv.put("ID", s.ID);
         // is there an username?
         if(un == null) {
             // no: see if it's in the database
             cv.put("username", getStopUserName(db, s.ID));
         } else {
             // yes: use it
             cv.put("username", un);
         }
 
         try {
             //ignore and throw -1 if the row is already in the DB
             result = db.insertWithOnConflict(TABLE_NAME, null, cv,SQLiteDatabase.CONFLICT_IGNORE);
         } catch (SQLiteException ignored) {}
 
         // Android Studio suggested this unreadable replacement: return true if insert succeeded (!= -1), or try to update and return
         return (result != -1) || updateStop(s, db);
     }
 
     public static boolean updateStop(Stop s, SQLiteDatabase db) {
         try {
             ContentValues cv = new ContentValues();
             cv.put("username", s.getStopUserName());
             db.update(TABLE_NAME, cv, "ID = ?", new String[]{s.ID});
             return true;
         } catch(SQLiteException e) {
             return false;
         }
     }
 
     public static boolean deleteStop(Stop s, SQLiteDatabase db) {
         try {
             db.delete(TABLE_NAME, "ID = ?", new String[]{s.ID});
             return true;
         } catch(SQLiteException e) {
             return false;
         }
     }
 }