diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c099060..98033e6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,135 +1,137 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="it.reyboz.bustorino">
 
-
-
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <application
-        android:name=".BustoApp"
-        android:networkSecurityConfig="@xml/networks_security_config"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme.NoActionBar">
+            android:name=".BustoApp"
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:networkSecurityConfig="@xml/networks_security_config"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:theme="@style/AppTheme.NoActionBar">
+
+        <activity
+                android:name=".ActivityExperiments"
+                android:label="@string/experiments"
+                android:theme="@style/MapTheme">
+        </activity>
         <activity
                 android:name=".ActivityPrincipal"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="www.gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="m.gtt.to.it"
                         android:pathPrefix="/m/it/arrivi.jsp"
                         android:scheme="http"/>
             </intent-filter>
         </activity>
         <activity
                 android:name=".ActivityAbout"
                 android:label="@string/about"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/AboutTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityMain"/>
         </activity>
         <activity
                 android:name=".ActivityFavorites"
                 android:label="@string/title_activity_favorites"
                 android:parentActivityName=".ActivityMain"
                 android:theme="@style/FavTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityMain"/>
         </activity>
         <activity
-            android:name=".ActivityMap"
-            android:label="@string/title_activity_map"
-            android:parentActivityName=".ActivityMain"
-            android:theme="@style/MapTheme">
+                android:name=".ActivityMap"
+                android:label="@string/title_activity_map"
+                android:parentActivityName=".ActivityMain"
+                android:theme="@style/MapTheme">
 
             <!-- API < 16: -->
             <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ActivityMain"/>
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value=".ActivityMain"/>
         </activity>
-
         <activity
                 android:name=".ActivityMain"
-                android:screenOrientation="portrait"
-                android:label="@string/app_name" >
+                android:label="@string/app_name"
+                android:screenOrientation="portrait">
         </activity>
 
         <provider
                 android:name=".data.AppDataProvider"
                 android:authorities="it.reyboz.bustorino.provider"
                 android:enabled="true"
                 android:exported="false">
         </provider>
 
         <service
                 android:name=".data.DatabaseUpdateService"
                 android:exported="false">
-        </service>
-        <!-- Don't show the additional frame on samsung phones -->
+        </service> <!-- Don't show the additional frame on samsung phones -->
         <meta-data
                 android:name="com.samsung.android.icon_container.has_icon_container"
                 android:value="true"/>
 
         <activity
                 android:name=".ActivitySettings"
                 android:label="@string/title_activity_settings"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/AppTheme">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="it.reyboz.bustorino.ActivityPrincipal"/>
         </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a7220d5..abc6a77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,117 +1,140 @@
 buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
         google()
 
     }
 
-    dependencies {
-
-        classpath 'com.android.tools.build:gradle:4.1.3'
-    }
     ext {
+        //multidex
+        multidex_version = "2.0.1"
         //libraries versions
         fragment_version = "1.3.6"
         activity_version = "1.2.4"
         appcompat_version = "1.3.1"
         preference_version = "1.1.1"
         work_version = "2.5.0"
 
         acra_version = "5.7.0"
         lifecycle_version = "2.3.1"
         arch_version = "2.1.0"
+        room_version = "2.3.0"
+        //kotlin
+        kotlin_version = '1.5.0'
+        coroutines_version = "1.5.0"
 
     }
+    dependencies {
+
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 allprojects {
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
         google()
 
     }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId "it.reyboz.bustorino"
-        minSdkVersion 14
+        minSdkVersion 15
         targetSdkVersion 29
         versionCode 35
         versionName "1.15.4"
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             resources.srcDirs = ['src']
             aidl.srcDirs = ['src']
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
     }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-dev"
         }
     }
 
     lintOptions {
         abortOnError false
     }
 
     repositories {
         jcenter()
         mavenLocal()
     }
 
     dependencies {
         //new libraries
         implementation "androidx.fragment:fragment:$fragment_version"
         implementation "androidx.activity:activity:$activity_version"
         implementation "androidx.annotation:annotation:1.2.0"
         implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
         implementation "androidx.appcompat:appcompat:$appcompat_version"
         implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
         implementation "androidx.preference:preference:$preference_version"
         implementation "androidx.work:work-runtime:$work_version"
 
-
-        implementation "com.google.android.material:material:1.3.0"
+        implementation "com.google.android.material:material:1.4.0"
+        implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
 
         implementation 'org.jsoup:jsoup:1.13.1'
         implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
         implementation 'com.android.volley:volley:1.2.0'
 
         implementation 'org.osmdroid:osmdroid-android:6.1.10'
         // ACRA
         implementation "ch.acra:acra-mail:$acra_version"
         implementation "ch.acra:acra-dialog:$acra_version"
         // google transit realtime
         implementation 'com.google.protobuf:protobuf-java:3.14.0'
 
         // ViewModel
         implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
         // LiveData
         implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
         // Lifecycles only (without ViewModel or LiveData)
         implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
 
+        // Room components
+        implementation "androidx.room:room-ktx:$room_version"
+        kapt "androidx.room:room-compiler:$room_version"
+        androidTestImplementation "androidx.room:room-testing:$room_version"
+        //multidex - we need this to build the app
+        implementation "androidx.multidex:multidex:$multidex_version"
     }
 }
+
+dependencies {
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+}
\ No newline at end of file
diff --git a/res/layout/activity_experiments.xml b/res/layout/activity_experiments.xml
new file mode 100644
index 0000000..545a44c
--- /dev/null
+++ b/res/layout/activity_experiments.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ActivityExperiments">
+
+    <Button
+            android:text="Download GTFS data"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/button"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:onClick="runExp"
+    />
+
+    <Button
+            android:text="Delete temporary GTFS file"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/deleteButton"
+            app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/menu/extra_menu_items.xml b/res/menu/principal_menu.xml
similarity index 84%
rename from res/menu/extra_menu_items.xml
rename to res/menu/principal_menu.xml
index f70baa9..d082f8b 100644
--- a/res/menu/extra_menu_items.xml
+++ b/res/menu/principal_menu.xml
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     >
         <item
             android:id="@+id/action_about"
             android:orderInCategory="4"
             android:title="@string/action_about_more" />
         <item
             android:id="@+id/action_hack"
             android:orderInCategory="6"
             android:title="@string/action_wiki"
             app:showAsAction="never" />
         <item
             android:id="@+id/action_source"
             android:orderInCategory="7"
             android:title="@string/action_source"
             app:showAsAction="never" />
         <item
             android:id="@+id/action_licence"
             android:orderInCategory="8"
             android:title="@string/action_licence"
             app:showAsAction="never" />
+    <item
+            android:id="@+id/action_experiments"
+            android:title="@string/experiments"
+            android:orderInCategory="10"
+    />
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55996c9..c2735de 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,174 +1,177 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop have this name</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages">Arrivals at: %1$s</string>
     <string name="results">Choose the bus stop…</string>
     <string name="lines">Lines: %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Contribute</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about">About</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="about_history">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, a "politically" <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
 
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
 
         <h2>How does it work?</h2>
         <p>This app will show you bus timetables gathering data from <b>www.gtt.to.it</b> or <b>www.5t.torino.it</b> "for personal use".</p>
 
 		<p>Who worked on BusTO:<br>
 		- <b>Fabio Mazza</b> current senior rockstar developer.<br>
         - <b>Andrea Ugo</b> current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b> designer of the 2021 logo.<br>
 		- <b>Marco M</b> rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b> previous senior rockstar developer asd.<br>
 		- <b>Valerio Bozzolan</b> maintainer and infrastructure sponsor.<br>
 		- <b>Marco Gagino</b> contributor and icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
 		- <b>Google</b> Material Design icons.<br>
 		- All the contributors!
 		</p>
 		
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
 
 		<h2>Notes</h2>
 		<p>This app has been developed <b>hoping to be useful to everyone</b> but without ANY warranty.</p>
 		<p>This translation is kindly provided by Riccardo Caniato and Marco Gagino.</p>
 		<p>Get involved! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
     <!-- Settings -->
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby connections</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recents is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding the position&#8230;</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to position to show it on the map</string>
     <string name="enableGpsText">Please enable GPS</string>
     <string name="database_update_message">Database update in progress&#8230;</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
 
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
-        \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app configuration/state.
+        \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
+        configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
+
+
 </resources>
diff --git a/res/values/theme.xml b/res/values/theme.xml
index 29e8921..7ecbe2d 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="FavTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/blue_500</item>
         <item name="colorPrimaryDark">@color/blue_700</item>
         <item name="colorAccent">@color/teal_500</item>
     </style>
 
     <style name="AboutTheme" parent="AppTheme.NoActionBar">
         <item name="colorPrimary">@color/teal_300</item>
         <item name="colorPrimaryDark">@color/teal_500</item>
         <item name="colorAccent">@color/blue_700</item>
     </style>
 
     <style name="MapTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
     </style>
 
     <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
 
+
+
 </resources>
\ No newline at end of file
diff --git a/res/xml/networks_security_config.xml b/res/xml/networks_security_config.xml
index a79b4de..40b4777 100644
--- a/res/xml/networks_security_config.xml
+++ b/res/xml/networks_security_config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">5t.torino.it</domain>
         <domain includeSubdomains="true">gtt.to.it</domain>
-
+        <domain includeSubdomains="true">comune.torino.it</domain>
     </domain-config>
 </network-security-config>
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/ActivityExperiments.java b/src/it/reyboz/bustorino/ActivityExperiments.java
new file mode 100644
index 0000000..825ac88
--- /dev/null
+++ b/src/it/reyboz/bustorino/ActivityExperiments.java
@@ -0,0 +1,141 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import it.reyboz.bustorino.backend.Fetcher;
+import it.reyboz.bustorino.backend.gtfs.GtfsDataParser;
+import it.reyboz.bustorino.backend.networkTools;
+import it.reyboz.bustorino.backend.utils;
+import it.reyboz.bustorino.middleware.GeneralActivity;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+public class ActivityExperiments extends GeneralActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_experiments);
+        Button deleteButton = findViewById(R.id.deleteButton);
+        if(deleteButton!=null)
+            deleteButton.setOnClickListener(view -> {
+                File saveFile = new File(getFilesDir(), "gtfs_data.zip");
+                if(!saveFile.isDirectory() && saveFile.exists()){
+                    //delete the file
+                    if(saveFile.delete())
+                        Toast.makeText(this, "Gtfs zip deleted", Toast.LENGTH_SHORT).show();
+                    else
+                        Toast.makeText(this, "Cannot delete gtfs zip", Toast.LENGTH_SHORT).show();
+                } else
+                    Toast.makeText(this, "Gtfs data zip not present", Toast.LENGTH_SHORT).show();
+            });
+    }
+
+    public void runExp(View v){
+
+        final Context appContext = v.getContext().getApplicationContext();
+
+        Runnable run = new Runnable() {
+            @Override
+            public void run() {
+            final String DEBUG_TAG = "ExperimentsGTFS";
+            AtomicReference<Fetcher.Result> res = new AtomicReference<>();
+            //List<String> files = GtfsDataParser.readFilesList(res);
+            Date updateDate = GtfsDataParser.getLastGTFSUpdateDate(res);
+            Log.w(
+                    "ExperimentGTFS", "Last update date is " + updateDate//utils.joinList(files, "\n")
+            );
+            //Toast.makeText(v.getContext(), "Gtfs data already downloaded", Toast.LENGTH_SHORT).show();
+
+            File saveFile = new File(getFilesDir(), "gtfs_data.zip");
+            if (!saveFile.isDirectory() && saveFile.exists()) {
+                Log.w(DEBUG_TAG, "Zip exists: " + saveFile);
+                try (FileInputStream fileStream = new FileInputStream(saveFile)) {
+                    ZipInputStream stream = new ZipInputStream(fileStream);
+                    // now iterate through each item in the stream. The get next
+                    // entry call will return a ZipEntry for each file in the
+                    // stream
+                    ZipEntry entry;
+                    String line;
+                    final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+                    while ((entry = stream.getNextEntry()) != null) {
+                        String s = String.format(Locale.ENGLISH, "Entry: %s len %d added",
+                                entry.getName(),
+                                entry.getSize()
+                        );
+                        //Toast.makeText(v.getContext(), "File: " + entry.getName(), Toast.LENGTH_SHORT).show();
+                        Log.d(DEBUG_TAG, s);
+                        //read data in table
+                        final String tableName = entry.getName().split("\\.")[0].trim();
+                        GtfsDataParser.readCSVWithColumns(reader, tableName, v.getContext().getApplicationContext());
+
+
+                        // Once we get the entry from the stream, the stream is
+                        // positioned read to read the raw data, and we keep
+                        // reading until read returns 0 or less.
+                        //result.add(entry.getName());
+                    }
+                    stream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                //saveFile.delete();
+            } else
+                try {
+                    //Toast.makeText(v.getContext(), "Downloading gtfs data", Toast.LENGTH_SHORT).show();
+
+                    networkTools.saveFileInCache(saveFile, new URL(GtfsDataParser.GTFS_ADDRESS));
+                    Log.w(DEBUG_TAG, "File saved");
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                }
+
+            }
+        };
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        //Looper looper = new Looper(true);
+        //Handler handler = new Handler();
+        //handler.post(run);
+        executorService.execute(run);
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/ActivityPrincipal.java b/src/it/reyboz/bustorino/ActivityPrincipal.java
index 3d44aa7..2cca929 100644
--- a/src/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/src/it/reyboz/bustorino/ActivityPrincipal.java
@@ -1,577 +1,590 @@
+/*
+	BusTO - Arrival times for Turin public transport.
+    Copyright (C) 2021 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;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceManager;
 import androidx.work.BackoffPolicy;
 import androidx.work.Constraints;
 import androidx.work.ExistingPeriodicWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.data.DBUpdateWorker;
 import it.reyboz.bustorino.data.DatabaseUpdate;
 import it.reyboz.bustorino.fragments.FavoritesFragment;
 import it.reyboz.bustorino.fragments.FragmentKind;
 import it.reyboz.bustorino.fragments.FragmentListenerMain;
 import it.reyboz.bustorino.fragments.MainScreenFragment;
 import it.reyboz.bustorino.fragments.MapFragment;
 import it.reyboz.bustorino.middleware.GeneralActivity;
 
 import static it.reyboz.bustorino.backend.utils.getBusStopIDFromUri;
 import static it.reyboz.bustorino.backend.utils.openIceweasel;
 
 public class ActivityPrincipal extends GeneralActivity implements FragmentListenerMain {
     private DrawerLayout mDrawer;
     private NavigationView mNavView;
     private ActionBarDrawerToggle drawerToggle;
     private final static String DEBUG_TAG="BusTO Act Principal";
 
     private final static String TAG_FAVORITES="favorites_frag";
     private Snackbar snackbar;
 
     private boolean showingMainFragmentFromOther = false;
 
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_principal);
         final SharedPreferences theShPr = getMainSharedPreferences();
 
 
         Toolbar mToolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(mToolbar);
         if (getSupportActionBar()!=null)
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         else Log.w(DEBUG_TAG, "NO ACTION BAR");
 
         mToolbar.setOnMenuItemClickListener(new ToolbarItemClickListener(this));
 
 
         mDrawer = findViewById(R.id.drawer_layout);
         drawerToggle = setupDrawerToggle(mToolbar);
 
         // Setup toggle to display hamburger icon with nice animation
         drawerToggle.setDrawerIndicatorEnabled(true);
 
         drawerToggle.syncState();
         mDrawer.addDrawerListener(drawerToggle);
 
         mDrawer.addDrawerListener(new DrawerLayout.DrawerListener() {
             @Override
             public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
             }
 
             @Override
             public void onDrawerOpened(@NonNull View drawerView) {
                 hideKeyboard();
             }
 
             @Override
             public void onDrawerClosed(@NonNull View drawerView) {
 
             }
 
             @Override
             public void onDrawerStateChanged(int newState) {
             }
         });
 
 
         mNavView = findViewById(R.id.nvView);
 
         setupDrawerContent(mNavView);
         /*View header = mNavView.getHeaderView(0);
 
         */
         //mNavView.getMenu().findItem(R.id.versionFooter).
 
         /// LEGACY CODE
         //---------------------------- 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
             // JUST DON'T
             // showKeyboard();
 
             // You haven't obtained anything... from an intent?
             if (tryedFromIntent) {
 
                 // This shows a luser warning
                 Toast.makeText(getApplicationContext(),
                         R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
             }
         } else {
             // If you are here an intent has worked successfully
             //setBusStopSearchByIDEditText(busStopID);
 
             requestArrivalsForStopID(busStopID);
         }
         //Try (hopefully) database update
-        PeriodicWorkRequest wr = new PeriodicWorkRequest.Builder(DBUpdateWorker.class, 1, TimeUnit.DAYS)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
-                .setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED)
-                        .build())
-                .build();
-        final WorkManager workManager = WorkManager.getInstance(this);
-
-        final int version = theShPr.getInt(DatabaseUpdate.DB_VERSION_KEY, -10);
-        if (version >= 0)
-            workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
-                    ExistingPeriodicWorkPolicy.KEEP, wr);
-        else workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
-                ExistingPeriodicWorkPolicy.REPLACE, wr);
+        DatabaseUpdate.requestDBUpdateWithWork(this, false);
         /*
-        Set database update
+        Watch for database update
          */
+        final WorkManager workManager = WorkManager.getInstance(this);
         workManager.getWorkInfosForUniqueWorkLiveData(DBUpdateWorker.DEBUG_TAG)
                 .observe(this, workInfoList -> {
                     // If there are no matching work info, do nothing
                     if (workInfoList == null || workInfoList.isEmpty()) {
                         return;
                     }
                     Log.d(DEBUG_TAG, "WorkerInfo: "+workInfoList);
 
                     boolean showProgress = false;
                     for (WorkInfo workInfo : workInfoList) {
                         if (workInfo.getState() == WorkInfo.State.RUNNING) {
                             showProgress = true;
                             break;
                         }
                     }
 
                     if (showProgress) {
                         createDefaultSnackbar();
                     } else {
                         if(snackbar!=null) {
                             snackbar.dismiss();
                             snackbar = null;
                         }
                     }
 
                 });
         // show the main fragment
         showMainFragment();
 
 
     }
     private ActionBarDrawerToggle setupDrawerToggle(Toolbar toolbar) {
         // NOTE: Make sure you pass in a valid toolbar reference.  ActionBarDrawToggle() does not require it
         // and will not render the hamburger icon without it.
         return new ActionBarDrawerToggle(this, mDrawer, toolbar, R.string.drawer_open,  R.string.drawer_close);
 
     }
 
     /**
      * Setup drawer actions
      * @param navigationView the navigation view on which to set the callbacks
      */
     private void setupDrawerContent(NavigationView navigationView) {
         navigationView.setNavigationItemSelectedListener(
                 menuItem -> {
                     if (menuItem.getItemId() == R.id.drawer_action_settings) {
                         Log.d("MAINBusTO", "Pressed button preferences");
                         closeDrawerIfOpen();
                         startActivity(new Intent(ActivityPrincipal.this, ActivitySettings.class));
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_favorites_item){
                         closeDrawerIfOpen();
                         //get Fragment
                         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
                         FavoritesFragment fragment = FavoritesFragment.newInstance();
                         ft.replace(R.id.mainActContentFrame,fragment, TAG_FAVORITES);
                         ft.addToBackStack(null);
                         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
                         ft.commit();
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_arrivals){
                         closeDrawerIfOpen();
                         showMainFragment();
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_map_item){
                         closeDrawerIfOpen();
                         final String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
                         int result = askForPermissionIfNeeded(permission, STORAGE_PERMISSION_REQ);
                         switch (result) {
                             case PERMISSION_OK:
                                 createAndShowMapFragment(null);
                                 break;
                             case PERMISSION_ASKING:
                                 permissionDoneRunnables.put(permission,
                                         () -> createAndShowMapFragment(null));
                                 break;
                             case PERMISSION_NEG_CANNOT_ASK:
                                 String storage_perm = getString(R.string.storage_permission);
                                 String text = getString(R.string.too_many_permission_asks,  storage_perm);
                                 Toast.makeText(getApplicationContext(),text, Toast.LENGTH_LONG).show();
                         }
                         return true;
                     }
                     //selectDrawerItem(menuItem);
                     Log.d(DEBUG_TAG, "pressed item "+menuItem);
 
                     return true;
 
                 });
 
     }
 
     private void closeDrawerIfOpen(){
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
     }
 
 
     // `onPostCreate` called when activity start-up is complete after `onStart()`
     // NOTE 1: Make sure to override the method with only a single `Bundle` argument
     // Note 2: Make sure you implement the correct `onPostCreate(Bundle savedInstanceState)` method.
     // There are 2 signatures and only `onPostCreate(Bundle state)` shows the hamburger icon.
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         drawerToggle.syncState();
     }
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         // Pass any configuration change to the drawer toggles
         drawerToggle.onConfigurationChanged(newConfig);
 
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.extra_menu_items, menu);
+        getMenuInflater().inflate(R.menu.principal_menu, menu);
+        MenuItem experimentsMenuItem = menu.findItem(R.id.action_experiments);
+        SharedPreferences shPr = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        boolean exper_On = shPr.getBoolean(getString(R.string.pref_key_experimental), false);
+        experimentsMenuItem.setVisible(exper_On);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode==STORAGE_PERMISSION_REQ){
             final String storagePerm = Manifest.permission.WRITE_EXTERNAL_STORAGE;
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 Log.d(DEBUG_TAG, "Permissions check: " + Arrays.toString(permissions));
 
                 if (permissionDoneRunnables.containsKey(storagePerm)) {
                     Runnable toRun = permissionDoneRunnables.get(storagePerm);
                     if (toRun != null)
                         toRun.run();
                     permissionDoneRunnables.remove(storagePerm);
                 }
             } else {
                 //permission denied
                 showToastMessage(R.string.permission_storage_maps_msg, false);
             }
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
         int[] cases = {R.id.nav_arrivals, R.id.nav_favorites_item};
         Log.d(DEBUG_TAG, "Item pressed");
 
 
         if (item.getItemId() == android.R.id.home) {
             mDrawer.openDrawer(GravityCompat.START);
             return true;
         }
 
         if (drawerToggle.onOptionsItemSelected(item)) {
 
             return true;
 
         }
         return super.onOptionsItemSelected(item);
 
     }
 
     @Override
     public void onBackPressed() {
         boolean foundFragment = false;
         Fragment shownFrag = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
         else if(shownFrag != null && shownFrag.isVisible() && shownFrag.getChildFragmentManager().getBackStackEntryCount() > 0){
             //if we have been asked to show a stop from another fragment, we should go back even in the main
             if(shownFrag instanceof MainScreenFragment){
                 //we have to stop the arrivals reload
                 ((MainScreenFragment) shownFrag).cancelReloadArrivalsIfNeeded();
             }
             shownFrag.getChildFragmentManager().popBackStackImmediate();
             if(showingMainFragmentFromOther && getSupportFragmentManager().getBackStackEntryCount() > 0){
                 getSupportFragmentManager().popBackStack();
             }
         }
         else if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
             getSupportFragmentManager().popBackStack();
         }
         else
             super.onBackPressed();
     }
 
     private void createDefaultSnackbar() {
         if (snackbar == null) {
             snackbar = Snackbar.make(findViewById(R.id.searchButton), R.string.database_update_message, Snackbar.LENGTH_INDEFINITE);
         }
         snackbar.show();
     }
 
     private MainScreenFragment createAndShowMainFragment(){
         FragmentManager fraMan = getSupportFragmentManager();
 
         MainScreenFragment fragment = MainScreenFragment.newInstance();
 
         FragmentTransaction transaction = fraMan.beginTransaction();
         transaction.replace(R.id.mainActContentFrame, fragment, MainScreenFragment.FRAGMENT_TAG);
         transaction.commit();
         return fragment;
     }
 
     /**
      * Show the fragment by adding it to the backstack
      * @param fraMan the fragmentManager
      * @param fragment the fragment
      */
     private static void showMainFragment(FragmentManager fraMan, MainScreenFragment fragment){
         fraMan.beginTransaction().replace(R.id.mainActContentFrame, fragment)
                 .setReorderingAllowed(true)
                 .addToBackStack(null)
                 /*.setCustomAnimations(
                         R.anim.slide_in,  // enter
                         R.anim.fade_out,  // exit
                         R.anim.fade_in,   // popEnter
                         R.anim.slide_out  // popExit
                 )*/
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
 
     private MainScreenFragment showMainFragment(){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         final MainScreenFragment mainScreenFragment;
         if (fragment==null | !(fragment instanceof MainScreenFragment)){
             mainScreenFragment = createAndShowMainFragment();
         }
         else if(!fragment.isVisible()){
 
 
             mainScreenFragment = (MainScreenFragment) fragment;
             showMainFragment(fraMan, mainScreenFragment);
             Log.d(DEBUG_TAG, "Found the main fragment");
         } else{
             mainScreenFragment = (MainScreenFragment) fragment;
         }
         return mainScreenFragment;
     }
     @Nullable
     private MainScreenFragment getMainFragmentIfVisible(){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         if (fragment!= null && fragment.isVisible()) return (MainScreenFragment) fragment;
         else return null;
     }
 
 
     @Override
     public void showFloatingActionButton(boolean yes) {
         //TODO
     }
     /*
     public void setDrawerSelectedItem(String fragmentTag){
         switch (fragmentTag){
             case MainScreenFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MapFragment.FRAGMENT_TAG:
 
                 break;
 
             case FavoritesFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 break;
         }
     }*/
 
     @Override
     public void readyGUIfor(FragmentKind fragmentType) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.readyGUIfor(fragmentType);
         }
         int titleResId;
         switch (fragmentType){
             case MAP:
                 mNavView.setCheckedItem(R.id.nav_map_item);
                 titleResId = R.string.map;
                 break;
             case FAVORITES:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 titleResId = R.string.nav_favorites_text;
                 break;
             case ARRIVALS:
                 titleResId = R.string.nav_arrivals_text;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case STOPS:
                 titleResId = R.string.stop_search_view_title;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MAIN_SCREEN_FRAGMENT:
             case NEARBY_STOPS:
             case NEARBY_ARRIVALS:
                 titleResId=R.string.app_name_full;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             default:
                 titleResId = 0;
         }
         if(getSupportActionBar()!=null && titleResId!=0)
             getSupportActionBar().setTitle(titleResId);
     }
 
     @Override
     public void requestArrivalsForStopID(String ID) {
         //register if the request came from the main fragment or not
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         showingMainFragmentFromOther = (probableFragment==null);
 
         if (showingMainFragmentFromOther){
             FragmentManager fraMan = getSupportFragmentManager();
             Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
             if(fragment!=null){
                 //the fragment is there but not shown
                 probableFragment = (MainScreenFragment) fragment;
                 // set the flag
                 probableFragment.setSuppressArrivalsReload(true);
                 showMainFragment(fraMan, probableFragment);
             } else {
                 // we have no fragment
                 probableFragment = createAndShowMainFragment();
             }
         }
         probableFragment.requestArrivalsForStopID(ID);
         mNavView.setCheckedItem(R.id.nav_arrivals);
     }
 
     @Override
     public void toggleSpinner(boolean state) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.toggleSpinner(state);
         }
     }
 
     @Override
     public void enableRefreshLayout(boolean yes) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.enableRefreshLayout(yes);
         }
     }
 
     @Override
     public void showMapCenteredOnStop(Stop stop) {
         createAndShowMapFragment(stop);
     }
 
     //Map Fragment stuff
     void createAndShowMapFragment(@Nullable Stop stop){
         FragmentManager fm = getSupportFragmentManager();
         FragmentTransaction ft = fm.beginTransaction();
         MapFragment fragment = stop == null? MapFragment.getInstance(): MapFragment.getInstance(stop);
         ft.replace(R.id.mainActContentFrame, fragment, MapFragment.FRAGMENT_TAG);
         ft.addToBackStack(null);
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         ft.commit();
     }
 
     class ToolbarItemClickListener implements Toolbar.OnMenuItemClickListener{
         private final Context activityContext;
 
         public ToolbarItemClickListener(Context activityContext) {
             this.activityContext = activityContext;
         }
 
         @Override
         public boolean onMenuItemClick(MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.action_about:
                     startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                     return true;
                 case R.id.action_hack:
                     openIceweasel(getString(R.string.hack_url), activityContext);
                     return true;
                 case R.id.action_source:
                     openIceweasel("https://gitpull.it/source/libre-busto/", activityContext);
                     return true;
                 case R.id.action_licence:
                     openIceweasel("https://www.gnu.org/licenses/gpl-3.0.html", activityContext);
                     return true;
+                case R.id.action_experiments:
+                    startActivity(new Intent(ActivityPrincipal.this, ActivityExperiments.class));
                 default:
             }
             return false;
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/BustoApp.java b/src/it/reyboz/bustorino/BustoApp.java
index 9cc4e72..1b534d5 100644
--- a/src/it/reyboz/bustorino/BustoApp.java
+++ b/src/it/reyboz/bustorino/BustoApp.java
@@ -1,42 +1,59 @@
+/*
+	BusTO - Arrival times for Turin public transport.
+    Copyright (C) 2021 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;
 
-import android.app.Application;
 import android.content.Context;
 
+import androidx.multidex.MultiDexApplication;
 import org.acra.ACRA;
 import org.acra.BuildConfig;
 import org.acra.ReportField;
 import org.acra.config.CoreConfigurationBuilder;
 import org.acra.config.DialogConfigurationBuilder;
 import org.acra.config.MailSenderConfigurationBuilder;
 import org.acra.data.StringFormat;
 
 import static org.acra.ReportField.*;
 
 
-public class BustoApp extends Application {
+public class BustoApp extends MultiDexApplication {
     private static final ReportField[] REPORT_FIELDS = {REPORT_ID, APP_VERSION_CODE, APP_VERSION_NAME,
             PACKAGE_NAME, PHONE_MODEL, BRAND, PRODUCT, ANDROID_VERSION, BUILD_CONFIG, CUSTOM_DATA,
             IS_SILENT, STACK_TRACE, INITIAL_CONFIGURATION, CRASH_CONFIGURATION, DISPLAY, USER_COMMENT,
             USER_APP_START_DATE, USER_CRASH_DATE, LOGCAT, SHARED_PREFERENCES};
 
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
 
         CoreConfigurationBuilder builder = new CoreConfigurationBuilder(this);
         builder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.JSON)
         .setDeleteUnapprovedReportsOnApplicationStart(true);
         builder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setMailTo("gtt@succhia.cz")
                 .setReportFileName(it.reyboz.bustorino.BuildConfig.VERSION_NAME +"_report.json")
                 .setResBody(R.string.acra_email_message)
                 .setEnabled(true);
         builder.getPluginConfigurationBuilder(DialogConfigurationBuilder.class).setResText(R.string.message_crash)
                 .setResTheme(R.style.AppTheme)
                 .setEnabled(true);
         builder.setReportContent(REPORT_FIELDS);
         if (!it.reyboz.bustorino.BuildConfig.DEBUG)
             ACRA.init(this, builder);
 
     }
 }
diff --git a/src/it/reyboz/bustorino/backend/Fetcher.java b/src/it/reyboz/bustorino/backend/Fetcher.java
index 8f1ef20..8ed79ca 100644
--- a/src/it/reyboz/bustorino/backend/Fetcher.java
+++ b/src/it/reyboz/bustorino/backend/Fetcher.java
@@ -1,36 +1,37 @@
 /*
 	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.backend;
 
 public interface Fetcher {
     /**
      * Status codes.<br>
      *<br>
      * OK: got a response, parsed correctly, obtained some data<br>
      * CLIENT_OFFLINE: can't connect to the internet<br>
      * SERVER_ERROR: the server replied anything other than HTTP 200, basically<br>
      *              for 404 special constant (see @FiveTAPIFetcher)
      * 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")<br>
      * EMPTY_RESULT_SET: the response is valid and indicates there are no stops\routes\"passaggi"\results for your query<br>
      * QUERY_TOO_SHORT: input more characters and retry.
      */
     enum Result {
-        OK, CLIENT_OFFLINE, SERVER_ERROR, SETUP_ERROR,PARSER_ERROR, EMPTY_RESULT_SET, QUERY_TOO_SHORT,SERVER_ERROR_404
+        OK, CLIENT_OFFLINE, SERVER_ERROR, SETUP_ERROR,PARSER_ERROR, EMPTY_RESULT_SET, QUERY_TOO_SHORT, SERVER_ERROR_404,
+        CONNECTION_ERROR
     }
 }
diff --git a/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java b/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java
new file mode 100644
index 0000000..e2a4b40
--- /dev/null
+++ b/src/it/reyboz/bustorino/backend/gtfs/GtfsDataParser.java
@@ -0,0 +1,256 @@
+package it.reyboz.bustorino.backend.gtfs;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import it.reyboz.bustorino.backend.Fetcher;
+import it.reyboz.bustorino.backend.networkTools;
+import it.reyboz.bustorino.data.gtfs.CsvTableInserter;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Attributes;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+abstract public class GtfsDataParser {
+    public static final String GTFS_ADDRESS="https://www.gtt.to.it/open_data/gtt_gtfs.zip";
+    public static final String GTFS_PAGE_ADDRESS="http://aperto.comune.torino.it/dataset/feed-gtfs-trasporti-gtt";
+
+    private static final String DEBUG_TAG = "BusTO-GTFSDataParser";
+
+    private static final Pattern quotePattern = Pattern.compile("^\\s*\"((?:[^\"]|(?:\"\"))*?)\"\\s*,");
+
+    /**
+     * First trial for a function to download the zip
+     * @param res Fetcher.result
+     * @return the list of files inside the ziè
+     */
+    public static ArrayList<String> readFilesList(AtomicReference<Fetcher.Result> res){
+
+        HttpURLConnection urlConnection;
+        InputStream in;
+        ArrayList<String> result = new ArrayList<>();
+        try {
+            final URL gtfsUrl = new URL(GTFS_ADDRESS);
+            urlConnection = (HttpURLConnection) gtfsUrl.openConnection();
+        } catch(IOException e) {
+            //e.printStackTrace();
+            res.set(Fetcher.Result.SERVER_ERROR); // even when offline, urlConnection works fine. WHY.
+            return null;
+        }
+        urlConnection.setConnectTimeout(4000);
+        urlConnection.setReadTimeout(50*1000);
+
+        try {
+            in = urlConnection.getInputStream();
+        } catch (Exception e) {
+            try {
+                if(urlConnection.getResponseCode()==404)
+                    res.set(Fetcher.Result.SERVER_ERROR_404);
+            } catch (IOException e2) {
+                e2.printStackTrace();
+            }
+            return null;
+
+        }
+        try (ZipInputStream stream = new ZipInputStream(in)) {
+
+            // now iterate through each item in the stream. The get next
+            // entry call will return a ZipEntry for each file in the
+            // stream
+            ZipEntry entry;
+            while ((entry = stream.getNextEntry()) != null) {
+                String s = String.format(Locale.ENGLISH, "Entry: %s len %d added",
+                        entry.getName(),
+                        entry.getSize()
+                );
+                System.out.println(s);
+
+                // Once we get the entry from the stream, the stream is
+                // positioned read to read the raw data, and we keep
+                // reading until read returns 0 or less.
+                result.add(entry.getName());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // we must always close the zip file.
+        return result;
+    }
+
+    public static Date getLastGTFSUpdateDate(AtomicReference<Fetcher.Result> res) {
+        URL theURL;
+        final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.ENGLISH);
+        //final Date baseDate = dateFormat.parse("1970-00-00T00:00:00+0000");
+        final Date nullDate = new Date(0);
+        try{
+            theURL = new URL(GTFS_PAGE_ADDRESS);
+        } catch (IOException ex){
+            Log.e(DEBUG_TAG, "Fixed URL is null, this is a real issue");
+            return nullDate;
+        }
+        res.set(Fetcher.Result.OK);
+        final String fullPageDOM = networkTools.getDOM(theURL, res);
+        if(fullPageDOM== null){
+            //Something wrong happend
+            Log.e(DEBUG_TAG, "Cannot get URL");
+            return nullDate;
+        }
+        res.set(Fetcher.Result.OK);
+        Document doc = Jsoup.parse(fullPageDOM);
+
+        Elements sections = doc.select("section.additional-info");
+        Date finalDate = new Date(0);
+        for (Element sec: sections){
+            Element head = sec.select("h3").first();
+            String headTitle = head.text();
+            if(!headTitle.trim().toLowerCase(Locale.ITALIAN).equals("informazioni supplementari"))
+                continue;
+
+            for (Element row: sec.select("tr")){
+                if(!row.selectFirst("th").text().trim()
+                        .toLowerCase(Locale.ITALIAN).equals("ultimo aggiornamento"))
+                    continue;
+
+                Attributes spanAttributes = row.selectFirst("td > span").attributes();
+                String dateAsString = spanAttributes.get("data-datetime");
+                try {
+                    finalDate = dateFormat.parse(dateAsString);
+                    return finalDate;
+                }catch (ParseException ex){
+                    Log.e(DEBUG_TAG, "Wrong date for the last update of GTFS Data: "+dateAsString);
+                    res.set(Fetcher.Result.PARSER_ERROR);
+                    ex.printStackTrace();
+                }
+                break;
+            }
+        }
+        res.set(Fetcher.Result.PARSER_ERROR);
+        return finalDate;
+
+    }
+
+    public static void readCSVWithColumns(BufferedReader reader, String tableName, Context con) throws IOException {
+
+        //String[] elements;
+        List<String> lineElements;
+
+        String line;
+
+        final String header = reader.readLine();
+        if (header == null){
+            throw new IOException();
+        }
+
+        //elements = header.split("\n")[0].split(",");
+        //System.out.println(Arrays.toString(elements));
+
+        lineElements = readCsvLine(header);
+
+
+        final HashMap<Integer,String> columnMap = new HashMap<>();
+
+        final CsvTableInserter inserter = new CsvTableInserter(tableName,con);
+
+        for (int i=0; i< lineElements.size(); i++){
+            //columnMap.put(i, fixStringIfItHasQuotes(elements[i].trim()) );
+            columnMap.put(i, lineElements.get(i).trim() );
+
+        }
+        Log.d(DEBUG_TAG, "Columns for the file: "+columnMap);
+        boolean first = true;
+        while((line = reader.readLine())!=null){
+            //there is a line of data
+            //elements = line.split("\n")[0].split(",");
+            if(first) Log.d(DEBUG_TAG, "Element line: "+line);
+            lineElements = readCsvLine(line);
+
+            final Map<String,String> rowsMap = getColumnsAsString(lineElements.toArray(new String[0]), columnMap);
+            if (first){
+                Log.d(DEBUG_TAG, " in map:"+rowsMap);
+                first=false;
+            }
+            inserter.addElement(rowsMap);
+        }
+
+        //commit data
+        inserter.insertDataInDatabase();
+    }
+    @NonNull
+    private static Map<String,String> getColumnsAsString(@NonNull String[] lineElements, Map<Integer,String> colsIndices)
+    {
+        final HashMap<String,String>  theMap = new HashMap<>();
+        for(int l=0; l<lineElements.length; l++){
+            if(!colsIndices.containsKey(l))
+                continue;
+            //theMap.put(colsIndices.get(l), fixStringIfItHasQuotes(lineElements[l].trim()));
+            theMap.put(colsIndices.get(l), lineElements[l].trim());
+        }
+        return theMap;
+    }
+
+    private static String fixStringIfItHasQuotes(String item) {
+        if(item.length()==0){
+            return item;
+        }
+        final String[] elements=item.split("\"");
+        /*
+        Log.d(DEBUG_TAG,"Splitting quotes length:"+elements.length);
+        for (int i=0; i<elements.length; i++){
+            Log.d(DEBUG_TAG,"Elements: "+i+" "+elements[i]);
+        }
+         */
+        if(elements.length>1){
+            //if(elements.length<3) throw new IllegalArgumentException("Malformed string");
+            return elements[1];
+        } else if(elements.length > 0)
+            return elements[0];
+        else
+            return item;
+    }
+    //https://stackoverflow.com/questions/7800494/parse-csv-with-double-quote-in-some-cases#7800519
+    public static List<String> readCsvLine(String line) throws IllegalArgumentException
+    {
+
+        List<String> list = new ArrayList<String>();
+        line += ",";
+
+        for (int x = 0; x < line.length(); x++)
+        {
+            String s = line.substring(x);
+            if (s.trim().startsWith("\""))
+            {
+                Matcher m = quotePattern.matcher(s);
+                if (!m.find()) {
+                    Log.e(DEBUG_TAG, "Cannot find pattern, "+s+" , line: "+line);
+                    throw new IllegalArgumentException("CSV is malformed");
+                }
+                list.add(m.group(1).replace("\"\"", "\""));
+                x += m.end() - 1;
+            }
+            else
+            {
+                int y = s.indexOf(",");
+                if (y == -1)
+                    throw new IllegalArgumentException("CSV is malformed");
+                list.add(s.substring(0, y));
+                x += y;
+            }
+        }
+        return list;
+    }
+}
diff --git a/src/it/reyboz/bustorino/backend/networkTools.java b/src/it/reyboz/bustorino/backend/networkTools.java
index 4856239..f0852af 100644
--- a/src/it/reyboz/bustorino/backend/networkTools.java
+++ b/src/it/reyboz/bustorino/backend/networkTools.java
@@ -1,180 +1,224 @@
 /*
 	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 <http://www.gnu.org/licenses/>.
  */
 
 package it.reyboz.bustorino.backend;
 
+import android.content.Context;
 import androidx.annotation.Nullable;
 import android.util.Log;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class networkTools {
-    static String getDOM(final URL url, final AtomicReference<Fetcher.Result> res) {
+    public static String getDOM(final URL url, final AtomicReference<Fetcher.Result> 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.SERVER_ERROR);
             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.SERVER_ERROR);
             return null;
         }
 
         res.set(Fetcher.Result.PARSER_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();
     }
+
+    public static Fetcher.Result saveFileInCache(File outputFile, URL url) {
+        HttpURLConnection urlConnection;
+        try {
+            urlConnection = (HttpURLConnection) url.openConnection();
+        } catch (IOException e) {
+            //e.printStackTrace();
+            return Fetcher.Result.CONNECTION_ERROR;
+        }
+        urlConnection.setConnectTimeout(4000);
+        urlConnection.setReadTimeout(50 * 1000);
+
+        Log.d("BusTO net Tools", "Download file "+url);
+        try (InputStream inputStream = urlConnection.getInputStream()) {
+            //File outputFile = new File(con.getFilesDir(), fileName);
+            //BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+            FileOutputStream outputStream = new FileOutputStream(outputFile);
+            byte buffer[] = new byte[16384];
+            boolean inProgress = true;
+            while(inProgress){
+                int numread = inputStream.read(buffer);
+                inProgress = (numread > 0);
+                if(inProgress) outputStream.write(buffer, 0, numread);
+            }
+            outputStream.close();
+            //while (bufferedInputStream.available())
+        } catch (IOException e) {
+            e.printStackTrace();
+            try {
+                final Fetcher.Result  res;
+                if(urlConnection.getResponseCode()==404)
+                    res= Fetcher.Result.SERVER_ERROR_404;
+                else if(urlConnection.getResponseCode()!=200)
+                    res= Fetcher.Result.SERVER_ERROR;
+                else res= Fetcher.Result.PARSER_ERROR;
+                urlConnection.disconnect();
+                return res;
+            } catch (IOException ioException) {
+                ioException.printStackTrace();
+                urlConnection.disconnect();
+                return Fetcher.Result.PARSER_ERROR;
+            }
+        }
+        urlConnection.disconnect();
+        return Fetcher.Result.OK;
+    }
     @Nullable
     static String queryURL(URL url, AtomicReference<Fetcher.Result> res){
         return queryURL(url,res,null);
     }
     @Nullable
     static String queryURL(URL url, AtomicReference<Fetcher.Result> res, Map<String,String> headers) {
         HttpURLConnection urlConnection;
         InputStream in;
         String s;
 
         try {
             urlConnection = (HttpURLConnection) url.openConnection();
         } catch(IOException e) {
             //e.printStackTrace();
             res.set(Fetcher.Result.SERVER_ERROR); // even when offline, urlConnection works fine. WHY.
             return null;
         }
 
         // TODO: make this configurable?
         urlConnection.setConnectTimeout(3000);
         urlConnection.setReadTimeout(10000);
         if(headers!= null){
             for(String key : headers.keySet()){
                 urlConnection.setRequestProperty(key,headers.get(key));
             }
         }
         res.set(Fetcher.Result.SERVER_ERROR); // will be set to OK later
 
         try {
             in = urlConnection.getInputStream();
         } catch (Exception e) {
             try {
                 if(urlConnection.getResponseCode()==404)
                     res.set(Fetcher.Result.SERVER_ERROR_404);
             } catch (IOException e2) {
                 e2.printStackTrace();
             }
             return null;
 
         }
         //s = streamToString(in);
         try {
             final long startTime = System.currentTimeMillis();
             s = parseStreamToString(in);
             final long endtime = System.currentTimeMillis();
             Log.d("NetworkTools-queryURL","reading response took "+(endtime-startTime)+" millisec");
         } catch (IOException e) {
             e.printStackTrace();
             return null;
         }
 
 
         try {
             in.close();
         } catch(IOException ignored) {
             //ignored.printStackTrace();
         }
 
         try {
             urlConnection.disconnect();
         } catch(Exception ignored) {
             //ignored.printStackTrace();
         }
 
         if(s.length() == 0) {
             Log.w("NET TOOLS", "string is empty");
             return null;
         } else {
             //Log.d("NET TOOLS", s);
             return s;
         }
     }
 
     // https://stackoverflow.com/a/5445161
     static String streamToString(InputStream is) {
         Scanner s = new Scanner(is, "UTF-8").useDelimiter("\\A");
         return s.hasNext() ? s.next() : "";
     }
 
     /**
      * New method, maybe faster, to read inputStream
      * also see https://stackoverflow.com/a/5445161
      * @param is what to read
      * @return the String Read
      * @throws IOException from the InputStreamReader
      */
     static String parseStreamToString(InputStream is) throws IOException{
         final int bufferSize = 1024;
         final char[] buffer = new char[bufferSize];
         final StringBuilder out = new StringBuilder();
         InputStreamReader in = new InputStreamReader(is, "UTF-8");
         int rsz= in.read(buffer, 0, buffer.length);
         while( rsz >0) {
             out.append(buffer, 0, rsz);
             rsz = in.read(buffer, 0, buffer.length);
         }
         return out.toString();
 
     }
 
     static int failsafeParseInt(String str) {
         try {
             return Integer.parseInt(str);
         } catch(NumberFormatException e) {
             return 0;
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/backend/utils.java b/src/it/reyboz/bustorino/backend/utils.java
index 94eb7eb..2e44bfb 100644
--- a/src/it/reyboz/bustorino/backend/utils.java
+++ b/src/it/reyboz/bustorino/backend/utils.java
@@ -1,156 +1,171 @@
 package it.reyboz.bustorino.backend;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
+import androidx.annotation.Nullable;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
+import java.util.List;
 
 public abstract class utils {
     private static final double EarthRadius = 6371e3;
     public static Double measuredistanceBetween(double lat1,double long1,double lat2,double long2){
         final double phi1 = Math.toRadians(lat1);
         final double phi2 = Math.toRadians(lat2);
 
         final double deltaPhi = Math.toRadians(lat2-lat1);
         final double deltaTheta = Math.toRadians(long2-long1);
 
         final double a = Math.sin(deltaPhi/2)*Math.sin(deltaPhi/2)+
                 Math.cos(phi1)*Math.cos(phi2)*Math.sin(deltaTheta/2)*Math.sin(deltaTheta/2);
         final double c = 2*Math.atan2(Math.sqrt(a),Math.sqrt(1-a));
 
         return Math.abs(EarthRadius*c);
 
     }
     public static Double angleRawDifferenceFromMeters(double distanceInMeters){
          return Math.toDegrees(distanceInMeters/EarthRadius);
     }
     /*
     public static int convertDipToPixels(Context con,float dips)
     {
         return (int) (dips * con.getResources().getDisplayMetrics().density + 0.5f);
     }
      */
 
     public static float convertDipToPixels(Context con, float dp){
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,con.getResources().getDisplayMetrics());
     }
     /*
     public static int calculateNumColumnsFromSize(View containerView, int pixelsize){
         int width = containerView.getWidth();
         float ncols = ((float)width)/pixelsize;
         return (int) Math.floor(ncols);
     }
      */
 
     /**
      * Check if there is an internet connection
      * @param con context object to get the system service
      * @return true if we are
      */
     public static boolean isConnected(Context con) {
         ConnectivityManager connMgr = (ConnectivityManager) con.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
         return networkInfo != null && networkInfo.isConnected();
     }
 
 
     ///////////////////// 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;
 
         // everithing catches fire when passing null to a switch.
         String host = uri.getHost();
         if (host == null) {
             Log.e("ActivityMain", "Not an URL: " + uri);
             return null;
         }
 
         switch (host) {
             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;
     }
 
     public static String toTitleCase(String givenString) {
         String[] arr = givenString.split(" ");
         StringBuffer sb = new StringBuffer();
         //Log.d("BusTO chars", "String parsing: "+givenString+" in array: "+ Arrays.toString(arr));
         for (int i = 0; i < arr.length; i++) {
             if (arr[i].length() > 1)
             sb.append(Character.toUpperCase(arr[i].charAt(0)))
                     .append(arr[i].substring(1)).append(" ");
             else sb.append(arr[i]);
         }
         return sb.toString().trim();
     }
 
 
     /**
      * Open an URL in the default browser.
      *
      * @param url URL
      */
     public static void openIceweasel(String url, Context context) {
         Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         if (browserIntent1.resolveActivity(context.getPackageManager()) != null) {
             //check we have an activity ready to receive intents (otherwise, there will be a crash)
             context.startActivity(browserIntent1);
         }
     }
 
     /**
      * Print the first i lines of the the trace of an exception
      * https://stackoverflow.com/questions/21706722/fetch-only-first-n-lines-of-a-stack-trace
      */
     /*
     public static String traceCaller(Exception ex, int i) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         StringBuilder sb = new StringBuilder();
         ex.printStackTrace(pw);
         String ss = sw.toString();
         String[] splitted = ss.split("\n");
         sb.append("\n");
         if(splitted.length > 2 + i) {
             for(int x = 2; x < i+2; x++) {
                 sb.append(splitted[x].trim());
                 sb.append("\n");
             }
             return sb.toString();
         }
         return "Trace too Short.";
     }
      */
+    public static String joinList(@Nullable List<String> dat, String separator){
+        StringBuilder sb = new StringBuilder();
+        if(dat==null || dat.size()==0)
+            return "";
+        else if(dat.size()==1)
+            return dat.get(0);
+        sb.append(dat.get(0));
+        for (int i=1; i<dat.size(); i++){
+            sb.append(separator);
+            sb.append(dat.get(i));
+        }
+        return sb.toString();
+    }
 }
diff --git a/src/it/reyboz/bustorino/data/AppRepository.java b/src/it/reyboz/bustorino/data/AppRepository.java
new file mode 100644
index 0000000..8bf5313
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/AppRepository.java
@@ -0,0 +1,23 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data;
+
+public class AppRepository {
+
+
+}
diff --git a/src/it/reyboz/bustorino/data/DBUpdateWorker.java b/src/it/reyboz/bustorino/data/DBUpdateWorker.java
index 3aaa514..9cade1b 100644
--- a/src/it/reyboz/bustorino/data/DBUpdateWorker.java
+++ b/src/it/reyboz/bustorino/data/DBUpdateWorker.java
@@ -1,138 +1,155 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.work.*;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Fetcher;
 import it.reyboz.bustorino.backend.Notifications;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static android.content.Context.MODE_PRIVATE;
 
 public class DBUpdateWorker extends Worker{
 
 
     public static final String ERROR_CODE_KEY ="Error_Code";
     public static final String ERROR_REASON_KEY = "ERROR_REASON";
     public static final int ERROR_FETCHING_VERSION = 4;
     public static final int ERROR_DOWNLOADING_STOPS = 5;
     public static final int ERROR_DOWNLOADING_LINES = 6;
 
     public static final String SUCCESS_REASON_KEY = "SUCCESS_REASON";
     public static final int SUCCESS_NO_ACTION_NEEDED = 9;
     public static final int SUCCESS_UPDATE_DONE = 1;
 
     private final int notifi_ID=62341;
 
     public static final String FORCED_UPDATE = "FORCED-UPDATE";
 
     public static final String DEBUG_TAG = "Busto-UpdateWorker";
 
 
     public DBUpdateWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
         super(context, workerParams);
     }
 
     @SuppressLint("RestrictedApi")
     @NonNull
     @Override
     public Result doWork() {
         //register Notification channel
         final Context con = getApplicationContext();
         Notifications.createDefaultNotificationChannel(con);
         final SharedPreferences shPr = con.getSharedPreferences(con.getString(R.string.mainSharedPreferences),MODE_PRIVATE);
         final int current_DB_version = shPr.getInt(DatabaseUpdate.DB_VERSION_KEY,-10);
 
         final int new_DB_version = DatabaseUpdate.getNewVersion();
 
         final boolean isUpdateCompulsory = getInputData().getBoolean(FORCED_UPDATE,false);
 
         final int notificationID = showNotification();
         Log.d(DEBUG_TAG, "Have previous version: "+current_DB_version +" and new version "+new_DB_version);
         Log.d(DEBUG_TAG, "Update compulsory: "+isUpdateCompulsory);
         if (new_DB_version < 0){
             //there has been an error
             final Data out = new Data.Builder().putInt(ERROR_REASON_KEY, ERROR_FETCHING_VERSION)
                     .putInt(ERROR_CODE_KEY,new_DB_version).build();
             cancelNotification(notificationID);
             return ListenableWorker.Result.failure(out);
         }
 
         //we got a good version
         if (current_DB_version >= new_DB_version && !isUpdateCompulsory) {
             //don't need to update
             cancelNotification(notificationID);
             return ListenableWorker.Result.success(new Data.Builder().
                     putInt(SUCCESS_REASON_KEY, SUCCESS_NO_ACTION_NEEDED).build());
         }
         //start the real update
         AtomicReference<Fetcher.Result> resultAtomicReference = new AtomicReference<>();
         DatabaseUpdate.setDBUpdatingFlag(con, shPr,true);
         final DatabaseUpdate.Result resultUpdate = DatabaseUpdate.performDBUpdate(con,resultAtomicReference);
         DatabaseUpdate.setDBUpdatingFlag(con, shPr,false);
 
         if (resultUpdate != DatabaseUpdate.Result.DONE){
             Fetcher.Result result = resultAtomicReference.get();
 
             final Data.Builder dataBuilder = new Data.Builder();
             switch (resultUpdate){
                 case ERROR_STOPS_DOWNLOAD:
                     dataBuilder.put(ERROR_REASON_KEY, ERROR_DOWNLOADING_STOPS);
                     break;
                 case ERROR_LINES_DOWNLOAD:
                     dataBuilder.put(ERROR_REASON_KEY, ERROR_DOWNLOADING_LINES);
                     break;
             }
             cancelNotification(notificationID);
             return ListenableWorker.Result.failure(dataBuilder.build());
         }
         Log.d(DEBUG_TAG, "Update finished successfully!");
         //update the version in the shared preference
         final SharedPreferences.Editor editor = shPr.edit();
         editor.putInt(DatabaseUpdate.DB_VERSION_KEY, new_DB_version);
         editor.apply();
         cancelNotification(notificationID);
 
         return ListenableWorker.Result.success(new Data.Builder().putInt(SUCCESS_REASON_KEY, SUCCESS_UPDATE_DONE).build());
     }
 
     public static Constraints getWorkConstraints(){
         return  new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED)
                     .setRequiresCharging(false).build();
     }
 
     public static WorkRequest newFirstTimeWorkRequest(){
         return new OneTimeWorkRequest.Builder(DBUpdateWorker.class)
                 .setBackoffCriteria(BackoffPolicy.LINEAR, 15, TimeUnit.SECONDS)
                 //.setInputData(new Data.Builder().putBoolean())
                 .build();
     }
 
 
     private int showNotification(){
         final NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), Notifications.DEFAULT_CHANNEL_ID)
                 .setContentTitle("Libre BusTO - Updating Database")
                 .setProgress(0,0,true)
                 .setPriority(NotificationCompat.PRIORITY_LOW);
         builder.setSmallIcon(R.drawable.ic_bus_orange);
         final NotificationManagerCompat notifcManager = NotificationManagerCompat.from(getApplicationContext());
         final  int notification_ID = 32198;
         notifcManager.notify(notification_ID,builder.build());
 
         return notification_ID;
     }
 
     private void cancelNotification(int notificationID){
         final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(getApplicationContext());
 
         notificationManager.cancel(notificationID);
     }
 }
diff --git a/src/it/reyboz/bustorino/data/DatabaseUpdate.java b/src/it/reyboz/bustorino/data/DatabaseUpdate.java
index 6e1aaad..f82245f 100644
--- a/src/it/reyboz/bustorino/data/DatabaseUpdate.java
+++ b/src/it/reyboz/bustorino/data/DatabaseUpdate.java
@@ -1,158 +1,199 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
+import androidx.core.content.ContextCompat;
+import androidx.work.*;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Fetcher;
 import it.reyboz.bustorino.backend.FiveTAPIFetcher;
 import it.reyboz.bustorino.backend.Route;
 import it.reyboz.bustorino.backend.Stop;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static android.content.Context.MODE_PRIVATE;
 
 
 public class DatabaseUpdate {
 
         public static final String DEBUG_TAG = "BusTO-DBUpdate";
         public static final int VERSION_UNAVAILABLE = -2;
         public static final int JSON_PARSING_ERROR = -4;
 
         public static final String DB_VERSION_KEY = "NextGenDB.GTTVersion";
 
         enum Result {
             DONE, ERROR_STOPS_DOWNLOAD, ERROR_LINES_DOWNLOAD
         }
 
         /**
          * Request the server the version of the database
          * @return the version of the DB, or an error code
          */
         public static int getNewVersion(){
             AtomicReference<Fetcher.Result> gres = new AtomicReference<>();
             String networkRequest = FiveTAPIFetcher.performAPIRequest(FiveTAPIFetcher.QueryType.STOPS_VERSION,null,gres);
             if(networkRequest == null){
                 return VERSION_UNAVAILABLE;
             }
 
             try {
                 JSONObject resp = new JSONObject(networkRequest);
                 return resp.getInt("id");
             } catch (JSONException e) {
                 e.printStackTrace();
                 Log.e(DEBUG_TAG,"Error: wrong JSON response\nResponse:\t"+networkRequest);
                 return JSON_PARSING_ERROR;
             }
         }
         /**
          * Run the DB Update
          * @param con a context
          * @param gres a result reference
          * @return result of the update
          */
         public static Result performDBUpdate(Context con, AtomicReference<Fetcher.Result> gres) {
 
             final FiveTAPIFetcher f = new FiveTAPIFetcher();
             final ArrayList<Stop> stops = f.getAllStopsFromGTT(gres);
             //final ArrayList<ContentProviderOperation> cpOp = new ArrayList<>();
 
             if (gres.get() != Fetcher.Result.OK) {
                 Log.w(DEBUG_TAG, "Something went wrong downloading");
                 return DatabaseUpdate.Result.ERROR_STOPS_DOWNLOAD;
 
             }
             //    return false; //If the commit to the SharedPreferences didn't succeed, simply stop updating the database
             final NextGenDB dbHelp = new NextGenDB(con.getApplicationContext());
             final SQLiteDatabase db = dbHelp.getWritableDatabase();
             //Empty the needed tables
             db.beginTransaction();
             //db.execSQL("DELETE FROM "+StopsTable.TABLE_NAME);
             //db.delete(LinesTable.TABLE_NAME,null,null);
 
             //put new data
             long startTime = System.currentTimeMillis();
 
             Log.d(DEBUG_TAG, "Inserting " + stops.size() + " stops");
             for (final Stop s : stops) {
                 final ContentValues cv = new ContentValues();
 
                 cv.put(NextGenDB.Contract.StopsTable.COL_ID, s.ID);
                 cv.put(NextGenDB.Contract.StopsTable.COL_NAME, s.getStopDefaultName());
                 if (s.location != null)
                     cv.put(NextGenDB.Contract.StopsTable.COL_LOCATION, s.location);
                 cv.put(NextGenDB.Contract.StopsTable.COL_LAT, s.getLatitude());
                 cv.put(NextGenDB.Contract.StopsTable.COL_LONG, s.getLongitude());
                 if (s.getAbsurdGTTPlaceName() != null) cv.put(NextGenDB.Contract.StopsTable.COL_PLACE, s.getAbsurdGTTPlaceName());
                 cv.put(NextGenDB.Contract.StopsTable.COL_LINES_STOPPING, s.routesThatStopHereToString());
                 if (s.type != null) cv.put(NextGenDB.Contract.StopsTable.COL_TYPE, s.type.getCode());
 
                 //Log.d(DEBUG_TAG,cv.toString());
                 //cpOp.add(ContentProviderOperation.newInsert(uritobeused).withValues(cv).build());
                 //valuesArr[i] = cv;
                 db.replace(NextGenDB.Contract.StopsTable.TABLE_NAME, null, cv);
 
             }
             db.setTransactionSuccessful();
             db.endTransaction();
             long endTime = System.currentTimeMillis();
             Log.d(DEBUG_TAG, "Inserting stops took: " + ((double) (endTime - startTime) / 1000) + " s");
 
             final ArrayList<Route> routes = f.getAllLinesFromGTT(gres);
 
             if (routes == null) {
                 Log.w(DEBUG_TAG, "Something went wrong downloading the lines");
                 dbHelp.close();
                 return DatabaseUpdate.Result.ERROR_LINES_DOWNLOAD;
 
             }
 
             db.beginTransaction();
             startTime = System.currentTimeMillis();
             for (Route r : routes) {
                 final ContentValues cv = new ContentValues();
                 cv.put(NextGenDB.Contract.LinesTable.COLUMN_NAME, r.getName());
                 switch (r.type) {
                     case BUS:
                         cv.put(NextGenDB.Contract.LinesTable.COLUMN_TYPE, "URBANO");
                         break;
                     case RAILWAY:
                         cv.put(NextGenDB.Contract.LinesTable.COLUMN_TYPE, "FERROVIA");
                         break;
                     case LONG_DISTANCE_BUS:
                         cv.put(NextGenDB.Contract.LinesTable.COLUMN_TYPE, "EXTRA");
                         break;
                 }
                 cv.put(NextGenDB.Contract.LinesTable.COLUMN_DESCRIPTION, r.description);
 
                 //db.insert(LinesTable.TABLE_NAME,null,cv);
                 int rows = db.update(NextGenDB.Contract.LinesTable.TABLE_NAME, cv, NextGenDB.Contract.LinesTable.COLUMN_NAME + " = ?", new String[]{r.getName()});
                 if (rows < 1) { //we haven't changed anything
                     db.insert(NextGenDB.Contract.LinesTable.TABLE_NAME, null, cv);
                 }
             }
             db.setTransactionSuccessful();
             db.endTransaction();
             endTime = System.currentTimeMillis();
             Log.d(DEBUG_TAG, "Inserting lines took: " + ((double) (endTime - startTime) / 1000) + " s");
             dbHelp.close();
 
             return DatabaseUpdate.Result.DONE;
         }
 
     public static boolean setDBUpdatingFlag(Context con, boolean value){
         final SharedPreferences shPr = con.getSharedPreferences(con.getString(R.string.mainSharedPreferences),MODE_PRIVATE);
         return setDBUpdatingFlag(con, shPr, value);
     }
     static boolean setDBUpdatingFlag(Context con, SharedPreferences shPr,boolean value){
         final SharedPreferences.Editor editor = shPr.edit();
         editor.putBoolean(con.getString(R.string.databaseUpdatingPref),value);
         return editor.commit();
     }
+
+    /**
+     * Request update using workmanager framework
+     * @param con the context to use
+     * @param forced if you want to force the request to go now
+     */
+    public static void requestDBUpdateWithWork(Context con, boolean forced){
+        final SharedPreferences theShPr = PreferencesHolder.getMainSharedPreferences(con);
+        final WorkManager workManager = WorkManager.getInstance(con);
+        PeriodicWorkRequest wr = new PeriodicWorkRequest.Builder(DBUpdateWorker.class, 1, TimeUnit.DAYS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
+                .setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED)
+                        .build())
+                .build();
+        final int version = theShPr.getInt(DatabaseUpdate.DB_VERSION_KEY, -10);
+        if (version >= 0 && !forced)
+            workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
+                    ExistingPeriodicWorkPolicy.KEEP, wr);
+        else workManager.enqueueUniquePeriodicWork(DBUpdateWorker.DEBUG_TAG,
+                ExistingPeriodicWorkPolicy.REPLACE, wr);
+    }
 }
diff --git a/src/it/reyboz/bustorino/data/FavoritesLiveData.java b/src/it/reyboz/bustorino/data/FavoritesLiveData.java
index 863c961..4ca1149 100644
--- a/src/it/reyboz/bustorino/data/FavoritesLiveData.java
+++ b/src/it/reyboz/bustorino/data/FavoritesLiveData.java
@@ -1,197 +1,214 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data;
 
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Handler;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import androidx.lifecycle.LiveData;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import it.reyboz.bustorino.BuildConfig;
 import it.reyboz.bustorino.backend.Stop;
 
 public class FavoritesLiveData extends LiveData<List<Stop>> implements CustomAsyncQueryHandler.AsyncQueryListener {
     private static final String TAG = "FavoritesLiveData";
     private final boolean notifyChangesDescendants;
 
 
     @NonNull
     private final Context mContext;
 
     @NonNull
     private final FavoritesLiveData.ForceLoadContentObserver mObserver;
     private final CustomAsyncQueryHandler queryHandler;
 
 
     private final Uri FAVORITES_URI = AppDataProvider.getUriBuilderToComplete().appendPath(
                 AppDataProvider.FAVORITES).build();
 
 
     private final int FAV_TOKEN = 23, STOPS_TOKEN_BASE=220;
 
 
     @Nullable
     private List<Stop> stopsFromFavorites, stopsDone;
 
     private boolean isQueryRunning = false;
     private int stopNeededCount = 0;
 
     public FavoritesLiveData(@NonNull Context context, boolean notifyDescendantsChanges) {
         super();
         mContext = context.getApplicationContext();
         mObserver = new FavoritesLiveData.ForceLoadContentObserver();
         notifyChangesDescendants = notifyDescendantsChanges;
         queryHandler = new CustomAsyncQueryHandler(mContext.getContentResolver(),this);
 
     }
 
     private void loadData() {
         loadData(false);
     }
     private static Uri.Builder getStopsBuilder(){
         return AppDataProvider.getUriBuilderToComplete().appendPath("stop");
 
     }
 
     private void loadData(boolean forceQuery) {
         Log.d(TAG, "loadData()");
 
         if (!forceQuery){
             if (getValue()!= null){
                 //Data already loaded
                 return;
             }
         }
         if (isQueryRunning){
             //we are waiting for data, we will get an update soon
             return;
         }
 
         isQueryRunning = true;
         queryHandler.startQuery(FAV_TOKEN,null, FAVORITES_URI, UserDB.getFavoritesColumnNamesAsArray, null, null, null);
 
 
     }
 
     @Override
     protected void onActive() {
         //Log.d(TAG, "onActive()");
         loadData();
     }
 
     /**
      * Clear the data for the cursor
      */
     public void onClear(){
 
         ContentResolver resolver = mContext.getContentResolver();
         resolver.unregisterContentObserver(mObserver);
 
     }
 
 
     @Override
     protected void setValue(List<Stop> stops) {
         //Log.d("BusTO-FavoritesLiveData","Setting the new values for the stops, have "+
         //       stops.size()+" stops");
 
         ContentResolver resolver = mContext.getContentResolver();
         resolver.registerContentObserver(FAVORITES_URI, notifyChangesDescendants,mObserver);
 
         super.setValue(stops);
     }
 
     @Override
     public void onQueryComplete(int token, Object cookie, Cursor cursor) {
         if (token == FAV_TOKEN) {
             stopsFromFavorites = UserDB.getFavoritesFromCursor(cursor, UserDB.getFavoritesColumnNamesAsArray);
             cursor.close();
             //reset counters
             stopNeededCount = stopsFromFavorites.size();
             stopsDone = new ArrayList<>();
             if(stopsFromFavorites.size() == 0){
                 //we don't need to call the other query
                 setValue(stopsDone);
             } else
                 for (int i = 0; i < stopsFromFavorites.size(); i++) {
                     Stop s = stopsFromFavorites.get(i);
                     queryHandler.startQuery(STOPS_TOKEN_BASE + i, null,
                             getStopsBuilder().appendPath(s.ID).build(),
                             NextGenDB.QUERY_COLUMN_stops_all, null, null, null);
             }
 
 
 
         } else if(token >= STOPS_TOKEN_BASE){
             final int index = token - STOPS_TOKEN_BASE;
             assert stopsFromFavorites != null;
             Stop stopUpdate = stopsFromFavorites.get(index);
             Stop finalStop;
 
             List<Stop> result = Arrays.asList(NextGenDB.getStopsFromCursorAllFields(cursor));
             cursor.close();
             if (result.size() < 1){
                 // stop is not in the DB
                 finalStop = stopUpdate;
             } else {
                 finalStop = result.get(0);
                 if (BuildConfig.DEBUG && !(finalStop.ID.equals(stopUpdate.ID))) {
                     throw new AssertionError("Assertion failed");
                 }
                 finalStop.setStopUserName(stopUpdate.getStopUserName());
             }
             if (stopsDone!=null)
                 stopsDone.add(finalStop);
 
             stopNeededCount--;
             if (stopNeededCount == 0) {
                 // we have finished the queries
                 isQueryRunning = false;
                 Collections.sort(stopsDone);
 
                 setValue(stopsDone);
             }
 
         }
     }
 
 
     /**
      * Content Observer that forces reload of cursor when data changes
      * On different thread (new Handler)
      */
     public final class ForceLoadContentObserver
             extends ContentObserver {
 
         public ForceLoadContentObserver() {
             super(new Handler());
         }
 
         @Override
         public boolean deliverSelfNotifications() {
             return true;
         }
 
         @Override
         public void onChange(boolean selfChange) {
             Log.d(TAG, "ForceLoadContentObserver.onChange()");
             loadData(true);
         }
 
     }
 
 
 }
 
diff --git a/src/it/reyboz/bustorino/data/GTTInfoInject.java b/src/it/reyboz/bustorino/data/GTTInfoInject.java
index 7bab9aa..ab101e6 100644
--- a/src/it/reyboz/bustorino/data/GTTInfoInject.java
+++ b/src/it/reyboz/bustorino/data/GTTInfoInject.java
@@ -1,91 +1,108 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data;
 
 import java.util.Locale;
 
 /**
  * We need this class as !!TEMPORARY!! fix
  * To supply data which is not available by the GTT APIs anymore
  */
 public abstract class GTTInfoInject {
 
     public static String findIDWhenMissingByName(String stopName){
         String stringSwitch = stopName.toUpperCase(Locale.ROOT).trim();
         //if (stringSwitch.contains("METRO")){
         String finalID;
         switch (stringSwitch){
             case "METRO FERMI":
                 finalID="8210";
                 break;
             case "METRO PARADISO":
                 finalID="8211";
                 break;
             case "METRO MARCHE":
                 finalID="8212";
                 break;
             case "METRO MASSAUA":
                 finalID="8213";
                 break;
             case "METRO POZZO STRADA":
                 finalID="8214";
                 break;
             case "METRO MONTE GRAPPA":
                 finalID="8215";
                 break;
             case "METRO RIVOLI":
                 finalID="8216";
                 break;
             case "METRO RACCONIGI":
                 finalID="8217";
                 break;
             case "METRO BERNINI":
                 finalID="8218";
                 break;
             case "METRO PRINCIPI ACAJA":
                 finalID="8219";
                 break;
             case "METRO XVIII DICEMBRE":
                 finalID="8220";
                 break;
             case "METRO PORTA SUSA":
                 finalID="8221";
                 break;
             case "METRO VINZAGLIO":
                 finalID="8222";
                 break;
             case "METRO RE UMBERTO":
                 finalID="8223";
                 break;
             case "METRO PORTA NUOVA":
                 finalID="8224";
                 break;
             case "METRO MARCONI":
                 finalID="8225";
                 break;
             case "METRO NIZZA":
                 finalID="8226";
                 break;
             case "METRO DANTE":
                 finalID="8227";
                 break;
             case "METRO CARDUCCI":
                 finalID="8228";
                 break;
             case "METRO SPEZIA":
                 finalID="8229";
                 break;
             case "METRO LINGOTTO":
                 finalID="8230";
                 break;
             case "METRO ITALIA 61":
             case "METRO ITALIA61":
                 finalID="8231";
                 break;
             case "METRO BENGASI":
                 finalID="8232";
                 break;
             default:
                 finalID="";
         }
         return finalID;
     }
 }
diff --git a/src/it/reyboz/bustorino/data/NextGenDB.java b/src/it/reyboz/bustorino/data/NextGenDB.java
index a0781eb..490ed20 100644
--- a/src/it/reyboz/bustorino/data/NextGenDB.java
+++ b/src/it/reyboz/bustorino/data/NextGenDB.java
@@ -1,355 +1,355 @@
 /*
 	BusTO (middleware)
     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.data;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 import android.util.Log;
 
 import it.reyboz.bustorino.backend.Route;
 import it.reyboz.bustorino.backend.Stop;
 
 import java.util.*;
 
 import static it.reyboz.bustorino.data.NextGenDB.Contract.*;
 
 public class NextGenDB extends SQLiteOpenHelper{
     public static final String DATABASE_NAME = "bustodatabase.db";
     public static final int DATABASE_VERSION = 2;
     public static final String DEBUG_TAG = "NextGenDB-BusTO";
     //NO Singleton instance
     //private static volatile NextGenDB instance = null;
     //Some generating Strings
     private static final String SQL_CREATE_LINES_TABLE="CREATE TABLE "+Contract.LinesTable.TABLE_NAME+" ("+
             Contract.LinesTable._ID +" INTEGER PRIMARY KEY AUTOINCREMENT, "+ Contract.LinesTable.COLUMN_NAME +" TEXT, "+
             Contract.LinesTable.COLUMN_DESCRIPTION +" TEXT, "+Contract.LinesTable.COLUMN_TYPE +" TEXT, "+
             "UNIQUE ("+LinesTable.COLUMN_NAME+","+LinesTable.COLUMN_DESCRIPTION+","+LinesTable.COLUMN_TYPE+" ) "+" )";
 
     private static final String SQL_CREATE_BRANCH_TABLE="CREATE TABLE "+Contract.BranchesTable.TABLE_NAME+" ("+
             Contract.BranchesTable._ID +" INTEGER, "+ Contract.BranchesTable.COL_BRANCHID +" INTEGER PRIMARY KEY, "+
             Contract.BranchesTable.COL_LINE +" INTEGER, "+ Contract.BranchesTable.COL_DESCRIPTION +" TEXT, "+
             Contract.BranchesTable.COL_DIRECTION+" TEXT, "+ Contract.BranchesTable.COL_TYPE +" INTEGER, "+
             //SERVICE DAYS: 0 => FERIALE,1=>FESTIVO,-1=>UNKNOWN,add others if necessary
             Contract.BranchesTable.COL_FESTIVO +" INTEGER, "+
             //DAYS COLUMNS. IT'S SO TEDIOUS I TRIED TO KILL MYSELF
             BranchesTable.COL_LUN+" INTEGER, "+BranchesTable.COL_MAR+" INTEGER, "+BranchesTable.COL_MER+" INTEGER, "+BranchesTable.COL_GIO+" INTEGER, "+
             BranchesTable.COL_VEN+" INTEGER, "+ BranchesTable.COL_SAB+" INTEGER, "+BranchesTable.COL_DOM+" INTEGER, "+
             "FOREIGN KEY("+ Contract.BranchesTable.COL_LINE +") references "+ Contract.LinesTable.TABLE_NAME+"("+ Contract.LinesTable._ID+") "
             +")";
     private static final String SQL_CREATE_CONNECTIONS_TABLE="CREATE TABLE "+Contract.ConnectionsTable.TABLE_NAME+" ("+
             Contract.ConnectionsTable.COLUMN_BRANCH+" INTEGER, "+ Contract.ConnectionsTable.COLUMN_STOP_ID+" TEXT, "+
             Contract.ConnectionsTable.COLUMN_ORDER+" INTEGER, "+
             "PRIMARY KEY ("+ Contract.ConnectionsTable.COLUMN_BRANCH+","+ Contract.ConnectionsTable.COLUMN_STOP_ID + "), "+
             "FOREIGN KEY("+ Contract.ConnectionsTable.COLUMN_BRANCH+") references "+ Contract.BranchesTable.TABLE_NAME+"("+ Contract.BranchesTable.COL_BRANCHID +"), "+
             "FOREIGN KEY("+ Contract.ConnectionsTable.COLUMN_STOP_ID+") references "+ Contract.StopsTable.TABLE_NAME+"("+ Contract.StopsTable.COL_ID +") "
             +")";
     private static final String SQL_CREATE_STOPS_TABLE="CREATE TABLE "+Contract.StopsTable.TABLE_NAME+" ("+
             Contract.StopsTable.COL_ID+" TEXT PRIMARY KEY, "+ Contract.StopsTable.COL_TYPE+" INTEGER, "+Contract.StopsTable.COL_LAT+" REAL NOT NULL, "+
             Contract.StopsTable.COL_LONG+" REAL NOT NULL, "+ Contract.StopsTable.COL_NAME+" TEXT NOT NULL, "+
             Contract.StopsTable.COL_LOCATION+" TEXT, "+Contract.StopsTable.COL_PLACE+" TEXT, "+
             Contract.StopsTable.COL_LINES_STOPPING +" TEXT )";
 
     private static final String SQL_CREATE_STOPS_TABLE_TO_COMPLETE = " ("+
             Contract.StopsTable.COL_ID+" TEXT PRIMARY KEY, "+ Contract.StopsTable.COL_TYPE+" INTEGER, "+Contract.StopsTable.COL_LAT+" REAL NOT NULL, "+
             Contract.StopsTable.COL_LONG+" REAL NOT NULL, "+ Contract.StopsTable.COL_NAME+" TEXT NOT NULL, "+
             Contract.StopsTable.COL_LOCATION+" TEXT, "+Contract.StopsTable.COL_PLACE+" TEXT, "+
             Contract.StopsTable.COL_LINES_STOPPING +" TEXT )";
 
     public static final String[] QUERY_COLUMN_stops_all = {
             StopsTable.COL_ID, StopsTable.COL_NAME, StopsTable.COL_LOCATION,
             StopsTable.COL_TYPE, StopsTable.COL_LAT, StopsTable.COL_LONG, StopsTable.COL_LINES_STOPPING};
 
     public static final String QUERY_WHERE_LAT_AND_LNG_IN_RANGE = StopsTable.COL_LAT + " >= ? AND " +
             StopsTable.COL_LAT + " <= ? AND "+ StopsTable.COL_LONG +
             " >= ? AND "+ StopsTable.COL_LONG + " <= ?";
 
     public static String QUERY_WHERE_ID = StopsTable.COL_ID+" = ?";
 
 
     private final Context appContext;
 
     public NextGenDB(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
         appContext = context.getApplicationContext();
     }
 
 
     @Override
     public void onCreate(SQLiteDatabase db) {
         Log.d("BusTO-AppDB","Lines creating database:\n"+SQL_CREATE_LINES_TABLE+"\n"+
         SQL_CREATE_STOPS_TABLE+"\n"+SQL_CREATE_BRANCH_TABLE+"\n"+SQL_CREATE_CONNECTIONS_TABLE);
         db.execSQL(SQL_CREATE_LINES_TABLE);
 
         db.execSQL(SQL_CREATE_STOPS_TABLE);
         //tables with constraints
         db.execSQL(SQL_CREATE_BRANCH_TABLE);
         db.execSQL(SQL_CREATE_CONNECTIONS_TABLE);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
 
         if(oldVersion<2 && newVersion == 2){
             //DROP ALL TABLES
             db.execSQL("DROP TABLE "+ConnectionsTable.TABLE_NAME);
             db.execSQL("DROP TABLE "+BranchesTable.TABLE_NAME);
             db.execSQL("DROP TABLE "+LinesTable.TABLE_NAME);
             db.execSQL("DROP TABLE "+ StopsTable.TABLE_NAME);
             //RECREATE THE TABLES WITH THE NEW SCHEMA
             db.execSQL(SQL_CREATE_LINES_TABLE);
             db.execSQL(SQL_CREATE_STOPS_TABLE);
             //tables with constraints
             db.execSQL(SQL_CREATE_BRANCH_TABLE);
             db.execSQL(SQL_CREATE_CONNECTIONS_TABLE);
 
-            DatabaseUpdateService.startDBUpdate(appContext,0,true);
+            DatabaseUpdate.requestDBUpdateWithWork(appContext, true);
         }
     }
 
     @Override
     public void onConfigure(SQLiteDatabase db) {
         super.onConfigure(db);
         db.execSQL("PRAGMA foreign_keys=ON");
 
     }
 
     public static String getSqlCreateStopsTable(String tableName){
 
         return "CREATE TABLE "+tableName+" ("+
                 Contract.StopsTable.COL_ID+" TEXT PRIMARY KEY, "+ Contract.StopsTable.COL_TYPE+" INTEGER, "+Contract.StopsTable.COL_LAT+" REAL NOT NULL, "+
                 Contract.StopsTable.COL_LONG+" REAL NOT NULL, "+ Contract.StopsTable.COL_NAME+" TEXT NOT NULL, "+
                 Contract.StopsTable.COL_LOCATION+" TEXT, "+Contract.StopsTable.COL_PLACE+" TEXT, "+
                 Contract.StopsTable.COL_LINES_STOPPING +" TEXT )";
     }
 
     /**
      * Query some bus stops inside a map view
      *
      * You can obtain the coordinates from OSMDroid using something like this:
      *  BoundingBoxE6 bb = mMapView.getBoundingBox();
      *  double latFrom = bb.getLatSouthE6() / 1E6;
      *  double latTo = bb.getLatNorthE6() / 1E6;
      *  double lngFrom = bb.getLonWestE6() / 1E6;
      *  double lngTo = bb.getLonEastE6() / 1E6;
      */
     public synchronized Stop[] queryAllInsideMapView(double minLat, double maxLat, double minLng, double maxLng) {
         Stop[] stops = new Stop[0];
         SQLiteDatabase db = this.getReadableDatabase();
 
         //Cursor result=null;
         int count;
 
         // coordinates must be strings in the where condition
         String minLatRaw = String.valueOf(minLat);
         String maxLatRaw = String.valueOf(maxLat);
         String minLngRaw = String.valueOf(minLng);
         String maxLngRaw = String.valueOf(maxLng);
 
 
         if(db == null) {
             return stops;
         }
 
         try {
             final Cursor result = db.query(StopsTable.TABLE_NAME, QUERY_COLUMN_stops_all, QUERY_WHERE_LAT_AND_LNG_IN_RANGE,
                     new String[] {minLatRaw, maxLatRaw, minLngRaw, maxLngRaw},
                     null, null, null);
             stops = getStopsFromCursorAllFields(result);
             result.close();
         } catch(SQLiteException e) {
             Log.e(DEBUG_TAG, "SQLiteException occurred");
             e.printStackTrace();
             return stops;
         }finally {
             db.close();
         }
 
         return stops;
     }
 
     /**
      * Get the list of stop in the query, with all the possible fields {NextGenDB.QUERY_COLUMN_stops_all}
      * @param result cursor from query
      * @return an Array of the stops found in the query
      */
     public static Stop[] getStopsFromCursorAllFields(Cursor result){
         int colID = result.getColumnIndex(StopsTable.COL_ID);
         int colName = result.getColumnIndex(StopsTable.COL_NAME);
         int colLocation = result.getColumnIndex(StopsTable.COL_LOCATION);
         int colType = result.getColumnIndex(StopsTable.COL_TYPE);
         int colLat = result.getColumnIndex(StopsTable.COL_LAT);
         int colLon = result.getColumnIndex(StopsTable.COL_LONG);
         int colLines = result.getColumnIndex(StopsTable.COL_LINES_STOPPING);
 
         int count = result.getCount();
         Stop[] stops = new Stop[count];
 
         int i = 0;
         while(result.moveToNext()) {
 
             final String stopID = result.getString(colID).trim();
             final Route.Type type = Route.getTypeFromSymbol(result.getString(colType));
             String lines = result.getString(colLines).trim();
 
             String locationSometimesEmpty = result.getString(colLocation);
             if (locationSometimesEmpty!= null && locationSometimesEmpty.length() <= 0) {
                 locationSometimesEmpty = null;
             }
 
             stops[i++] = new Stop(stopID, result.getString(colName), null,
                     locationSometimesEmpty, type, splitLinesString(lines),
                     result.getDouble(colLat), result.getDouble(colLon));
         }
         return stops;
     }
 
     /**
      * Insert batch content, already prepared as
      * @param content ContentValues array
      * @return number of lines inserted
      */
     public int insertBatchContent(ContentValues[] content,String tableName) throws SQLiteException {
 
         final SQLiteDatabase db = this.getWritableDatabase();
         int success = 0;
 
         db.beginTransaction();
 
         for (final ContentValues cv : content) {
             try {
                 db.replaceOrThrow(tableName, null, cv);
                 success++;
             } catch (SQLiteConstraintException d){
                 Log.w("NextGenDB_Insert","Failed insert with FOREIGN KEY... \n"+d.getMessage());
 
             } catch (Exception e) {
                 Log.w("NextGenDB_Insert", e);
             }
         }
         db.setTransactionSuccessful();
         db.endTransaction();
         return success;
     }
 
     public static List<String> splitLinesString(String linesStr){
         return Arrays.asList(linesStr.split("\\s*,\\s*"));
     }
 
     public static final class Contract{
         //Ok, I get it, it really is a pain in the ass..
         // But it's the only way to have maintainable code
         public interface DataTables {
             String getTableName();
             String[] getFields();
         }
 
         public static final class LinesTable implements BaseColumns, DataTables {
             //The fields
             public static final String TABLE_NAME = "lines";
             public static final String COLUMN_NAME = "line_name";
             public static final String COLUMN_DESCRIPTION = "line_description";
             public static final String COLUMN_TYPE = "line_bacino";
 
             @Override
             public String getTableName() {
                 return TABLE_NAME;
             }
 
             @Override
             public String[] getFields() {
                 return new String[]{COLUMN_NAME,COLUMN_DESCRIPTION,COLUMN_TYPE};
             }
         }
         public static final class BranchesTable implements BaseColumns, DataTables {
             public static final String TABLE_NAME = "branches";
             public static final String COL_BRANCHID = "branchid";
             public static final String COL_LINE = "lineid";
             public static final String COL_DESCRIPTION = "branch_description";
             public static final String COL_DIRECTION = "branch_direzione";
             public static final String COL_FESTIVO = "branch_festivo";
             public static final String COL_TYPE = "branch_type";
             public static final String COL_LUN="runs_lun";
             public static final String COL_MAR="runs_mar";
             public static final String COL_MER="runs_mer";
             public static final String COL_GIO="runs_gio";
             public static final String COL_VEN="runs_ven";
             public static final String COL_SAB="runs_sab";
             public static final String COL_DOM="runs_dom";
 
             @Override
             public String getTableName() {
                 return TABLE_NAME;
             }
             @Override
             public String[] getFields() {
                 return new String[]{COL_BRANCHID,COL_LINE,COL_DESCRIPTION,
                         COL_DIRECTION,COL_FESTIVO,COL_TYPE,
                         COL_LUN,COL_MAR,COL_MER,COL_GIO,COL_VEN,COL_SAB,COL_DOM
                 };
             }
 
         }
         public static final class ConnectionsTable implements DataTables {
             public static final String TABLE_NAME = "connections";
             public static final String COLUMN_BRANCH = "branchid";
             public static final String COLUMN_STOP_ID = "stopid";
             public static final String COLUMN_ORDER = "ordine";
 
             @Override
             public String getTableName() {
                 return TABLE_NAME;
             }
             @Override
             public String[] getFields() {
                 return new String[]{COLUMN_STOP_ID,COLUMN_BRANCH,COLUMN_ORDER};
             }
         }
         public static final class StopsTable implements DataTables {
             public static final String TABLE_NAME = "stops";
             public static final String COL_ID = "stopid"; //integer
             public static final String COL_TYPE = "stop_type";
             public static final String COL_NAME = "stop_name";
             public static final String COL_LAT = "stop_latitude";
             public static final String COL_LONG = "stop_longitude";
             public static final String COL_LOCATION = "stop_location";
             public static final String COL_PLACE = "stop_placeName";
             public static final String COL_LINES_STOPPING = "stop_lines";
 
             @Override
             public String getTableName() {
                 return TABLE_NAME;
             }
             @Override
             public String[] getFields() {
                 return new String[]{COL_ID,COL_TYPE,COL_NAME,COL_LAT,COL_LONG,COL_LOCATION,COL_PLACE,COL_LINES_STOPPING};
             }
         }
     }
 
     public static final class DBUpdatingException extends Exception{
         public DBUpdatingException(String message) {
             super(message);
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/data/PreferencesHolder.java b/src/it/reyboz/bustorino/data/PreferencesHolder.java
new file mode 100644
index 0000000..221f039
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/PreferencesHolder.java
@@ -0,0 +1,34 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import it.reyboz.bustorino.R;
+
+import static android.content.Context.MODE_PRIVATE;
+
+/**
+ * Static class for commonly used SharedPreference operations
+ */
+public abstract class PreferencesHolder {
+
+    public static SharedPreferences getMainSharedPreferences(Context context){
+        return context.getSharedPreferences(context.getString(R.string.mainSharedPreferences), MODE_PRIVATE);
+    }
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/Converters.kt b/src/it/reyboz/bustorino/data/gtfs/Converters.kt
new file mode 100644
index 0000000..1440c25
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/Converters.kt
@@ -0,0 +1,103 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.TypeConverter
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ * Class to convert values for objects into
+ * the needed columns
+ *
+ * handled automatically by Room with TypeConverter
+ */
+class Converters {
+
+
+    @TypeConverter
+    fun fromString(value: String?): Date? {
+        return dateFromFmtString(value)
+    }
+
+    @TypeConverter
+    fun dateToString(date: Date?): String? {
+        return date?.let { stringFormat.format(it)}
+    }
+
+    @TypeConverter
+    fun exceptionToInt(type: GtfsServiceDate.ExceptionType?): Int? {
+        return type?.value
+    }
+    @TypeConverter
+    fun fromInt(value: Int?): GtfsServiceDate.ExceptionType? {
+        return value?.let { GtfsServiceDate.ExceptionType.getByValue(it) }
+    }
+
+    companion object{
+        const val DATE_FMT_STRING = "yyyyMMdd"
+        val stringFormat = SimpleDateFormat(DATE_FMT_STRING, Locale.US)
+
+        fun fromStringNum(string:  String?): Boolean?{
+            string?.let { if (it.trim() == "1")
+                return true
+            else if(it.trim() == "0")
+                return false
+            else throw Exception("Cannot convert $string to numeric value") }
+            return null
+
+        }
+        fun fromStringNum(string:  String?, defaultVal: Boolean): Boolean{
+            string?.let { if (it.trim() == "1")
+                return true
+            else if(it.trim() == "0")
+                return false
+            else return defaultVal }
+            return defaultVal
+
+        }
+        fun dateFromFmtString(value: String?): Date?{
+            return value?.let {
+
+                stringFormat.parse(it)
+            }
+        }
+
+        fun wheelchairFromString(string:  String?): GtfsStop.WheelchairAccess?{
+            string?.let { if (it.trim() == "1")
+                return GtfsStop.WheelchairAccess.SOMETIMES
+            else if(it.trim() == "0")
+                return GtfsStop.WheelchairAccess.UNKNOWN
+            else if(it.trim() == "2")
+                return GtfsStop.WheelchairAccess.IMPOSSIBLE
+            else //throw Exception("Cannot convert $string to wheelchair access") }
+            return GtfsStop.WheelchairAccess.UNKNOWN
+
+        }
+            return null
+        }
+        @TypeConverter
+        fun wheelchairToInt(access:GtfsStop.WheelchairAccess): Int{
+           return  access.value;
+        }
+        @TypeConverter
+        fun wheelchairFromInt(value: Int): GtfsStop.WheelchairAccess{
+            return  GtfsStop.WheelchairAccess.getByValue(value)?: GtfsStop.WheelchairAccess.UNKNOWN
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt b/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt
new file mode 100644
index 0000000..0bf96e4
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/CsvTableInserter.kt
@@ -0,0 +1,82 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import android.content.Context
+import android.util.Log
+import java.util.ArrayList
+
+class CsvTableInserter(
+    val tableName: String, context: Context
+) {
+    private val database: GtfsDatabase = GtfsDatabase.getGtfsDatabase(context)
+    private val dao: StaticGtfsDao = database.gtfsDao()
+
+    private val elementsList: MutableList< in GtfsTable> = mutableListOf()
+
+    fun addElement(csvLineElements: Map<String,String>) {
+
+        when(tableName){
+            "stops" ->
+                elementsList.add(GtfsStop(csvLineElements))
+            "routes" ->
+                elementsList.add(GtfsRoute(csvLineElements))
+            "calendar" ->
+                elementsList.add(GtfsService(csvLineElements))
+            "calendar_dates" ->
+                elementsList.add(GtfsServiceDate(csvLineElements))
+            "trips" ->
+                elementsList.add(GtfsTrip(csvLineElements))
+            "shapes" ->
+                elementsList.add(GtfsShape(csvLineElements))
+            "stop_times" ->
+                elementsList.add(GtfsStopTime(csvLineElements))
+
+
+        }
+        if(elementsList.size >= MAX_ELEMENTS){
+            //have to insert
+            Log.d(DEBUG_TAG, "Inserting first batch of elements now, list size: "+elementsList.size)
+            if (tableName == "routes")
+                dao.insertRoutes(elementsList.filterIsInstance<GtfsRoute>())
+            else
+                insertDataInDatabase()
+
+            elementsList.clear()
+
+        }
+    }
+    fun insertDataInDatabase(){
+        when(tableName){
+            "stops" -> dao.updateStops(elementsList.filterIsInstance<GtfsStop>())
+            "routes" -> dao.clearAndInsertRoutes(elementsList.filterIsInstance<GtfsRoute>())
+            "calendar" -> dao.insertServices(elementsList.filterIsInstance<GtfsService>())
+            "calendar_dates" -> dao.insertDates(elementsList.filterIsInstance<GtfsServiceDate>())
+            "trips" -> dao.insertTrips(elementsList.filterIsInstance<GtfsTrip>())
+            "stop_times"-> dao.insertStopTimes(elementsList.filterIsInstance<GtfsStopTime>())
+            "shapes" -> dao.insertShapes(elementsList.filterIsInstance<GtfsShape>())
+
+        }
+    }
+
+    companion object{
+        val MAX_ELEMENTS = 5000
+
+        val DEBUG_TAG="BusTO - TableInserter"
+    }
+}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
new file mode 100644
index 0000000..4ac09c6
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
@@ -0,0 +1,57 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import android.content.Context
+import androidx.room.*
+
+@Database(
+    entities = [
+        GtfsServiceDate::class,
+        GtfsStop::class,
+        GtfsService::class,
+        GtfsRoute::class,
+        GtfsStopTime::class,
+        GtfsTrip::class,
+        GtfsShape::class],
+    version = GtfsDatabase.VERSION,
+    exportSchema = false,
+)
+@TypeConverters(Converters::class)
+public abstract class GtfsDatabase : RoomDatabase() {
+
+    abstract fun gtfsDao() : StaticGtfsDao
+
+    companion object{
+        @Volatile
+        private var INSTANCE: GtfsDatabase? =null
+
+        fun getGtfsDatabase(context: Context): GtfsDatabase{
+            return INSTANCE ?: synchronized(this){
+                val instance = Room.databaseBuilder(context.applicationContext,
+                GtfsDatabase::class.java,
+                "gtfs_database").build()
+                INSTANCE = instance
+                instance
+            }
+        }
+
+        const val VERSION = 1
+        const val FOREIGNKEY_ONDELETE = ForeignKey.NO_ACTION
+    }
+}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt
new file mode 100644
index 0000000..fef6167
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsRoute.kt
@@ -0,0 +1,79 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName=GtfsRoute.DB_TABLE)
+data class GtfsRoute(
+    @PrimaryKey @ColumnInfo(name = COL_ROUTE_ID)
+    val ID: String,
+    @ColumnInfo(name = "agency_id")
+    val agencyID: String,
+    @ColumnInfo(name = "route_short_name")
+    val shortName: String,
+    @ColumnInfo(name = "route_long_name")
+    val longName: String,
+    @ColumnInfo(name = "route_desc")
+    val description: String,
+    @ColumnInfo(name ="route_type")
+    val type: String,
+    //@ColumnInfo(name ="route_url")
+    //val url: String,
+    @ColumnInfo(name ="route_color")
+    val color: String,
+    @ColumnInfo(name ="route_text_color")
+    val textColor: String,
+    @ColumnInfo(name = COL_SORT_ORDER)
+    val sortOrder: Int
+): GtfsTable {
+
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_ROUTE_ID]!!,
+        valuesByColumn["agency_id"]!!,
+        valuesByColumn["route_short_name"]!!,
+        valuesByColumn["route_long_name"]!!,
+        valuesByColumn["route_desc"]!!,
+        valuesByColumn["route_type"]!!,
+        valuesByColumn["route_color"]!!,
+        valuesByColumn["route_text_color"]!!,
+        valuesByColumn[COL_SORT_ORDER]?.toInt()!!
+    )
+    companion object {
+        const val DB_TABLE: String="routes_table"
+        const val COL_SORT_ORDER: String="route_sort_order"
+        const val COL_ROUTE_ID = "route_id"
+
+        val COLUMNS = arrayOf(COL_ROUTE_ID,
+            "agency_id",
+            "route_short_name",
+            "route_long_name",
+            "route_desc",
+            "route_type",
+            "route_color",
+            "route_text_color",
+            COL_SORT_ORDER
+        )
+    }
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt
new file mode 100644
index 0000000..b236842
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsService.kt
@@ -0,0 +1,94 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.util.Date
+
+@Entity(tableName = GtfsService.DB_TABLE)
+data class GtfsService(
+    @PrimaryKey
+    @ColumnInfo(name = COL_SERVICE_ID)
+    val serviceID: String,
+    @ColumnInfo(name = COL_MONDAY)
+    val onMonday: Boolean,
+    @ColumnInfo(name = COL_TUESDAY)
+    val onTuesday: Boolean,
+    @ColumnInfo(name = COL_WEDNESDAY)
+    val onWednesday: Boolean,
+    @ColumnInfo(name = COL_THURSDAY)
+    val onThursday: Boolean,
+    @ColumnInfo(name = COL_FRIDAY)
+    val onFriday: Boolean,
+    @ColumnInfo(name = COL_SATURDAY)
+    val onSaturday: Boolean,
+    @ColumnInfo(name = COL_SUNDAY)
+    val onSunday: Boolean,
+    @ColumnInfo(name = COL_START_DATE)
+    val startDate: Date,
+    @ColumnInfo(name = COL_END_DATE)
+    val endDate: Date,
+): GtfsTable {
+
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_SERVICE_ID]!!,
+        Converters.fromStringNum(valuesByColumn[COL_MONDAY])!!,
+        Converters.fromStringNum(valuesByColumn[COL_TUESDAY])!!,
+        Converters.fromStringNum(valuesByColumn[COL_WEDNESDAY])!!,
+        Converters.fromStringNum(valuesByColumn[COL_THURSDAY])!!,
+        Converters.fromStringNum(valuesByColumn[COL_FRIDAY])!!,
+        Converters.fromStringNum(valuesByColumn[COL_SATURDAY])!!,
+        Converters.fromStringNum(valuesByColumn[COL_SUNDAY])!!,
+        Converters.dateFromFmtString(valuesByColumn[COL_START_DATE])!!,
+        Converters.dateFromFmtString(valuesByColumn[COL_END_DATE])!!
+    )
+    companion object{
+        const val DB_TABLE="gtfs_calendar"
+        const val COL_SERVICE_ID="service_id"
+        const val COL_MONDAY="monday"
+        const val COL_TUESDAY="tuesday"
+        const val COL_WEDNESDAY="wednesday"
+        const val COL_THURSDAY="thursday"
+        const val COL_FRIDAY="friday"
+        const val COL_SATURDAY="saturday"
+        const val COL_SUNDAY="sunday"
+        const val COL_START_DATE="start_date"
+
+        const val COL_END_DATE="end_date"
+
+        val COLUMNS = arrayOf(
+            COL_SERVICE_ID,
+            COL_MONDAY,
+            COL_TUESDAY,
+            COL_WEDNESDAY,
+            COL_THURSDAY,
+            COL_FRIDAY,
+            COL_SATURDAY,
+            COL_SUNDAY,
+            COL_START_DATE
+        )
+    }
+
+
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt
new file mode 100644
index 0000000..cedd271
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsServiceDate.kt
@@ -0,0 +1,72 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import java.util.Date
+
+
+@Entity(
+    tableName = GtfsServiceDate.DB_TABLE,
+    primaryKeys = [GtfsServiceDate.COL_SERVICE_ID, GtfsServiceDate.COL_DATE],
+    foreignKeys =  [ForeignKey(entity = GtfsService::class,
+        parentColumns = [GtfsService.COL_SERVICE_ID],
+        childColumns = [GtfsServiceDate.COL_SERVICE_ID],
+        onDelete = GtfsDatabase.FOREIGNKEY_ONDELETE)]
+)
+data class GtfsServiceDate(
+    @ColumnInfo(name= COL_SERVICE_ID)
+    val serviceID: String,
+    @ColumnInfo(name=COL_DATE)
+    val date: Date,
+    @ColumnInfo(name=COL_EXCEPTION)
+    val exceptionType: ExceptionType,
+): GtfsTable {
+    companion object{
+        const val DB_TABLE="gtfs_calendar_dates"
+        const val COL_SERVICE_ID="service_id"
+        const val COL_DATE="date"
+        const val COL_EXCEPTION="exception_type"
+
+        val COLUMNS = arrayOf(COL_SERVICE_ID, COL_DATE, COL_SERVICE_ID)
+
+        val converter = Converters()
+
+    }
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_SERVICE_ID]!!,
+        converter.fromString(valuesByColumn[COL_DATE])!!,
+        valuesByColumn[COL_EXCEPTION]?.let { ExceptionType.getByValue(it.toInt()) }!!
+    )
+    enum class ExceptionType(val value: Int){
+        ADDED(1),
+        REMOVED(2);
+
+        companion object {
+            private val VALUES = values()
+            fun getByValue(value: Int) = VALUES.firstOrNull { it.value == value }
+        }
+    }
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+}
+
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt
new file mode 100644
index 0000000..d0e3e49
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsShape.kt
@@ -0,0 +1,61 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+
+@Entity(tableName = GtfsShape.DB_TABLE,
+primaryKeys = [GtfsShape.COL_SHAPE_ID, GtfsShape.COL_POINT_SEQ])
+data class GtfsShape(
+    @ColumnInfo(name = COL_SHAPE_ID)
+    val shapeID: String,
+    @ColumnInfo(name = COL_POINT_LAT)
+    val pointLat: Double,
+    @ColumnInfo(name = COL_POINT_LON)
+    val pointLon: Double,
+    @ColumnInfo(name = COL_POINT_SEQ)
+    val pointSequence: Int,
+): GtfsTable {
+
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_SHAPE_ID]!!,
+        valuesByColumn[COL_POINT_LAT]?.toDoubleOrNull()!!,
+        valuesByColumn[COL_POINT_LON]?.toDoubleOrNull()!!,
+        valuesByColumn[COL_POINT_SEQ]?.toIntOrNull()!!
+    )
+
+    companion object{
+        const val DB_TABLE="gtfs_shapes"
+        const val COL_SHAPE_ID = "shape_id"
+        const val COL_POINT_LAT="shape_pt_lat"
+        const val COL_POINT_LON="shape_pt_lon"
+        const val COL_POINT_SEQ="shape_pt_sequence"
+
+        val COLUMNS= arrayOf(
+            COL_SHAPE_ID,
+            COL_POINT_LAT,
+            COL_POINT_LON,
+            COL_POINT_SEQ
+        )
+    }
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt
new file mode 100644
index 0000000..11164fb
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsStop.kt
@@ -0,0 +1,90 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = GtfsStop.DB_TABLE)
+data class GtfsStop(
+    @PrimaryKey
+    @ColumnInfo(name= COL_STOP_ID)
+    val internalID: Int,
+    @ColumnInfo(name= COL_STOP_CODE)
+    val gttStopID: String,
+    @ColumnInfo(name= COL_STOP_NAME)
+    val stopName: String,
+    @ColumnInfo(name= COL_GTT_PLACE)
+    val gttPlaceName: String,
+    @ColumnInfo(name= COL_LATITUDE)
+    val latitude: Double,
+    @ColumnInfo(name= COL_LONGITUDE)
+    val longitude: Double,
+    //@ColumnInfo(name="zone_id")
+    //val zoneID: Int,
+    @ColumnInfo(name= COL_WHEELCHAIR)
+    val wheelchair: WheelchairAccess,
+): GtfsTable {
+
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_STOP_ID]?.toIntOrNull()!!,
+        valuesByColumn[COL_STOP_CODE]!!,
+        valuesByColumn[COL_STOP_NAME]!!,
+        valuesByColumn[COL_GTT_PLACE]!!,
+        valuesByColumn[COL_LATITUDE]?.toDoubleOrNull()!!,
+        valuesByColumn[COL_LONGITUDE]?.toDoubleOrNull()!!,
+        //valuesByColumn["zone_id"]?.toIntOrNull()!!,
+        Converters.wheelchairFromString(valuesByColumn[COL_WHEELCHAIR])!!
+    )
+    companion object{
+        const val DB_TABLE="stops_gtfs"
+        const val COL_STOP_CODE="stop_code"
+        const val COL_STOP_ID = "stop_id"
+        const val COL_GTT_PLACE="stop_desc"
+        const val COL_STOP_NAME="stop_name"
+        const val COL_LATITUDE="stop_lat"
+        const val COL_LONGITUDE="stop_lon"
+        const val COL_WHEELCHAIR="wheelchair_boarding"
+        val COLUMNS = arrayOf(
+            COL_STOP_CODE,
+            COL_STOP_ID,
+            COL_GTT_PLACE,
+            COL_STOP_NAME,
+            COL_LATITUDE,
+            COL_LONGITUDE,
+            //"zone_id",
+            COL_WHEELCHAIR
+        )
+    }
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+
+    enum class WheelchairAccess(val value: Int){
+        UNKNOWN(0),
+        SOMETIMES(1),
+        IMPOSSIBLE(2);
+
+        companion object {
+            private val VALUES = values()
+            fun getByValue(value: Int) = VALUES.firstOrNull { it.value == value }
+        }
+    }
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt
new file mode 100644
index 0000000..080abda
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsStopTime.kt
@@ -0,0 +1,78 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+
+@Entity(tableName = GtfsStopTime.DB_TABLE,
+    primaryKeys = [GtfsStopTime.COL_TRIP_ID, GtfsStopTime.COL_STOP_ID],
+    foreignKeys = [
+        ForeignKey(entity = GtfsStop::class,
+            parentColumns = [GtfsStop.COL_STOP_ID],
+            childColumns = [GtfsStopTime.COL_STOP_ID],
+            onDelete = GtfsDatabase.FOREIGNKEY_ONDELETE),
+        ForeignKey(entity = GtfsTrip::class,
+            parentColumns = [GtfsTrip.COL_TRIP_ID],
+            childColumns = [GtfsStopTime.COL_TRIP_ID],
+            onDelete = GtfsDatabase.FOREIGNKEY_ONDELETE),
+    ],
+    indices = [Index(GtfsStopTime.COL_STOP_ID)]
+)
+data class GtfsStopTime(
+    @ColumnInfo(name= COL_TRIP_ID)
+    val tripID: String,
+    @ColumnInfo(name= COL_ARRIVAL_TIME)
+    val arrivalTime: String,
+    @ColumnInfo(name= COL_DEPARTURE_TIME)
+    val departureTime:String,
+    @ColumnInfo(name= COL_STOP_ID)
+    val stopID: Int,
+    @ColumnInfo(name= COL_STOP_SEQUENCE)
+    val stopSequence: Int,
+): GtfsTable {
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_TRIP_ID]!!,
+        valuesByColumn[COL_ARRIVAL_TIME]!!,
+        valuesByColumn[COL_DEPARTURE_TIME]!!,
+        valuesByColumn[COL_STOP_ID]?.toIntOrNull()!!,
+        valuesByColumn[COL_STOP_SEQUENCE]?.toIntOrNull()!!
+    )
+    companion object{
+        const val DB_TABLE="gtfs_stop_times"
+        const val COL_TRIP_ID="trip_id"
+        const val COL_ARRIVAL_TIME="arrival_time"
+        const val COL_DEPARTURE_TIME="departure_time"
+        const val COL_STOP_ID="stop_id"
+        const val COL_STOP_SEQUENCE="stop_sequence"
+
+        val COLUMNS = arrayOf(
+            COL_TRIP_ID,
+            COL_ARRIVAL_TIME,
+            COL_DEPARTURE_TIME,
+            COL_STOP_ID,
+            COL_STOP_SEQUENCE
+        )
+    }
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java b/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java
new file mode 100644
index 0000000..1577c62
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsTable.java
@@ -0,0 +1,24 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs;
+
+public interface GtfsTable {
+
+    String[] getColumns();
+
+}
diff --git a/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt b/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt
new file mode 100644
index 0000000..cba9c27
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/GtfsTrip.kt
@@ -0,0 +1,107 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.room.*
+
+@Entity(tableName = GtfsTrip.DB_TABLE,
+    foreignKeys=[
+        ForeignKey(entity = GtfsRoute::class,
+            parentColumns = [GtfsRoute.COL_ROUTE_ID],
+            childColumns = [GtfsTrip.COL_ROUTE_ID],
+            onDelete = GtfsDatabase.FOREIGNKEY_ONDELETE),
+        // The service_id: ID referencing calendar.service_id or calendar_dates.service_id
+        /*
+        ForeignKey(entity = GtfsService::class,
+            parentColumns = [GtfsService.COL_SERVICE_ID],
+            childColumns = [GtfsTrips.COL_SERVICE_ID],
+            onDelete = GtfsDatabase.FOREIGNKEY_ONDELETE),
+         */
+    ],
+    indices = [Index(GtfsTrip.COL_ROUTE_ID)]
+)
+data class GtfsTrip(
+    @ColumnInfo(name = COL_ROUTE_ID )
+    val routeID: String,
+    @ColumnInfo(name = COL_SERVICE_ID)
+    val serviceID: String,
+    @PrimaryKey
+    @ColumnInfo(name = COL_TRIP_ID)
+    val tripID: String,
+    @ColumnInfo(name = COL_HEADSIGN)
+    val tripHeadsign: String,
+    @ColumnInfo(name = COL_DIRECTION_ID)
+    val directionID: Int,
+    @ColumnInfo(name = COL_BLOCK_ID)
+    val blockID: String,
+    @ColumnInfo(name = COL_SHAPE_ID)
+    val shapeID: String,
+    @ColumnInfo(name = COL_WHEELCHAIR)
+    val isWheelchairAccess: Boolean,
+    @ColumnInfo(name = COL_LIMITED_R)
+    val isLimitedRoute: Boolean,
+
+): GtfsTable {
+
+    constructor(valuesByColumn: Map<String,String>) : this(
+        valuesByColumn[COL_ROUTE_ID]!!,
+        valuesByColumn[COL_SERVICE_ID]!!,
+        valuesByColumn[COL_TRIP_ID]!!,
+        valuesByColumn[COL_HEADSIGN]!!,
+        valuesByColumn[COL_DIRECTION_ID]?.toIntOrNull()?: 0,
+        valuesByColumn[COL_BLOCK_ID]!!,
+        valuesByColumn[COL_SHAPE_ID]!!,
+        Converters.fromStringNum(valuesByColumn[COL_WHEELCHAIR], false),
+        Converters.fromStringNum(valuesByColumn[COL_LIMITED_R], false)
+    )
+
+    companion object{
+        const val DB_TABLE="gtfs_trips"
+        const val COL_ROUTE_ID="route_id"
+        const val COL_SERVICE_ID="service_id"
+        const val COL_TRIP_ID = "trip_id"
+        const val COL_HEADSIGN="trip_headsign"
+        //const val COL_SHORT_NAME="trip_short_name",
+        const val COL_DIRECTION_ID="direction_id"
+        const val COL_BLOCK_ID="block_id"
+        const val COL_SHAPE_ID = "shape_id"
+        const val COL_WHEELCHAIR="wheelchair_accessible"
+        const val COL_LIMITED_R="limited_route"
+
+        val COLUMNS= arrayOf(
+            COL_ROUTE_ID,
+            COL_SERVICE_ID,
+            COL_TRIP_ID,
+            COL_HEADSIGN,
+            COL_DIRECTION_ID,
+            COL_BLOCK_ID,
+            COL_SHAPE_ID,
+            COL_WHEELCHAIR,
+            COL_LIMITED_R
+        )
+        /*
+        open fun fromContentValues(values: ContentValues) {
+            val tripItem = GtfsTrips();
+        }
+         */
+    }
+
+    override fun getColumns(): Array<String> {
+        return COLUMNS
+    }
+}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/data/gtfs/StaticGtfsDao.kt b/src/it/reyboz/bustorino/data/gtfs/StaticGtfsDao.kt
new file mode 100644
index 0000000..86c0c70
--- /dev/null
+++ b/src/it/reyboz/bustorino/data/gtfs/StaticGtfsDao.kt
@@ -0,0 +1,77 @@
+/*
+	BusTO - Data components
+    Copyright (C) 2021 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.data.gtfs
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+
+@Dao
+interface StaticGtfsDao {
+    @Query("SELECT * FROM "+GtfsRoute.DB_TABLE+" ORDER BY "+GtfsRoute.COL_SORT_ORDER)
+    fun getAllRoutes() : LiveData<List<GtfsRoute>>
+
+    @Query("SELECT * FROM "+GtfsStop.DB_TABLE+" WHERE "+GtfsStop.COL_STOP_CODE+" LIKE :queryID")
+    fun getStopByStopID(queryID: String): LiveData<List<GtfsStop>>
+
+    @Query("SELECT * FROM "+GtfsShape.DB_TABLE+
+            " WHERE "+GtfsShape.COL_SHAPE_ID+" LIKE :shapeID"+
+            " ORDER BY "+GtfsShape.COL_POINT_SEQ+ " ASC"
+    )
+    fun getShapeByID(shapeID: String) : LiveData<List<GtfsShape>>
+
+    @Transaction
+    fun clearAndInsertRoutes(routes: List<GtfsRoute>){
+        deleteAllRoutes()
+        insertRoutes(routes)
+    }
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertRoutes(users: List<GtfsRoute>)
+    @Insert
+    fun insertStops(stops: List<GtfsStop>)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertCalendarServices(services: List<GtfsService>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertShapes(shapes: List<GtfsShape>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertDates(dates: List<GtfsServiceDate>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertServices(services: List<GtfsService>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertTrips(trips: List<GtfsTrip>)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertStopTimes(stopTimes: List<GtfsStopTime>)
+
+    @Query("DELETE FROM "+GtfsRoute.DB_TABLE)
+    fun deleteAllRoutes()
+    @Query("DELETE FROM "+GtfsStop.DB_TABLE)
+    fun deleteAllStops()
+    @Update(onConflict = OnConflictStrategy.REPLACE)
+    fun updateShapes(shapes: List<GtfsShape>) : Int
+
+    @Transaction
+    fun updateStops(stops: List<GtfsStop>){
+        deleteAllStops()
+        insertStops(stops)
+    }
+}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/fragments/FavoritesFragment.java b/src/it/reyboz/bustorino/fragments/FavoritesFragment.java
index 56885aa..d42f5c7 100644
--- a/src/it/reyboz/bustorino/fragments/FavoritesFragment.java
+++ b/src/it/reyboz/bustorino/fragments/FavoritesFragment.java
@@ -1,262 +1,279 @@
+/*
+	BusTO  - Fragments components
+    Copyright (C) 2021 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.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import it.reyboz.bustorino.*;
 import it.reyboz.bustorino.adapters.StopAdapter;
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.data.FavoritesViewModel;
 import it.reyboz.bustorino.middleware.AsyncStopFavoriteAction;
 
 public class FavoritesFragment extends BaseFragment {
 
     private ListView favoriteListView;
     private EditText busStopNameText;
     private TextView favoriteTipTextView;
     private ImageView angeryBusImageView;
 
     @Nullable
     private CommonFragmentListener mListener;
 
     public static final String FRAGMENT_TAG = "BusTOFavFragment";
 
 
 
 
     public static FavoritesFragment newInstance() {
         FavoritesFragment fragment = new FavoritesFragment();
         Bundle args = new Bundle();
         //args.putString(ARG_PARAM1, param1);
         //args.putString(ARG_PARAM2, param2);
         fragment.setArguments(args);
         return fragment;
     }
     public FavoritesFragment(){
 
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             //do nothing
         }
     }
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_favorites, container, false);
         favoriteListView = root.findViewById(R.id.favoriteListView);
         favoriteListView.setOnItemClickListener((parent, view, position, 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);
 
             if(mListener!=null){
                 mListener.requestArrivalsForStopID(busStop.ID);
             }
 
         });
         angeryBusImageView = root.findViewById(R.id.angeryBusImageView);
         favoriteTipTextView = root.findViewById(R.id.favoriteTipTextView);
         registerForContextMenu(favoriteListView);
 
         FavoritesViewModel model = new ViewModelProvider(this).get(FavoritesViewModel.class);
         model.getFavorites().observe(getViewLifecycleOwner(), this::showStops);
 
         showStops(new ArrayList<>());
         return root;
     }
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         if (context instanceof CommonFragmentListener) {
             mListener = (CommonFragmentListener) context;
         } else {
             throw new RuntimeException(context.toString()
                     + " must implement CommonFragmentListener");
         }
 
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         mListener = null;
     }
 
     @Override
     public void onCreateContextMenu(@NonNull ContextMenu menu, @NonNull View v,
                                     ContextMenu.ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
         if (v.getId() == R.id.favoriteListView) {
             // if we aren't attached to activity, return null
             if (getActivity()==null) return;
             MenuInflater inflater = getActivity().getMenuInflater();
             inflater.inflate(R.menu.menu_favourites_entry, menu);
         }
     }
 
     @Override
     public void onResume() {
         super.onResume();
         if (mListener!=null) mListener.readyGUIfor(FragmentKind.FAVORITES);
     }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item
                 .getMenuInfo();
 
         Stop busStop = (Stop) favoriteListView.getItemAtPosition(info.position);
 
         switch (item.getItemId()) {
             case R.id.action_favourite_entry_delete:
                 if (getContext()!=null)
                 new AsyncStopFavoriteAction(getContext().getApplicationContext(), AsyncStopFavoriteAction.Action.REMOVE,
                         result -> {
 
                         }).execute(busStop);
 
                 return true;
 
             case R.id.action_rename_bus_stop_username:
                 showBusStopUsernameInputDialog(busStop);
                 return true;
             case R.id.action_view_on_map:
                 if (busStop.getLatitude() == null | busStop.getLongitude() == null |
                         mListener==null
                 ) {
                     Toast.makeText(getContext(), R.string.cannot_show_on_map_no_position, Toast.LENGTH_SHORT).show();
                     return true;
                 }
 
                 //GeoPoint point = new GeoPoint(busStop.getLatitude(), busStop.getLongitude());
 
                 mListener.showMapCenteredOnStop(busStop);
                 return true;
             default:
                 return super.onContextItemSelected(item);
         }
     }
 
 
     void showStops(List<Stop> busStops){
         // If no data is found show a friendly message
         if(BuildConfig.DEBUG)
             Log.d("BusTO - Favorites", "We have "+busStops.size()+" favorites in the list");
         if (busStops.size() == 0) {
             favoriteListView.setVisibility(View.INVISIBLE);
            // TextView favoriteTipTextView = (TextView) findViewById(R.id.favoriteTipTextView);
             //assert favoriteTipTextView != null;
             favoriteTipTextView.setVisibility(View.VISIBLE);
             //ImageView angeryBusImageView = (ImageView) findViewById(R.id.angeryBusImageView);
             angeryBusImageView.setVisibility(View.VISIBLE);
         } else {
             favoriteListView.setVisibility(View.VISIBLE);
             favoriteTipTextView.setVisibility(View.INVISIBLE);
             angeryBusImageView.setVisibility(View.INVISIBLE);
         }
         /* There's a nice method called notifyDataSetChanged() to avoid building the ListView
          * all over again. This method exists in a billion answers on Stack Overflow, but
          * it's nowhere to be seen around here, Android Studio can't find it no matter what.
          * Anyway, it only works from Android 2.3 onward (which is why it refuses to appear, I
          * guess) and requires to modify the list with .add() and .clear() and some other
          * methods, so to update a single stop we need to completely rebuild the list for no
          * reason. It would probably end up as "slow" as throwing away the old ListView and
          * redrwaing everything.
          */
         // Show results
         favoriteListView.setAdapter(new StopAdapter(getContext(), busStops));
     }
 
     public void showBusStopUsernameInputDialog(final Stop busStop) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
 
         LayoutInflater inflater = this.getLayoutInflater();
         View renameDialogLayout = inflater.inflate(R.layout.rename_dialog, null);
 
         busStopNameText = (EditText) renameDialogLayout.findViewById(R.id.rename_dialog_bus_stop_name);
         busStopNameText.setText(busStop.getStopDisplayName());
         busStopNameText.setHint(busStop.getStopDefaultName());
 
         builder.setTitle(getString(R.string.dialog_rename_bus_stop_username_title));
         builder.setView(renameDialogLayout);
         builder.setPositiveButton(getString(android.R.string.ok), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 String busStopUsername = busStopNameText.getText().toString();
                 String oldUserName = busStop.getStopUserName();
 
                 // changed to none
                 if(busStopUsername.length() == 0) {
                     // unless it was already empty, set new
                     if(oldUserName != null) {
                         busStop.setStopUserName(null);
 
                     }
                 } else { // changed to something
                     // something different?
                     if(!busStopUsername.equals(oldUserName)) {
                         busStop.setStopUserName(busStopUsername);
 
                     }
                 }
                 launchUpdate(busStop);
             }
         });
         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 DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 // delete user name from database
                 busStop.setStopUserName(null);
                 launchUpdate(busStop);
 
             }
         });
         builder.show();
     }
 
     private void launchUpdate(Stop busStop){
         if (getContext()!=null)
             new AsyncStopFavoriteAction(getContext().getApplicationContext(), AsyncStopFavoriteAction.Action.UPDATE,
                     new AsyncStopFavoriteAction.ResultListener() {
                         @Override
                         public void doStuffWithResult(Boolean result) {
                             //Toast.makeText(getApplicationContext(), R.string.tip_add_favorite, Toast.LENGTH_SHORT).show();
                         }
                     }).execute(busStop);
     }
 }
diff --git a/src/it/reyboz/bustorino/fragments/MapFragment.java b/src/it/reyboz/bustorino/fragments/MapFragment.java
index f37b579..81fc88e 100644
--- a/src/it/reyboz/bustorino/fragments/MapFragment.java
+++ b/src/it/reyboz/bustorino/fragments/MapFragment.java
@@ -1,622 +1,640 @@
+/*
+	BusTO  - Fragments components
+    Copyright (C) 2020 Andrea Ugo
+    Copyright (C) 2021 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.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.preference.PreferenceManager;
 
 import it.reyboz.bustorino.backend.utils;
 import org.osmdroid.api.IGeoPoint;
 import org.osmdroid.api.IMapController;
 import org.osmdroid.config.Configuration;
 import org.osmdroid.events.DelayedMapListener;
 import org.osmdroid.events.MapListener;
 import org.osmdroid.events.ScrollEvent;
 import org.osmdroid.events.ZoomEvent;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.BoundingBox;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.FolderOverlay;
 import org.osmdroid.views.overlay.Marker;
 import org.osmdroid.views.overlay.infowindow.InfoWindow;
 import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider;
 
 import java.lang.ref.WeakReference;
 import java.util.*;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.data.NextGenDB;
 import it.reyboz.bustorino.map.CustomInfoWindow;
 import it.reyboz.bustorino.map.LocationOverlay;
 import it.reyboz.bustorino.middleware.GeneralActivity;
 import it.reyboz.bustorino.util.Permissions;
 
 public class MapFragment extends BaseFragment {
 
     private static final String TAG = "Busto-MapActivity";
     private static final String MAP_CURRENT_ZOOM_KEY = "map-current-zoom";
     private static final String MAP_CENTER_LAT_KEY = "map-center-lat";
     private static final String MAP_CENTER_LON_KEY = "map-center-lon";
     private static final String FOLLOWING_LOCAT_KEY ="following";
 
     public static final String BUNDLE_LATIT = "lat";
     public static final String BUNDLE_LONGIT = "lon";
     public static final String BUNDLE_NAME = "name";
     public static final String BUNDLE_ID = "ID";
 
     public static final String FRAGMENT_TAG="BusTOMapFragment";
 
 
     private static final double DEFAULT_CENTER_LAT = 45.0708;
     private static final double DEFAULT_CENTER_LON = 7.6858;
     private static final double POSITION_FOUND_ZOOM = 18.3;
     public static final double NO_POSITION_ZOOM = 17.1;
 
     private static final String DEBUG_TAG=FRAGMENT_TAG;
 
     protected FragmentListenerMain listenerMain;
 
     private HashSet<String> shownStops = null;
     //the asynctask used to get the stops from the database
     private AsyncStopFetcher stopFetcher = null;
 
 
     private MapView map = null;
     public Context ctx;
     private LocationOverlay mLocationOverlay = null;
     private FolderOverlay stopsFolderOverlay = null;
     private Bundle savedMapState = null;
     protected ImageButton btCenterMap;
     protected ImageButton btFollowMe;
     private boolean followingLocation = false;
 
     protected final CustomInfoWindow.TouchResponder responder = new CustomInfoWindow.TouchResponder() {
         @Override
         public void onActionUp(@NonNull String stopID, @Nullable String stopName) {
             if (listenerMain!= null){
                 listenerMain.requestArrivalsForStopID(stopID);
             }
         }
     };
     protected final LocationOverlay.OverlayCallbacks locationCallbacks = new LocationOverlay.OverlayCallbacks() {
         @Override
         public void onDisableFollowMyLocation() {
             updateGUIForLocationFollowing(false);
             followingLocation=false;
         }
 
         @Override
         public void onEnableFollowMyLocation() {
             updateGUIForLocationFollowing(true);
             followingLocation=true;
         }
     };
 
     private final ActivityResultLauncher<String[]> positionRequestLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
                 @Override
                 @SuppressLint("MissingPermission")
                 public void onActivityResult(Map<String, Boolean> result) {
                     if(result.get(Manifest.permission.ACCESS_COARSE_LOCATION) && result.get(Manifest.permission.ACCESS_FINE_LOCATION)){
 
                         map.getOverlays().remove(mLocationOverlay);
                         startLocationOverlay(true, map);
                         if(getContext()==null || getContext().getSystemService(Context.LOCATION_SERVICE)==null)
                             return;
                         LocationManager locationManager = (LocationManager) getContext().getSystemService(Context.LOCATION_SERVICE);
                         Location userLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
                         if (userLocation != null) {
                             map.getController().setZoom(POSITION_FOUND_ZOOM);
                             GeoPoint startPoint = new GeoPoint(userLocation);
                             setLocationFollowing(true);
                             map.getController().setCenter(startPoint);
                         }
                     }
                     else Log.w(DEBUG_TAG,"No location permission");
                 }
             });
 
     public MapFragment() {
     }
     public static MapFragment getInstance(){
         return new MapFragment();
     }
     public static MapFragment getInstance(double stopLatit, double stopLong, String stopName, String stopID){
         MapFragment fragment= new MapFragment();
         Bundle args = new Bundle();
         args.putDouble(BUNDLE_LATIT, stopLatit);
         args.putDouble(BUNDLE_LONGIT, stopLong);
         args.putString(BUNDLE_NAME, stopName);
         args.putString(BUNDLE_ID, stopID);
         fragment.setArguments(args);
 
         return fragment;
     }
     public static MapFragment getInstance(@NonNull Stop stop){
         return getInstance(stop.getLatitude(), stop.getLongitude(), stop.getStopDisplayName(), stop.ID);
     }
 
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         //use the same layout as the activity
         View root = inflater.inflate(R.layout.activity_map, container, false);
         if (getContext() == null){
             throw new IllegalStateException();
         }
         ctx = getContext().getApplicationContext();
         Configuration.getInstance().load(ctx, PreferenceManager.getDefaultSharedPreferences(ctx));
         map = root.findViewById(R.id.map);
         map.setTileSource(TileSourceFactory.MAPNIK);
         //map.setTilesScaledToDpi(true);
         map.setFlingEnabled(true);
 
         // add ability to zoom with 2 fingers
         map.setMultiTouchControls(true);
 
         btCenterMap = root.findViewById(R.id.ic_center_map);
         btFollowMe = root.findViewById(R.id.ic_follow_me);
 
         //setup FolderOverlay
         stopsFolderOverlay = new FolderOverlay();
 
 
         //Start map from bundle
         if (savedInstanceState !=null)
             startMap(getArguments(), savedInstanceState);
         else startMap(getArguments(), savedMapState);
         //set listeners
         map.addMapListener(new DelayedMapListener(new MapListener() {
 
             @Override
             public boolean onScroll(ScrollEvent paramScrollEvent) {
                 requestStopsToShow();
                 //Log.d(DEBUG_TAG, "Scrolling");
                 //if (moveTriggeredByCode) moveTriggeredByCode =false;
                 //else setLocationFollowing(false);
                 return true;
             }
 
             @Override
             public boolean onZoom(ZoomEvent event) {
                 requestStopsToShow();
                 return true;
             }
 
         }));
 
 
         btCenterMap.setOnClickListener(v -> {
             //Log.i(TAG, "centerMap clicked ");
             if(Permissions.locationPermissionGranted(getContext())) {
                 final GeoPoint myPosition = mLocationOverlay.getMyLocation();
                 map.getController().animateTo(myPosition);
             } else
                 Toast.makeText(getContext(), R.string.enable_position_message_map, Toast.LENGTH_SHORT)
                         .show();
         });
 
         btFollowMe.setOnClickListener(v -> {
             //Log.i(TAG, "btFollowMe clicked ");
             if(Permissions.locationPermissionGranted(getContext()))
                 setLocationFollowing(!followingLocation);
             else
                 Toast.makeText(getContext(), R.string.enable_position_message_map, Toast.LENGTH_SHORT)
                     .show();
         });
 
         return root;
     }
 
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         if (context instanceof FragmentListenerMain) {
             listenerMain = (FragmentListenerMain) context;
         } else {
             throw new RuntimeException(context.toString()
                     + " must implement FragmentListenerMain");
         }
     }
     @Override
     public void onDetach() {
         super.onDetach();
         listenerMain = null;
         //    setupOnAttached = true;
         Log.w(DEBUG_TAG, "Fragment detached");
     }
 
     @Override
     public void onPause() {
         super.onPause();
         saveMapState();
         //cancel asynctask
         Log.w(DEBUG_TAG, "On pause called");
         if (stopFetcher!= null)
             stopFetcher.cancel(true);
     }
 
     /**
      * Save the map state inside the fragment
      * (calls saveMapState(bundle))
      */
     private void saveMapState(){
         savedMapState = new Bundle();
         saveMapState(savedMapState);
 
     }
 
     /**
      * Save the state of the map to restore it to a later time
      * @param bundle the bundle in which to save the data
      */
     private void saveMapState(Bundle bundle){
         final IGeoPoint loc = map.getMapCenter();
         bundle.putDouble(MAP_CENTER_LAT_KEY, loc.getLatitude());
         bundle.putDouble(MAP_CENTER_LON_KEY, loc.getLongitude());
         bundle.putDouble(MAP_CURRENT_ZOOM_KEY, map.getZoomLevelDouble());
         Log.d(DEBUG_TAG, "Saving state, location following: "+followingLocation);
         bundle.putBoolean(FOLLOWING_LOCAT_KEY, followingLocation);
 
     }
 
     @Override
     public void onResume() {
         super.onResume();
         if(listenerMain!=null) listenerMain.readyGUIfor(FragmentKind.MAP);
     }
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         saveMapState(outState);
 
         super.onSaveInstanceState(outState);
     }
 
     //own methods
 
     /**
      * Switch following the location on and off
      * @param value true if we want to follow location
      */
     public void setLocationFollowing(Boolean value){
         followingLocation = value;
         if(mLocationOverlay==null || getContext() == null || map ==null)
             //nothing else to do
             return;
         if (value){
             mLocationOverlay.enableFollowLocation();
         } else {
             mLocationOverlay.disableFollowLocation();
         }
     }
 
     /**
      * Do all the stuff you need to do on the gui, when parameter is changed to value
      * @param following value
      */
     protected void updateGUIForLocationFollowing(boolean following){
         if (following)
             btFollowMe.setImageResource(R.drawable.ic_follow_me_on);
         else
             btFollowMe.setImageResource(R.drawable.ic_follow_me);
 
     }
 
     /**
      * Build the location overlay. Enable only when
      * a) we know we have the permission
      * b) the location map is set
      */
     private void startLocationOverlay(boolean enableLocation, MapView map){
         if(getActivity()== null) throw new IllegalStateException("Cannot enable LocationOverlay now");
         // Location Overlay
         // from OpenBikeSharing (THANK GOD)
         Log.d(DEBUG_TAG, "Starting position overlay");
         GpsMyLocationProvider imlp = new GpsMyLocationProvider(getActivity().getBaseContext());
         imlp.setLocationUpdateMinDistance(5);
         imlp.setLocationUpdateMinTime(2000);
 
         final LocationOverlay overlay = new LocationOverlay(imlp,map, locationCallbacks);
         if (enableLocation) overlay.enableMyLocation();
         overlay.setOptionsMenuEnabled(true);
 
         //map.getOverlays().add(this.mLocationOverlay);
         this.mLocationOverlay = overlay;
         map.getOverlays().add(mLocationOverlay);
     }
 
     public void startMap(Bundle incoming, Bundle savedInstanceState) {
         //Check that we're attached
         GeneralActivity activity = getActivity() instanceof GeneralActivity ? (GeneralActivity) getActivity() : null;
         if(getContext()==null|| activity==null){
             //we are not attached
             Log.e(DEBUG_TAG, "Calling startMap when not attached");
             return;
         }else{
             Log.d(DEBUG_TAG, "Starting map from scratch");
         }
         //clear previous overlays
         map.getOverlays().clear();
 
 
         //parse incoming bundle
         GeoPoint marker = null;
         String name = null;
         String ID = null;
         if (incoming != null) {
             double lat = incoming.getDouble(BUNDLE_LATIT);
             double lon = incoming.getDouble(BUNDLE_LONGIT);
             marker = new GeoPoint(lat, lon);
             name = incoming.getString(BUNDLE_NAME);
             ID = incoming.getString(BUNDLE_ID);
         }
 
 
        //ask for location permission
         if(!Permissions.locationPermissionGranted(activity)){
             if(shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION)){
                 //TODO: show dialog for permission rationale
                 Toast.makeText(activity, R.string.enable_position_message_map, Toast.LENGTH_SHORT).show();
             }
             positionRequestLauncher.launch(Permissions.LOCATION_PERMISSIONS);
 
         }
 
         shownStops = new HashSet<>();
         // move the map on the marker position or on a default view point: Turin, Piazza Castello
         // and set the start zoom
         IMapController mapController = map.getController();
         GeoPoint startPoint = null;
         startLocationOverlay(Permissions.locationPermissionGranted(activity),
                 map);
         // set the center point
         if (marker != null) {
             //startPoint = marker;
             mapController.setZoom(POSITION_FOUND_ZOOM);
             setLocationFollowing(false);
             // put the center a little bit off (animate later)
             startPoint = new GeoPoint(marker);
             startPoint.setLatitude(marker.getLatitude()+ utils.angleRawDifferenceFromMeters(20));
             startPoint.setLongitude(marker.getLongitude()-utils.angleRawDifferenceFromMeters(20));
             //don't need to do all the rest since we want to show a point
         } else if (savedInstanceState != null && savedInstanceState.containsKey(MAP_CURRENT_ZOOM_KEY)) {
             mapController.setZoom(savedInstanceState.getDouble(MAP_CURRENT_ZOOM_KEY));
             mapController.setCenter(new GeoPoint(savedInstanceState.getDouble(MAP_CENTER_LAT_KEY),
                     savedInstanceState.getDouble(MAP_CENTER_LON_KEY)));
             Log.d(DEBUG_TAG, "Location following from savedInstanceState: "+savedInstanceState.getBoolean(FOLLOWING_LOCAT_KEY));
             setLocationFollowing(savedInstanceState.getBoolean(FOLLOWING_LOCAT_KEY));
         } else {
             Log.d(DEBUG_TAG, "No position found from intent or saved state");
             boolean found = false;
             LocationManager locationManager =
                     (LocationManager) getContext().getSystemService(Context.LOCATION_SERVICE);
             //check for permission
             if (locationManager != null && Permissions.locationPermissionGranted(activity)) {
 
                 @SuppressLint("MissingPermission")
                 Location userLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
                 if (userLocation != null) {
                     mapController.setZoom(POSITION_FOUND_ZOOM);
                     startPoint = new GeoPoint(userLocation);
                     found = true;
                     setLocationFollowing(true);
                 }
             }
             if(!found){
                 startPoint = new GeoPoint(DEFAULT_CENTER_LAT, DEFAULT_CENTER_LON);
                 mapController.setZoom(NO_POSITION_ZOOM);
                 setLocationFollowing(false);
             }
         }
 
         // set the minimum zoom level
         map.setMinZoomLevel(15.0);
         //add contingency check (shouldn't happen..., but)
 
         if (startPoint != null) {
             mapController.setCenter(startPoint);
         }
 
 
         //add stops overlay
         //map.getOverlays().add(mLocationOverlay);
         map.getOverlays().add(this.stopsFolderOverlay);
 
         Log.d(DEBUG_TAG, "Requesting stops load");
         // This is not necessary, by setting the center we already move
         // the map and we trigger a stop request
         //requestStopsToShow();
         if (marker != null) {
             // make a marker with the info window open for the searched marker
             Marker stopMarker = makeMarker(marker, name , ID, true);
             map.getController().animateTo(marker);
         }
 
     }
 
     /**
      * Start a request to load the stops that are in the current view
      * from the database
      */
     private void requestStopsToShow(){
         // get the top, bottom, left and right screen's coordinate
         BoundingBox bb = map.getBoundingBox();
         double latFrom = bb.getLatSouth();
         double latTo = bb.getLatNorth();
         double lngFrom = bb.getLonWest();
         double lngTo = bb.getLonEast();
         if (stopFetcher!= null && stopFetcher.getStatus()!= AsyncTask.Status.FINISHED)
             stopFetcher.cancel(true);
         stopFetcher = new AsyncStopFetcher(this);
         stopFetcher.execute(
                 new AsyncStopFetcher.BoundingBoxLimit(lngFrom,lngTo,latFrom, latTo));
     }
 
     /**
      * Add stops as Markers on the map
      * @param stops the list of stops that must be included
      */
     protected void showStopsMarkers(List<Stop> stops){
         if (getContext() == null){
             //we are not attached
             return;
         }
         boolean good = true;
 
         for (Stop stop : stops) {
             if (shownStops.contains(stop.ID)){
                 continue;
             }
             if(stop.getLongitude()==null || stop.getLatitude()==null)
                 continue;
 
             shownStops.add(stop.ID);
             if(!map.isShown()){
                 if(good)
                 Log.d(DEBUG_TAG, "Need to show stop but map is not shown, probably detached already");
                 good = false;
                 continue;
             } else if(map.getRepository() == null){
                 Log.e(DEBUG_TAG, "Map view repository is null");
             }
             GeoPoint marker = new GeoPoint(stop.getLatitude(), stop.getLongitude());
 
             Marker stopMarker = makeMarker(marker, stop.getStopDefaultName(), stop.ID, false);
             stopsFolderOverlay.add(stopMarker);
             if (!map.getOverlays().contains(stopsFolderOverlay)) {
                 Log.w(DEBUG_TAG, "Map doesn't have folder overlay");
             }
             good=true;
         }
         //Log.d(DEBUG_TAG,"We have " +stopsFolderOverlay.getItems().size()+" stops in the folderOverlay");
         //force redraw of markers
         map.invalidate();
     }
 
     public Marker makeMarker(GeoPoint geoPoint, String stopName, String ID, boolean isStartMarker) {
 
         // add a marker
         final Marker marker = new Marker(map);
 
         // set custom info window as info window
         CustomInfoWindow popup = new CustomInfoWindow(map, ID, stopName, responder);
         marker.setInfoWindow(popup);
 
         // make the marker clickable
         marker.setOnMarkerClickListener((thisMarker, mapView) -> {
             if (thisMarker.isInfoWindowOpen()) {
                 // on second click
                 Log.w(DEBUG_TAG, "Pressed on the click marker");
             } else {
                 // on first click
 
                 // hide all opened info window
                 InfoWindow.closeAllInfoWindowsOn(map);
                 // show this particular info window
                 thisMarker.showInfoWindow();
                 // move the map to its position
                 map.getController().animateTo(thisMarker.getPosition());
             }
 
             return true;
         });
 
         // set its position
         marker.setPosition(geoPoint);
         marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
         // add to it an icon
         //marker.setIcon(getResources().getDrawable(R.drawable.bus_marker));
 
         marker.setIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.bus_marker, ctx.getTheme()));
         // add to it a title
         marker.setTitle(stopName);
         // set the description as the ID
         marker.setSnippet(ID);
 
         // show popup info window of the searched marker
         if (isStartMarker) {
             marker.showInfoWindow();
             //map.getController().animateTo(marker.getPosition());
         }
 
         return marker;
     }
 
     /**
      * Simple asyncTask class to load the stops in the background
      * Holds a weak reference to the fragment to do callbacks
      */
     static class AsyncStopFetcher extends AsyncTask<AsyncStopFetcher.BoundingBoxLimit,Void, List<Stop>>{
 
         final WeakReference<MapFragment> fragmentWeakReference;
 
         public AsyncStopFetcher(MapFragment fragment) {
             this.fragmentWeakReference = new WeakReference<>(fragment);
         }
 
         @Override
         protected List<Stop> doInBackground(BoundingBoxLimit... limits) {
             if(fragmentWeakReference.get()==null || fragmentWeakReference.get().getContext() == null){
                 Log.w(DEBUG_TAG, "AsyncLoad fragmentWeakreference null");
 
                 return null;
 
             }
             final BoundingBoxLimit limit = limits[0];
             //Log.d(DEBUG_TAG, "Async Stop Fetcher started working");
 
             NextGenDB dbHelper = new NextGenDB(fragmentWeakReference.get().getContext());
             Stop[] stops = dbHelper.queryAllInsideMapView(limit.latitFrom, limit.latitTo,
                     limit.longFrom, limit.latitTo);
             dbHelper.close();
             return Arrays.asList(stops);
         }
 
         @Override
         protected void onPostExecute(List<Stop> stops) {
             super.onPostExecute(stops);
             //Log.d(DEBUG_TAG, "Async Stop Fetcher has finished working");
             if(fragmentWeakReference.get()==null) {
                 Log.w(DEBUG_TAG, "AsyncLoad fragmentWeakreference null");
                 return;
             }
             Log.d(DEBUG_TAG, "AsyncLoad number of stops: "+stops.size());
             fragmentWeakReference.get().showStopsMarkers(stops);
         }
 
         private static class BoundingBoxLimit{
             final double longFrom, longTo, latitFrom, latitTo;
 
             public BoundingBoxLimit(double longFrom, double longTo, double latitFrom, double latitTo) {
                 this.longFrom = longFrom;
                 this.longTo = longTo;
                 this.latitFrom = latitFrom;
                 this.latitTo = latitTo;
             }
         }
 
     }
 }
diff --git a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
index dd49924..6a983f5 100644
--- a/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
+++ b/src/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
@@ -1,704 +1,705 @@
 /*
 	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.content.Context;
 
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.location.Location;
 import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 import androidx.core.util.Pair;
 import androidx.preference.PreferenceManager;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.android.volley.*;
 import it.reyboz.bustorino.BuildConfig;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.adapters.ArrivalsStopAdapter;
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.backend.FiveTAPIFetcher.QueryType;
 import it.reyboz.bustorino.middleware.AppLocationManager;
 import it.reyboz.bustorino.data.AppDataProvider;
 import it.reyboz.bustorino.data.NextGenDB.Contract.*;
 import it.reyboz.bustorino.adapters.SquareStopAdapter;
 import it.reyboz.bustorino.util.LocationCriteria;
 import it.reyboz.bustorino.util.StopSorterByDistance;
 
 import java.util.*;
 
 public class NearbyStopsFragment extends Fragment implements LoaderManager.LoaderCallbacks<Cursor> {
 
     private FragmentListenerMain mListener;
     private FragmentLocationListener fragmentLocationListener;
     private final String[] PROJECTION = {StopsTable.COL_ID,StopsTable.COL_LAT,StopsTable.COL_LONG,
             StopsTable.COL_NAME,StopsTable.COL_TYPE,StopsTable.COL_LINES_STOPPING};
     private final static String DEBUG_TAG = "NearbyStopsFragment";
     private final static String FRAGMENT_TYPE_KEY = "FragmentType";
     public final static int TYPE_STOPS = 19, TYPE_ARRIVALS = 20;
     private int fragment_type;
 
     public final static String FRAGMENT_TAG="NearbyStopsFrag";
 
     //data Bundle
     private final String BUNDLE_LOCATION =  "location";
     private final int LOADER_ID = 0;
     private RecyclerView gridRecyclerView;
 
     private SquareStopAdapter dataAdapter;
     private AutoFitGridLayoutManager gridLayoutManager;
     boolean canStartDBQuery = true;
     private Location lastReceivedLocation = null;
     private ProgressBar circlingProgressBar,flatProgressBar;
     private int distance;
     protected SharedPreferences globalSharedPref;
     private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener;
     private TextView messageTextView,titleTextView;
     private CommonScrollListener scrollListener;
     private AppCompatButton switchButton;
     private boolean firstLocForStops = true,firstLocForArrivals = true;
     public static final int COLUMN_WIDTH_DP = 250;
 
 
     private Integer MAX_DISTANCE = -3;
     private int MIN_NUM_STOPS = -1;
     private int TIME_INTERVAL_REQUESTS = -1;
     private AppLocationManager locManager;
 
     //These are useful for the case of nearby arrivals
     private ArrivalsManager arrivalsManager = null;
     private ArrivalsStopAdapter arrivalsStopAdapter = null;
 
     public NearbyStopsFragment() {
         // Required empty public constructor
     }
 
     /**
      * Use this factory method to create a new instance of
      * this fragment using the provided parameters.
      * @return A new instance of fragment NearbyStopsFragment.
      */
     public static NearbyStopsFragment newInstance(int fragmentType) {
         if(fragmentType != TYPE_STOPS && fragmentType != TYPE_ARRIVALS )
             throw new IllegalArgumentException("WRONG KIND OF FRAGMENT USED");
         NearbyStopsFragment fragment = new NearbyStopsFragment();
         final Bundle args = new Bundle(1);
         args.putInt(FRAGMENT_TYPE_KEY,fragmentType);
         fragment.setArguments(args);
         return fragment;
     }
 
 
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             setFragmentType(getArguments().getInt(FRAGMENT_TYPE_KEY));
         }
         locManager = AppLocationManager.getInstance(getContext());
         fragmentLocationListener = new FragmentLocationListener(this);
         globalSharedPref = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences),Context.MODE_PRIVATE);
 
 
         globalSharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
 
 
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         if (getContext() == null) throw new RuntimeException();
         View root = inflater.inflate(R.layout.fragment_nearby_stops, container, false);
         gridRecyclerView = root.findViewById(R.id.stopGridRecyclerView);
         gridLayoutManager = new AutoFitGridLayoutManager(getContext().getApplicationContext(), Float.valueOf(utils.convertDipToPixels(getContext(),COLUMN_WIDTH_DP)).intValue());
         gridRecyclerView.setLayoutManager(gridLayoutManager);
         gridRecyclerView.setHasFixedSize(false);
         circlingProgressBar = root.findViewById(R.id.loadingBar);
         flatProgressBar = root.findViewById(R.id.horizontalProgressBar);
         messageTextView = root.findViewById(R.id.messageTextView);
         titleTextView = root.findViewById(R.id.titleTextView);
         switchButton = root.findViewById(R.id.switchButton);
 
         preferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
                 Log.d(DEBUG_TAG,"Key "+key+" was changed");
                 if(key.equals(getString(R.string.databaseUpdatingPref))){
                     if(!sharedPreferences.getBoolean(getString(R.string.databaseUpdatingPref),true)){
                         canStartDBQuery = true;
                         Log.d(DEBUG_TAG,"The database has finished updating, can start update now");
                     }
                 }
             }
         };
         scrollListener = new CommonScrollListener(mListener,false);
         switchButton.setOnClickListener(v -> {
            switchFragmentType();
         });
         Log.d(DEBUG_TAG, "onCreateView");
         return root;
     }
 
     protected ArrayList<Stop> createStopListFromCursor(Cursor data){
         ArrayList<Stop> stopList = new ArrayList<>();
         final int col_id = data.getColumnIndex(StopsTable.COL_ID);
         final int latInd = data.getColumnIndex(StopsTable.COL_LAT);
         final int lonInd = data.getColumnIndex(StopsTable.COL_LONG);
         final int nameindex = data.getColumnIndex(StopsTable.COL_NAME);
         final int typeIndex = data.getColumnIndex(StopsTable.COL_TYPE);
         final int linesIndex = data.getColumnIndex(StopsTable.COL_LINES_STOPPING);
 
         data.moveToFirst();
         for(int i=0; i<data.getCount();i++){
             String[] routes = data.getString(linesIndex).split(",");
 
             stopList.add(new Stop(data.getString(col_id),data.getString(nameindex),null,null,
                             Route.Type.fromCode(data.getInt(typeIndex)),
                             Arrays.asList(routes), //the routes should be compact, not normalized yet
                             data.getDouble(latInd),data.getDouble(lonInd)
                     )
             );
             //Log.d("NearbyStopsFragment","Got stop with id "+data.getString(col_id)+
             //" and name "+data.getString(nameindex));
             data.moveToNext();
         }
         return stopList;
     }
 
     /**
      * Use this method to set the fragment type
      * @param type the type, TYPE_ARRIVALS or TYPE_STOPS
      */
     private void setFragmentType(int type){
         if(type!=TYPE_ARRIVALS && type !=TYPE_STOPS)
             throw new IllegalArgumentException("type not recognized");
         this.fragment_type = type;
         switch(type){
             case TYPE_ARRIVALS:
 
                 TIME_INTERVAL_REQUESTS = 5*1000;
                 break;
             case TYPE_STOPS:
                 TIME_INTERVAL_REQUESTS = 1000;
 
         }
     }
 
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         /// TODO: RISOLVERE PROBLEMA: il context qui e' l'Activity non il Fragment
         if (context instanceof FragmentListenerMain) {
             mListener = (FragmentListenerMain) context;
         } else {
             throw new RuntimeException(context
                     + " must implement OnFragmentInteractionListener");
         }
         Log.d(DEBUG_TAG, "OnAttach called");
     }
 
     @Override
     public void onPause() {
         super.onPause();
         canStartDBQuery = false;
 
         gridRecyclerView.setAdapter(null);
         locManager.removeLocationRequestFor(fragmentLocationListener);
         Log.d(DEBUG_TAG,"On paused called");
     }
 
     @Override
     public void onResume() {
         super.onResume();
         canStartDBQuery = !globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false);
         try{
             if(canStartDBQuery) locManager.addLocationRequestFor(fragmentLocationListener);
         } catch (SecurityException ex){
             //ignored
             //try another location provider
         }
         switch(fragment_type){
             case TYPE_STOPS:
                 if(dataAdapter!=null){
                     gridRecyclerView.setAdapter(dataAdapter);
                     circlingProgressBar.setVisibility(View.GONE);
                 }
                 break;
             case TYPE_ARRIVALS:
                 if(arrivalsStopAdapter!=null){
                     gridRecyclerView.setAdapter(arrivalsStopAdapter);
                     circlingProgressBar.setVisibility(View.GONE);
                 }
         }
 
         mListener.enableRefreshLayout(false);
         Log.d(DEBUG_TAG,"OnResume called");
         if(getContext()==null){
             Log.e(DEBUG_TAG, "NULL CONTEXT, everything is going to crash now");
             MIN_NUM_STOPS = 5;
             MAX_DISTANCE = 600;
             return;
         }
         //Re-read preferences
         SharedPreferences shpr = PreferenceManager.getDefaultSharedPreferences(getContext().getApplicationContext());
         //For some reason, they are all saved as strings
         MAX_DISTANCE = shpr.getInt(getString(R.string.pref_key_radius_recents),600);
         boolean isMinStopInt = true;
         try{
             MIN_NUM_STOPS = shpr.getInt(getString(R.string.pref_key_num_recents), 5);
         } catch (ClassCastException ex){
             isMinStopInt = false;
         }
         if(!isMinStopInt)
             try {
                 MIN_NUM_STOPS = Integer.parseInt(shpr.getString(getString(R.string.pref_key_num_recents), "5"));
             } catch (NumberFormatException ex){
                 MIN_NUM_STOPS = 5;
             }
         if(BuildConfig.DEBUG)
             Log.d(DEBUG_TAG, "Max distance for stops: "+MAX_DISTANCE+
                     ", Min number of stops: "+MIN_NUM_STOPS);
     }
 
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         gridRecyclerView.setVisibility(View.INVISIBLE);
         gridRecyclerView.addOnScrollListener(scrollListener);
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         mListener = null;
         if(arrivalsManager!=null) arrivalsManager.cancelAllRequests();
     }
 
     @NonNull
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         //BUILD URI
         lastReceivedLocation = args.getParcelable(BUNDLE_LOCATION);
         Uri.Builder builder =  new Uri.Builder();
         builder.scheme("content").authority(AppDataProvider.AUTHORITY)
                 .appendPath("stops").appendPath("location")
                 .appendPath(String.valueOf(lastReceivedLocation.getLatitude()))
                 .appendPath(String.valueOf(lastReceivedLocation.getLongitude()))
                 .appendPath(String.valueOf(distance)); //distance
         CursorLoader cl = new CursorLoader(getContext(),builder.build(),PROJECTION,null,null,null);
         cl.setUpdateThrottle(2000);
         return cl;
     }
 
 
     @Override
-    public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
+    public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
         if (0 > MAX_DISTANCE) throw new AssertionError();
         //Cursor might be null
-        Log.d(DEBUG_TAG, "Num stops found: "+data.getCount()+", Current distance: "+distance);
-        if(data==null){
+        if(cursor==null){
             Log.e(DEBUG_TAG,"Null cursor, something really wrong happened");
             return;
         }
-        if(!isDBUpdating() && (data.getCount()<MIN_NUM_STOPS && distance<=MAX_DISTANCE)){
+        Log.d(DEBUG_TAG, "Num stops found: "+cursor.getCount()+", Current distance: "+distance);
+
+        if(!isDBUpdating() && (cursor.getCount()<MIN_NUM_STOPS && distance<=MAX_DISTANCE)){
             distance = distance*2;
             Bundle d = new Bundle();
             d.putParcelable(BUNDLE_LOCATION,lastReceivedLocation);
             getLoaderManager().restartLoader(LOADER_ID,d,this);
             //Log.d(DEBUG_TAG, "Doubling distance now!");
             return;
         }
-        Log.d("LoadFromCursor","Number of nearby stops: "+data.getCount());
+        Log.d("LoadFromCursor","Number of nearby stops: "+cursor.getCount());
         ////////
 
-        if(data.getCount()>0) {
-            ArrayList<Stop> stopList = createStopListFromCursor(data);
+        if(cursor.getCount()>0) {
+            ArrayList<Stop> stopList = createStopListFromCursor(cursor);
             double minDistance = Double.POSITIVE_INFINITY;
             for(Stop s: stopList){
                 minDistance = Math.min(minDistance, s.getDistanceFromLocation(lastReceivedLocation));
             }
 
 
             //quick trial to hopefully always get the stops in the correct order
             Collections.sort(stopList,new StopSorterByDistance(lastReceivedLocation));
             switch (fragment_type){
                 case TYPE_STOPS:
                     showStopsInRecycler(stopList);
                     break;
                 case TYPE_ARRIVALS:
                     arrivalsManager = new ArrivalsManager(stopList);
                     flatProgressBar.setVisibility(View.VISIBLE);
                     flatProgressBar.setProgress(0);
                     flatProgressBar.setIndeterminate(false);
                     //for the moment, be satisfied with only one location
                     //AppLocationManager.getInstance(getContext()).removeLocationRequestFor(fragmentLocationListener);
                     break;
                 default:
             }
 
         } else {
             setNoStopsLayout();
         }
 
     }
 
     @Override
     public void onLoaderReset(@NonNull Loader<Cursor> loader) {
     }
 
     /**
      * To enable targeting from the Button
      */
     public void switchFragmentType(View v){
         switchFragmentType();
     }
 
     /**
      * Call when you need to switch the type of fragment
      */
     private void switchFragmentType(){
         if(fragment_type==TYPE_ARRIVALS){
             setFragmentType(TYPE_STOPS);
             switchButton.setText(getString(R.string.show_arrivals));
             titleTextView.setText(getString(R.string.nearby_stops_message));
             if(arrivalsManager!=null)
                 arrivalsManager.cancelAllRequests();
             if(dataAdapter!=null)
                 gridRecyclerView.setAdapter(dataAdapter);
 
         } else if (fragment_type==TYPE_STOPS){
             setFragmentType(TYPE_ARRIVALS);
             titleTextView.setText(getString(R.string.nearby_arrivals_message));
             switchButton.setText(getString(R.string.show_stops));
             if(arrivalsStopAdapter!=null)
                 gridRecyclerView.setAdapter(arrivalsStopAdapter);
         }
         fragmentLocationListener.lastUpdateTime = -1;
         locManager.removeLocationRequestFor(fragmentLocationListener);
         locManager.addLocationRequestFor(fragmentLocationListener);
     }
 
     //useful methods
     protected boolean isDBUpdating(){
         return globalSharedPref.getBoolean(getString(R.string.databaseUpdatingPref),false);
     }
 
 
     /////// GUI METHODS ////////
     private void showStopsInRecycler(List<Stop> stops){
 
         if(firstLocForStops) {
             dataAdapter = new SquareStopAdapter(stops, mListener, lastReceivedLocation);
             gridRecyclerView.setAdapter(dataAdapter);
             firstLocForStops = false;
         }else {
             dataAdapter.setStops(stops);
             dataAdapter.setUserPosition(lastReceivedLocation);
         }
         dataAdapter.notifyDataSetChanged();
 
         //showRecyclerHidingLoadMessage();
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar.setVisibility(View.GONE);
             gridRecyclerView.setVisibility(View.VISIBLE);
         }
         messageTextView.setVisibility(View.GONE);
 
         if(mListener!=null) mListener.readyGUIfor(FragmentKind.NEARBY_STOPS);
     }
 
     private void showArrivalsInRecycler(List<Palina> palinas){
         Collections.sort(palinas,new StopSorterByDistance(lastReceivedLocation));
 
         final ArrayList<Pair<Stop,Route>> routesPairList = new ArrayList<>(10);
         //int maxNum = Math.min(MAX_STOPS, stopList.size());
         for(Palina p: palinas){
             //if there are no routes available, skip stop
             if(p.queryAllRoutes().size() == 0) continue;
             for(Route r: p.queryAllRoutes()){
                 //if there are no routes, should not do anything
                 routesPairList.add(new Pair<>(p,r));
             }
         }
         if (getContext()==null){
             Log.e(DEBUG_TAG, "Trying to show arrivals in Recycler but we're not attached");
             return;
         }
         if(firstLocForArrivals){
             arrivalsStopAdapter = new ArrivalsStopAdapter(routesPairList,mListener,getContext(),lastReceivedLocation);
             gridRecyclerView.setAdapter(arrivalsStopAdapter);
             firstLocForArrivals = false;
         } else {
             arrivalsStopAdapter.setRoutesPairListAndPosition(routesPairList,lastReceivedLocation);
         }
 
         //arrivalsStopAdapter.notifyDataSetChanged();
 
         showRecyclerHidingLoadMessage();
         if(mListener!=null) mListener.readyGUIfor(FragmentKind.NEARBY_ARRIVALS);
 
     }
 
     private void setNoStopsLayout(){
         messageTextView.setVisibility(View.VISIBLE);
         messageTextView.setText(R.string.no_stops_nearby);
         circlingProgressBar.setVisibility(View.GONE);
     }
 
     /**
      * Does exactly what is says on the tin
      */
     private void showRecyclerHidingLoadMessage(){
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar.setVisibility(View.GONE);
             gridRecyclerView.setVisibility(View.VISIBLE);
         }
         messageTextView.setVisibility(View.GONE);
     }
 
     class ArrivalsManager implements FiveTAPIVolleyRequest.ResponseListener, Response.ErrorListener{
         final HashMap<String,Palina> mStops;
         final Map<String,List<Route>> routesToAdd = new HashMap<>();
         final static String REQUEST_TAG = "NearbyArrivals";
         private final QueryType[] types = {QueryType.ARRIVALS,QueryType.DETAILS};
         final NetworkVolleyManager volleyManager;
         int activeRequestCount = 0,reqErrorCount = 0, reqSuccessCount=0;
 
         ArrivalsManager(List<Stop> stops){
             mStops = new HashMap<>();
             volleyManager = NetworkVolleyManager.getInstance(getContext());
 
             int MAX_ARRIVAL_STOPS = 35;
             for(Stop s: stops.subList(0,Math.min(stops.size(), MAX_ARRIVAL_STOPS))){
                 mStops.put(s.ID,new Palina(s));
                 for(QueryType t: types) {
                     final FiveTAPIVolleyRequest req = FiveTAPIVolleyRequest.getNewRequest(t, s.ID, this, this);
                     if (req != null) {
                         req.setTag(REQUEST_TAG);
                         volleyManager.addToRequestQueue(req);
                         activeRequestCount++;
                     }
                 }
             }
             flatProgressBar.setMax(activeRequestCount);
         }
 
 
 
         @Override
         public void onErrorResponse(VolleyError error) {
             if(error instanceof ParseError){
                 //TODO
                 Log.w(DEBUG_TAG,"Parsing error for stop request");
             } else if (error instanceof NetworkError){
                 String s;
                 if(error.networkResponse!=null)
                     s = new String(error.networkResponse.data);
                 else s="";
                 Log.w(DEBUG_TAG,"Network error: "+s);
             }else {
                 Log.w(DEBUG_TAG,"Volley Error: "+error.getMessage());
             }
             if(error.networkResponse!=null){
                 Log.w(DEBUG_TAG, "Error status code: "+error.networkResponse.statusCode);
             }
             //counters
             activeRequestCount--;
             reqErrorCount++;
             flatProgressBar.setProgress(reqErrorCount+reqSuccessCount);
         }
 
         @Override
         public void onResponse(Palina result, QueryType type) {
             //counter for requests
             activeRequestCount--;
             reqSuccessCount++;
 
 
             final Palina palinaInMap = mStops.get(result.ID);
             //palina cannot be null here
             //sorry for the brutal crash when it happens
             if(palinaInMap == null) throw new IllegalStateException("Cannot get the palina from the map");
             //necessary to split the Arrivals and Details cases
             switch (type){
                 case ARRIVALS:
                     palinaInMap.addInfoFromRoutes(result.queryAllRoutes());
                     final List<Route> possibleRoutes = routesToAdd.get(result.ID);
                     if(possibleRoutes!=null) {
                         palinaInMap.addInfoFromRoutes(possibleRoutes);
                         routesToAdd.remove(result.ID);
                     }
                 break;
                 case DETAILS:
                     if(palinaInMap.queryAllRoutes().size()>0){
                         //merge the branches
                         palinaInMap.addInfoFromRoutes(result.queryAllRoutes());
                     } else {
                         routesToAdd.put(result.ID,result.queryAllRoutes());
                     }
                     break;
                 default:
                     throw new IllegalArgumentException("Wrong QueryType in onResponse");
             }
 
             final ArrayList<Palina> outList = new ArrayList<>();
             for(Palina p: mStops.values()){
                 final List<Route> routes = p.queryAllRoutes();
                 if(routes!=null && routes.size()>0) outList.add(p);
             }
             showArrivalsInRecycler(outList);
             flatProgressBar.setProgress(reqErrorCount+reqSuccessCount);
             if(activeRequestCount==0) {
                 flatProgressBar.setIndeterminate(true);
                 flatProgressBar.setVisibility(View.GONE);
             }
         }
         void cancelAllRequests(){
             volleyManager.getRequestQueue().cancelAll(REQUEST_TAG);
             flatProgressBar.setVisibility(View.GONE);
         }
     }
     /**
      * Local locationListener, to use for the GPS
      */
     class FragmentLocationListener implements AppLocationManager.LocationRequester{
 
         LoaderManager.LoaderCallbacks<Cursor> callbacks;
         private int oldLocStatus = -2;
         private LocationCriteria cr;
         private long lastUpdateTime = -1;
 
         public FragmentLocationListener(LoaderManager.LoaderCallbacks<Cursor> callbacks) {
             this.callbacks = callbacks;
         }
 
         @Override
         public void onLocationChanged(Location location) {
             //set adapter
             float accuracy = location.getAccuracy();
             if(accuracy<60 && canStartDBQuery) {
                 distance = 20;
                 final Bundle msgBundle = new Bundle();
                 msgBundle.putParcelable(BUNDLE_LOCATION,location);
                 getLoaderManager().restartLoader(LOADER_ID,msgBundle,callbacks);
             }
             lastUpdateTime = System.currentTimeMillis();
             Log.d("BusTO:NearPositListen","can start loader "+ canStartDBQuery);
         }
 
         @Override
         public void onLocationStatusChanged(int status) {
             switch(status){
                 case AppLocationManager.LOCATION_GPS_AVAILABLE:
                     messageTextView.setVisibility(View.GONE);
 
                     break;
                 case AppLocationManager.LOCATION_UNAVAILABLE:
                     messageTextView.setText(R.string.enableGpsText);
                     messageTextView.setVisibility(View.VISIBLE);
                     break;
                 default:
                     Log.e(DEBUG_TAG,"Location status not recognized");
             }
         }
 
         @Override
         public LocationCriteria getLocationCriteria() {
 
             return new LocationCriteria(120,TIME_INTERVAL_REQUESTS);
         }
 
         @Override
         public long getLastUpdateTimeMillis() {
             return lastUpdateTime;
         }
         void resetUpdateTime(){
             lastUpdateTime = -1;
         }
 
         @Override
         public void onLocationProviderAvailable() {
 
         }
 
         @Override
         public void onLocationDisabled() {
 
         }
     }
 
     /**
      * Simple trick to get an automatic number of columns (from https://www.journaldev.com/13792/android-gridlayoutmanager-example)
      *
      */
      class AutoFitGridLayoutManager extends GridLayoutManager {
 
         private int columnWidth;
         private boolean columnWidthChanged = true;
 
         public AutoFitGridLayoutManager(Context context, int columnWidth) {
             super(context, 1);
 
             setColumnWidth(columnWidth);
         }
 
         public void setColumnWidth(int newColumnWidth) {
             if (newColumnWidth > 0 && newColumnWidth != columnWidth) {
                 columnWidth = newColumnWidth;
                 columnWidthChanged = true;
             }
         }
 
         @Override
         public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
             if (columnWidthChanged && columnWidth > 0) {
                 int totalSpace;
                 if (getOrientation() == VERTICAL) {
                     totalSpace = getWidth() - getPaddingRight() - getPaddingLeft();
                 } else {
                     totalSpace = getHeight() - getPaddingTop() - getPaddingBottom();
                 }
                 int spanCount = Math.max(1, totalSpace / columnWidth);
                 setSpanCount(spanCount);
                 columnWidthChanged = false;
             }
             super.onLayoutChildren(recycler, state);
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/fragments/SettingsFragment.java b/src/it/reyboz/bustorino/fragments/SettingsFragment.java
index f1dcafb..931c9f0 100644
--- a/src/it/reyboz/bustorino/fragments/SettingsFragment.java
+++ b/src/it/reyboz/bustorino/fragments/SettingsFragment.java
@@ -1,127 +1,144 @@
+/*
+	BusTO  - Fragments components
+    Copyright (C) 2020 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.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.*;
 import it.reyboz.bustorino.R;
 
 import java.lang.ref.WeakReference;
 
 public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = SettingsFragment.class.getName();
 
     private static final String DIALOG_FRAGMENT_TAG =
             "androidx.preference.PreferenceFragment.DIALOG";
     //private static final
     Handler mHandler;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         mHandler = new Handler();
         return super.onCreateView(inflater, container, savedInstanceState);
 
     }
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         //getPreferenceManager().setSharedPreferencesName(getString(R.string.mainSharedPreferences));
         convertStringPrefToIntIfNeeded(getString(R.string.pref_key_num_recents), getContext());
 
         getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
         setPreferencesFromResource(R.xml.preferences,rootKey);
         /*EditTextPreference editPref = findPreference(getString(R.string.pref_key_num_recents));
         editPref.setOnBindEditTextListener(editText -> {
             editText.setInputType(InputType.TYPE_CLASS_NUMBER);
             editText.setSelection(0,editText.getText().length());
         });
          */
 
 
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         Preference pref = findPreference(key);
         Log.d(TAG,"Preference key "+key+" changed");
         //sometimes this happens
         if(getContext()==null) return;
         /*
         THIS CODE STAYS COMMENTED FOR FUTURE REFERENCES
         if (key.equals(getString(R.string.pref_key_num_recents))){
             //check that is it an int
 
             String value = sharedPreferences.getString(key,"");
             boolean valid = value.length() != 0;
             try{
                 Integer intValue = Integer.parseInt(value);
             } catch (NumberFormatException ex){
                 valid = false;
             }
             if (!valid){
                 Toast.makeText(getContext(), R.string.invalid_number, Toast.LENGTH_SHORT).show();
                 if(pref instanceof EditTextPreference){
                     EditTextPreference prefEdit = (EditTextPreference) pref;
                     //Intent intent = prefEdit.getIntent();
                     Log.d(TAG, "opening preference, dialog showing "+
                             (getParentFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG)!=null) );
                     //getPreferenceManager().showDialog(pref);
                     //onDisplayPreferenceDialog(prefEdit);
                     mHandler.postDelayed(new DelayedDisplay(prefEdit), 500);
                 }
 
             }
         }
          */
 
         Log.d("BusTO Settings", "changed "+key+"\n "+sharedPreferences.getAll());
 
     }
 
     private void convertStringPrefToIntIfNeeded(String preferenceKey, Context con){
         if (con == null) return;
         SharedPreferences defaultSharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
         try{
 
             Integer val = defaultSharedPref.getInt(preferenceKey, 0);
         } catch (NumberFormatException | ClassCastException ex){
             //convert the preference
             //final String preferenceNumRecents = getString(R.string.pref_key_num_recents);
             Log.d("Preference - BusTO", "Converting to integer the string preference "+preferenceKey);
             String currentValue = defaultSharedPref.getString(preferenceKey, "10");
             int newValue;
             try{
                 newValue = Integer.parseInt(currentValue);
             } catch (NumberFormatException e){
                 newValue = 10;
             }
             final SharedPreferences.Editor editor  = defaultSharedPref.edit();
             editor.remove(preferenceKey);
             editor.putInt(preferenceKey, newValue);
             editor.apply();
         }
     }
 
     class DelayedDisplay implements Runnable{
         private final WeakReference<DialogPreference> preferenceWeakReference;
 
         public DelayedDisplay(DialogPreference preference) {
             this.preferenceWeakReference = new WeakReference<>(preference);
         }
 
         @Override
         public void run() {
             if(preferenceWeakReference.get()==null)
                 return;
 
             getPreferenceManager().showDialog(preferenceWeakReference.get());
         }
     }
 }
diff --git a/src/it/reyboz/bustorino/map/CustomInfoWindow.java b/src/it/reyboz/bustorino/map/CustomInfoWindow.java
index 57442cd..2ac9861 100644
--- a/src/it/reyboz/bustorino/map/CustomInfoWindow.java
+++ b/src/it/reyboz/bustorino/map/CustomInfoWindow.java
@@ -1,64 +1,82 @@
+/*
+	BusTO - Map components
+	Copyright (C) 2020 Andrea Ugo
+    Copyright (C) 2021 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.map;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.view.MotionEvent;
 import android.view.View;
 
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.infowindow.BasicInfoWindow;
 
 import it.reyboz.bustorino.R;
 
 public class CustomInfoWindow extends BasicInfoWindow {
     //TODO: Make the action on the Click customizable
     private final TouchResponder touchResponder;
     private final String stopID, name;
 
     @Override
     public void onOpen(Object item) {
         super.onOpen(item);
         TextView descr_textView = (TextView) mView.findViewById(R.id.bubble_description);
         CharSequence text = descr_textView.getText();
         if (text==null || !text.toString().isEmpty()){
             descr_textView.setVisibility(View.VISIBLE);
         } else
             descr_textView.setVisibility(View.GONE);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mView.setElevation(3.2f);
         }
     }
 
     @SuppressLint("ClickableViewAccessibility")
     public CustomInfoWindow(MapView mapView, String stopID, String name, TouchResponder responder) {
         // get the personalized layout
         super(R.layout.map_popup, mapView);
         touchResponder =responder;
         this.stopID = stopID;
         this.name = name;
 
         // make clickable
         mView.setOnTouchListener((View v, MotionEvent e) -> {
             if (e.getAction() == MotionEvent.ACTION_UP) {
                 // on click
                 touchResponder.onActionUp(stopID, name);
             }
             return true;
         });
     }
 
     public interface TouchResponder{
         /**
          * React to a click on the stop View
          * @param stopID the stop id
          * @param stopName the stop name
          */
         void onActionUp(@NonNull String stopID, @Nullable String stopName);
     }
 }
diff --git a/src/it/reyboz/bustorino/map/LocationOverlay.java b/src/it/reyboz/bustorino/map/LocationOverlay.java
index 5f991c9..d5c48ab 100644
--- a/src/it/reyboz/bustorino/map/LocationOverlay.java
+++ b/src/it/reyboz/bustorino/map/LocationOverlay.java
@@ -1,63 +1,63 @@
 /*
-	BusTO (middleware)
+	BusTO - Map components
     Copyright (C) 2021 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.map;
 
 
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.mylocation.IMyLocationProvider;
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
 
 public class LocationOverlay extends MyLocationNewOverlay {
 
     final OverlayCallbacks callbacks;
 
     public LocationOverlay(MapView mapView, OverlayCallbacks callbacks) {
         super(mapView);
         this.callbacks = callbacks;
     }
 
     public LocationOverlay(IMyLocationProvider myLocationProvider, MapView mapView, OverlayCallbacks callbacks) {
         super(myLocationProvider, mapView);
         this.callbacks = callbacks;
     }
 
     @Override
     public void enableFollowLocation() {
         super.enableFollowLocation();
         callbacks.onEnableFollowMyLocation();
     }
 
     @Override
     public void disableFollowLocation() {
 
         super.disableFollowLocation();
         callbacks.onDisableFollowMyLocation();
     }
 
     public interface OverlayCallbacks{
         /**
          * Called right after disableFollowMyLocation
          */
         void onDisableFollowMyLocation();
 
         /**
          * Called right after enableFollowMyLocation
          */
         void onEnableFollowMyLocation();
     }
 }
diff --git a/src/it/reyboz/bustorino/middleware/GeneralActivity.java b/src/it/reyboz/bustorino/middleware/GeneralActivity.java
index 4ace9f4..aaf5499 100644
--- a/src/it/reyboz/bustorino/middleware/GeneralActivity.java
+++ b/src/it/reyboz/bustorino/middleware/GeneralActivity.java
@@ -1,154 +1,155 @@
 package it.reyboz.bustorino.middleware;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import com.google.android.material.snackbar.Snackbar;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import java.util.HashMap;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.utils;
+import it.reyboz.bustorino.data.PreferencesHolder;
 
 /**
  * Activity class that contains all the generally useful methods
  */
 public abstract class GeneralActivity extends AppCompatActivity {
     final static protected int PERMISSION_REQUEST_POSITION = 33;
     final static protected String LOCATION_PERMISSION_GIVEN = "loc_permission";
     final static protected int STORAGE_PERMISSION_REQ = 291;
 
     final static protected int PERMISSION_OK = 0;
     final static protected int PERMISSION_ASKING = 11;
     final static protected int PERMISSION_NEG_CANNOT_ASK = -3;
 
     final static private String DEBUG_TAG = "BusTO-GeneralAct";
 
     /*
      * Permission stuff
      */
     protected HashMap<String,Runnable> permissionDoneRunnables = new HashMap<>();
     protected HashMap<String,Integer> permissionAsked = new HashMap<>();
 
     protected void setOption(String optionName, boolean value) {
         SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
         editor.putBoolean(optionName, value);
         editor.commit();
     }
 
     protected boolean getOption(String optionName, boolean optDefault) {
         SharedPreferences preferences = getPreferences(MODE_PRIVATE);
         return preferences.getBoolean(optionName, optDefault);
     }
 
     protected SharedPreferences getMainSharedPreferences(){
-        return getSharedPreferences(getString(R.string.mainSharedPreferences),MODE_PRIVATE);
+        return PreferencesHolder.getMainSharedPreferences(this);
     }
     public void hideKeyboard() {
         View view = getCurrentFocus();
         if (view != null) {
             ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
                     .hideSoftInputFromWindow(view.getWindowToken(),
                             InputMethodManager.HIDE_NOT_ALWAYS);
         }
     }
 
     public void showToastMessage(int messageID, boolean short_lenght) {
         final int length = short_lenght ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
         Toast.makeText(getApplicationContext(), messageID, length).show();
     }
 
     public int askForPermissionIfNeeded(String permission, int requestID){
 
         if(ContextCompat.checkSelfPermission(getApplicationContext(),permission)==PackageManager.PERMISSION_GRANTED){
             return PERMISSION_OK;
         }
         //need to ask for the permission
         //consider scenario when we have already asked for permission
         boolean alreadyAsked = false;
         Integer num_trials = 0;
         synchronized (this){
             if (permissionAsked.containsKey(permission)){
                 num_trials = permissionAsked.get(permission);
                 if (num_trials != null && num_trials > 4)
                     alreadyAsked = true;
 
             }
         }
         Log.d(DEBUG_TAG,"Already asked for permission: "+permission+" -> "+num_trials);
 
         if(!alreadyAsked){
             ActivityCompat.requestPermissions(this,new String[]{permission}, requestID);
             synchronized (this){
                 if (num_trials!=null){
                     permissionAsked.put(permission, num_trials+1);
                 }
             }
             return PERMISSION_ASKING;
         } else {
 
             return PERMISSION_NEG_CANNOT_ASK;
         }
 
     }
 
     public void createSnackbar(int ViewID, String message,int duration){
         Snackbar.make(findViewById(ViewID),message,duration);
     }
 
     /*
     METHOD THAT MIGHT BE USEFUL LATER
     public void assertPermissions(String[] permissions){
         ArrayList<String> permissionstoRequest = new ArrayList<>();
 
         for(int i=0;i<permissions.length;i++){
             if(ContextCompat.checkSelfPermission(getApplicationContext(),permissions[i])!=PackageManager.PERMISSION_GRANTED){
                 permissionstoRequest.add(permissions[i]);
             }
         }
 
         ActivityCompat.requestPermissions(this,permissionstoRequest.toArray(new String[permissionstoRequest]));
     }
     */
 
     //KEYBOARD STUFF
     protected  View getRootView() {
         return findViewById(android.R.id.content);
     }
 
     /**
      * This method doesn't work, DO NOT USE
      * @return if the keyboard is open
      * TODO: fix this if you want
      */
     @Deprecated
     public Boolean isKeyboardOpen(){
         Rect visibleBounds = new Rect();
         this.getRootView().getWindowVisibleDisplayFrame(visibleBounds);
 
         double heightDiff = getRootView().getHeight() - visibleBounds.height();
         final double marginOfError = Math.round(utils.convertDipToPixels(this,50f));
         return heightDiff > marginOfError;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
 }