diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 34f967c..acafe31 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,148 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
     <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"/>
     <uses-permission
             android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- this is to REMOVE the permission from MQTT service -->
     <!--<uses-permission
             android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
             tools:node="remove"/>
             -->
 
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="http"/>
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="geo"/>
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="https"/>
         </intent>
         <intent>
             <action android:name="com.google.zxing.client.android.SCAN"/>
         </intent>
         <intent>
             <action android:name="com.google.zxing.client.android.ENCODE"/>
         </intent>
     </queries>
 
     <application
             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=".ActivityBackup"
-                android:label="@string/backup_activity"
+                android:label="@string/backup_restore"
                 android:parentActivityName=".ActivityPrincipal"
-                android:theme="@style/MapTheme"
+                android:theme="@style/BackupTheme"
                 android:exported="false"/>
         <activity
                 android:name=".ActivityIntro"
                 android:exported="false"
                 android:theme="@style/AppTheme.NoActionBar.Light"
         />
         <activity
                 android:name=".ActivityExperiments"
                 android:label="@string/experiments"
                 android:theme="@style/MapTheme">
         </activity>
         <activity
                 android:name=".ActivityPrincipal"
                 android:exported="true"
                 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_activity"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/AboutTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityPrincipal"/>
         </activity>
 
         <provider
                 android:name=".data.AppDataProvider"
                 android:authorities="it.reyboz.bustorino.provider"
                 android:enabled="true"
                 android:exported="false">
         </provider> <!-- 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.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="it.reyboz.bustorino.ActivityPrincipal"/>
         </activity>
 
         <service tools:node="replace" android:name="info.mqtt.android.service.MqttService"
                  android:exported="false"
         />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
index eecec7f..817f8a4 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
@@ -1,862 +1,861 @@
 /*
 	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.*;
 import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.graphics.Insets;
 import androidx.core.view.*;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.PreferenceManager;
 import androidx.work.WorkInfo;
 
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.util.Arrays;
 
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.data.DBUpdateCheckWorker;
 import it.reyboz.bustorino.data.DBUpdateWorker;
 import it.reyboz.bustorino.data.PreferencesHolder;
 import it.reyboz.bustorino.fragments.*;
 import it.reyboz.bustorino.middleware.GeneralActivity;
 import it.reyboz.bustorino.viewmodels.ServiceAlertsViewModel;
 
 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;
     private boolean onCreateComplete = false;
 
     private ServiceAlertsViewModel  serviceAlertsViewModel;
 
     private long lastClosingAttempt = -1L;
     private final OnBackPressedCallback backPressedCallback = new OnBackPressedCallback(false) {
         @Override
         public void handleOnBackPressed() {
             boolean isResolved = activityCustomBackPressed();
             Log.d(DEBUG_TAG, "backpress resolved: " + isResolved);
             if(!isResolved){
                 long currentTime = System.currentTimeMillis();
                 if(currentTime - lastClosingAttempt < 2000){
                     finish();
                 } else{
                     lastClosingAttempt = currentTime;
                     Toast.makeText(getApplicationContext(),R.string.back_again_to_close,Toast.LENGTH_SHORT).show();
                 }
             }
         }
     };
 
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.d(DEBUG_TAG, "onCreate, savedInstanceState is: "+savedInstanceState);
         setContentView(R.layout.activity_principal);
         serviceAlertsViewModel = new ViewModelProvider(this).get(ServiceAlertsViewModel.class);
 
         /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             getWindow().setNavigationBarContrastEnforced(false);
         }
          */
 
         //onBackPressed solution required from Android 16
         backPressedCallback.setEnabled(true);
         this.getOnBackPressedDispatcher().addCallback(backPressedCallback);
         boolean showingArrivalsFromIntent = false;
 
         final 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);
             Log.d(DEBUG_TAG, "Opening Intent: busStopID: "+busStopID);
             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);
             //Log.d(DEBUG_TAG, "Requesting arrivals for stop "+busStopID+" from intent");
             requestArrivalsForStopID(busStopID); //this shows the fragment, too
             showingArrivalsFromIntent = true;
         }
         //database check
 
         //        DatabaseUpdate.requestDBUpdateWithWork(this, false, false);
         DBUpdateCheckWorker.Companion.schedulePeriodicCheck(this,false);
         /*
         Watch for database update
          */
         DBUpdateWorker.getWorkInfoLiveData(this)
                 .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) {
                         createDatabaseUpdateSnackbar();
                     } else {
                         if(snackbar!=null) {
                             snackbar.dismiss();
                             snackbar = null;
                         }
                     }
 
                 });
         // show the main fragment
         Fragment f = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         Log.d(DEBUG_TAG, "OnCreate the fragment is "+f);
         String vl = PreferenceManager.getDefaultSharedPreferences(this).getString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "");
         //if (vl.length() == 0 || vl.equals("arrivals")) {
         //    showMainFragment();
         Log.d(DEBUG_TAG, "The default screen to open is: "+vl);
         if (showingArrivalsFromIntent){
             //do nothing but exclude a case
         }else if (savedInstanceState==null) {
             //we are not restarting the activity from nothing
             if (vl.equals("map")) {
                 requestMapFragment(false);
             } else if (vl.equals("favorites")) {
                 checkAndShowFavoritesFragment(getSupportFragmentManager(), false);
             } else if (vl.equals("lines")) {
                 showLinesFragment(getSupportFragmentManager(), false, null);
             } else {
                 showMainFragment(false);
             }
         }
         onCreateComplete = true;
 
         //last but not least, set the good default values
         checkApplyDefaultSettingsValues();
         // handle the device "insets"
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.rootRelativeLayout), (v, windowInsets) -> {
             Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
             // Apply the insets as a margin to the view. This solution sets only the
             // bottom, left, and right dimensions, but you can apply whichever insets are
             // appropriate to your layout. You can also update the view padding if that's
             // more appropriate.
             ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
             mlp.leftMargin = insets.left;
             mlp.bottomMargin = insets.bottom;
             mlp.rightMargin = insets.right;
             v.setLayoutParams(mlp);
             //set for toolbar
             //mlp = (ViewGroup.MarginLayoutParams) mToolbar.getLayoutParams();
             //mlp.topMargin = insets.top;
             //mToolbar.setLayoutParams(mlp);
             mToolbar.setPadding(0, insets.top, 0, 0);
 
             // Return CONSUMED if you don't want the window insets to keep passing
             // down to descendant views.
             return WindowInsetsCompat.CONSUMED;
         });
 
         /*
         ViewCompat.setOnApplyWindowInsetsListener(mToolbar, (v, windowInsets) -> {
             Insets statusBarInsets = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars());
             // Apply the insets as a margin to the view.
             ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
             mlp.topMargin = statusBarInsets.top;
             v.setLayoutParams(mlp);
             v.setPadding(0, statusBarInsets.top, 0, 0);
 
             // Return CONSUMED if you don't want the window insets to keep passing
             // down to descendant views.
             return WindowInsetsCompat.CONSUMED;
         });
 
          */
         //to properly handle IME
         WindowInsetsControllerCompat insetsController =
                 WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView());
 
         if (insetsController != null) {
             insetsController.setSystemBarsBehavior(
                     WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             );
         }
 
 
 
         //check if first run activity (IntroActivity) has been started once or not
         final SharedPreferences theShPr = getMainSharedPreferences();
         boolean hasIntroRun = theShPr.getBoolean(PreferencesHolder.PREF_INTRO_ACTIVITY_RUN,false);
         if(!hasIntroRun){
             startIntroductionActivity();
         }
         serviceAlertsViewModel.getLastTimeRunningDownload().observe(this, (timeRunning) -> {
             if (timeRunning != null) {
                 Log.d(DEBUG_TAG, "requested alerts download at time: "+timeRunning);
             }
         });
         serviceAlertsViewModel.launchAlertsPeriodCheck();
 
     }
     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
                         checkAndShowFavoritesFragment(getSupportFragmentManager(), true);
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_arrivals){
                         closeDrawerIfOpen();
                         showMainFragment(true);
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_map_item){
                         closeDrawerIfOpen();
                         requestMapFragment(true);
                         return true;
                     } else if (menuItem.getItemId() == R.id.nav_lines_item) {
                         closeDrawerIfOpen();
                         showLinesFragment(getSupportFragmentManager(), true,null);
                         return true;
                     } else if(menuItem.getItemId() ==  R.id.drawer_action_info) {
                         closeDrawerIfOpen();
                         startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                         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.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);
     }
 
     //requesting permissions
     @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 (permissionDoneRunnables.containsKey(storagePerm)) {
                 Runnable toRun = permissionDoneRunnables.get(storagePerm);
                 if (toRun != null)
                     toRun.run();
                 permissionDoneRunnables.remove(storagePerm);
             }
 
             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() {
         if (!activityCustomBackPressed())
             super.onBackPressed();
     }
 
      */
 
     private boolean activityCustomBackPressed(){
         boolean resolved = true;
         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().popBackStack();
             if(showingMainFragmentFromOther && getSupportFragmentManager().getBackStackEntryCount() > 0){
                 getSupportFragmentManager().popBackStack();
                 Log.d(DEBUG_TAG, "Popping main back stack also");
             }
         }
         else if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
             getSupportFragmentManager().popBackStack();
             Log.d(DEBUG_TAG, "Popping main frame backstack for fragments");
         }
         else{
             resolved = false;
         }
        return resolved;
     }
 
     /**
      * Create and show the SnackBar with the message
      * The fragment shown points to which view to attach the snackbar
      */
     private void createDatabaseUpdateSnackbar() {
         View baseView = null;
         boolean showSnackbar = true;
         final Fragment frag = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         if (frag instanceof ScreenBaseFragment){
             baseView = ((ScreenBaseFragment) frag).getBaseViewForSnackBar();
             showSnackbar = ((ScreenBaseFragment) frag).showSnackbarOnDBUpdate();
         }
         if (baseView == null) baseView = findViewById(R.id.mainActContentFrame);
         //if (baseView == null) Log.e(DEBUG_TAG, "baseView null for default snackbar, probably exploding now");
         if (baseView !=null && showSnackbar) {
             snackbar = Snackbar.make(baseView, R.string.database_update_msg_inapp, Snackbar.LENGTH_INDEFINITE);
             snackbar.setTextColor(getColor(android.R.color.white));
             snackbar.setBackgroundTint(getColor(R.color.grey_800));
             if (frag instanceof ScreenBaseFragment){
                 ((ScreenBaseFragment) frag).setSnackbarPropertiesBeforeShowing(snackbar);
             }
             snackbar.show();
 
         } else{
             Log.e(DEBUG_TAG, "Asked to show the snackbar but the baseView is null");
         }
     }
 
     /**
      * 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, boolean addToBackStack){
         FragmentTransaction ft  = fraMan.beginTransaction()
                 .replace(R.id.mainActContentFrame, fragment, MainScreenFragment.FRAGMENT_TAG)
                 .setReorderingAllowed(false)
                 /*.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);
         if (addToBackStack)  ft.addToBackStack(null);
         ft.commit();
     }
     /**
      * Show the fragment by adding it to the backstack
      * @param fraMan the fragmentManager
      * @param arguments args for the fragment
      */
     private static void createShowMainFragment(FragmentManager fraMan,@Nullable Bundle arguments, boolean addToBackStack){
         FragmentTransaction ft  = fraMan.beginTransaction()
                 .replace(R.id.mainActContentFrame, MainScreenFragment.class, arguments, MainScreenFragment.FRAGMENT_TAG)
                 .setReorderingAllowed(false)
                 /*.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);
         if (addToBackStack)  ft.addToBackStack(null);
         ft.commit();
     }
 
     private void requestMapFragment(final boolean allowReturn){
         // starting from Android 11, we don't need to have the STORAGE permission anymore for the map cache
-
-        /*if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R){
-            //nothing to do
-            Log.d(DEBUG_TAG, "Build codes allow the showing of the map");
-            createAndShowMapFragment(null, allowReturn);
-            return;
-        }
-        final String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
-        int result = askForPermissionIfNeeded(permission, STORAGE_PERMISSION_REQ);
-        Log.d(DEBUG_TAG, "Permission for storage: "+result);
-        switch (result) {
-            case PERMISSION_OK:
+        FragmentManager fm = getSupportFragmentManager();
+        Fragment fragment = fm.findFragmentById(R.id.mainActContentFrame);
+        if(fragment instanceof MapLibreFragment){
+            Log.d(DEBUG_TAG, "Requested map fragment, but it is already open");
+        } else {
+            fragment = fm.findFragmentByTag(MapLibreFragment.FRAGMENT_TAG);
+            if(fragment != null){
+                Log.d(DEBUG_TAG, "Found map fragment, reopening it");
+                var ft = fm.beginTransaction();
+                ft.replace(R.id.mainActContentFrame,fragment, MapLibreFragment.FRAGMENT_TAG);
+                if(allowReturn) ft.addToBackStack(null);
+                ft.commit();
+            } else {
+                //create from scratch
+                //The permissions are handled in the MapLibreFragment instead
                 createAndShowMapFragment(null, allowReturn);
-                break;
-            case PERMISSION_ASKING:
-                permissionDoneRunnables.put(permission,
-                        () -> createAndShowMapFragment(null, allowReturn));
-                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();
+            }
         }
-
-         */
-        //The permissions are handled in the MapLibreFragment instead
-        createAndShowMapFragment(null, allowReturn);
     }
 
-    private static void checkAndShowFavoritesFragment(FragmentManager fragmentManager,  boolean addToBackStack){
+    private void checkAndShowFavoritesFragment(FragmentManager fragmentManager,  boolean addToBackStack){
+        if(getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame) instanceof FavoritesFragment){
+            Log.d(DEBUG_TAG, "Requested favorites fragment, but it is already open");
+            return;
+        }
         FragmentTransaction ft = fragmentManager.beginTransaction();
         Fragment fragment = fragmentManager.findFragmentByTag(TAG_FAVORITES);
         if(fragment!=null){
             ft.replace(R.id.mainActContentFrame, fragment, TAG_FAVORITES);
         }else{
             //use new method
             ft.replace(R.id.mainActContentFrame,FavoritesFragment.class,null,TAG_FAVORITES);
         }
         if (addToBackStack)
             ft.addToBackStack("favorites_main");
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .setReorderingAllowed(false);
         ft.commit();
     }
 
-    private static void showLinesFragment(@NonNull FragmentManager fragmentManager,  boolean addToBackStack, @Nullable Bundle fragArgs){
+    private void showLinesFragment(@NonNull FragmentManager fragmentManager,  boolean addToBackStack, @Nullable Bundle fragArgs){
+        if(getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame) instanceof LinesGridShowingFragment){
+            Log.d(DEBUG_TAG, "Requested lines grid fragment, but it is already open");
+            return;
+        }
         FragmentTransaction ft = fragmentManager.beginTransaction();
         Fragment f = fragmentManager.findFragmentByTag(LinesGridShowingFragment.FRAGMENT_TAG);
         if(f!=null){
             ft.replace(R.id.mainActContentFrame, f, LinesGridShowingFragment.FRAGMENT_TAG);
         }else{
             //use new method
             ft.replace(R.id.mainActContentFrame,LinesGridShowingFragment.class,fragArgs,
                     LinesGridShowingFragment.FRAGMENT_TAG);
         }
         if (addToBackStack)
             ft.addToBackStack("linesGrid");
         ft.setReorderingAllowed(true)
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
 
     private void showMainFragment(boolean addToBackStack){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         final MainScreenFragment mainScreenFragment;
         if (fragment==null | !(fragment instanceof MainScreenFragment)){
             createShowMainFragment(fraMan, null, addToBackStack);
         }
         else if(!fragment.isVisible()){
 
 
             mainScreenFragment = (MainScreenFragment) fragment;
             showMainFragment(fraMan, mainScreenFragment, addToBackStack);
             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 mainFragmentIfVisible = getMainFragmentIfVisible();
         if (mainFragmentIfVisible!=null){
             mainFragmentIfVisible.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;
             case LINES:
                 titleResId=R.string.lines;
                 mNavView.setCheckedItem(R.id.nav_lines_item);
                 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);
             Log.d(DEBUG_TAG, "Requested main fragment, not visible. Search by TAG returned: "+fragment);
             if(fragment!=null){
                 //the fragment is there but not shown
                 probableFragment = (MainScreenFragment) fragment;
                 // set the flag
                 probableFragment.setSuppressArrivalsReload(true);
                 showMainFragment(fraMan, probableFragment, true);
                 probableFragment.requestArrivalsForStopID(ID);
             } else {
                 // we have no fragment
                 final Bundle args = new Bundle();
                 args.putString(MainScreenFragment.PENDING_STOP_SEARCH, ID);
                 //if onCreate is complete, then we are not asking for the first showing fragment
                 boolean addtobackstack = onCreateComplete;
                 createShowMainFragment(fraMan, args ,addtobackstack);
             }
         } else {
             //the MainScreeFragment is shown, nothing to do
             probableFragment.requestArrivalsForStopID(ID);
         }
 
         mNavView.setCheckedItem(R.id.nav_arrivals);
     }
     @Override
     public void openLineFromStop(String routeGtfsId, @Nullable String stopIDFrom){
 
         readyGUIfor(FragmentKind.LINES);
 
         FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
         tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class,
                 LinesDetailFragment.Companion.makeArgs(routeGtfsId, stopIDFrom));
         tr.addToBackStack("LineFromStop-"+routeGtfsId);
         tr.commit();
     }
 
     @Override
     public void openLineFromVehicle(String routeGtfsId, @Nullable String optionalPatternId, @Nullable Bundle args) {
         readyGUIfor(FragmentKind.LINES);
 
         FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
         tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class,
                 LinesDetailFragment.Companion.makeArgsPattern(routeGtfsId, optionalPatternId, args));
         tr.addToBackStack("LineFromOther-"+routeGtfsId);
         tr.commit();
     }
 
     @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, true);
     }
 
     //Map Fragment stuff
     void createAndShowMapFragment(@Nullable Stop stop, boolean addToBackStack){
         final FragmentManager fm = getSupportFragmentManager();
         final FragmentTransaction ft = fm.beginTransaction();
         final MapLibreFragment fragment = MapLibreFragment.newInstance(stop);
         ft.replace(R.id.mainActContentFrame, fragment, MapLibreFragment.FRAGMENT_TAG);
         if (addToBackStack) ft.addToBackStack(null);
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         ft.commit();
     }
 
     void startIntroductionActivity(){
         Intent intent = new Intent(ActivityPrincipal.this, ActivityIntro.class);
         intent.putExtra(ActivityIntro.RESTART_MAIN, false);
         startActivity(intent);
     }
 
     class ToolbarItemClickListener implements Toolbar.OnMenuItemClickListener{
         private final Context activityContext;
 
         public ToolbarItemClickListener(Context activityContext) {
             this.activityContext = activityContext;
         }
 
         @Override
         public boolean onMenuItemClick(MenuItem item) {
             final int id = item.getItemId();
             if(id == R.id.action_about){
                 startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                 return true;
             } else if (id == R.id.action_hack) {
                 openIceweasel(getString(R.string.hack_url), activityContext);
                 return true;
             } else if (id == R.id.action_source){
                 openIceweasel("https://gitpull.it/source/libre-busto/", activityContext);
                 return true;
             } else if (id == R.id.action_licence){
                 openIceweasel("https://www.gnu.org/licenses/gpl-3.0.html", activityContext);
                 return true;
             } else if (id == R.id.action_experiments) {
                 startActivity(new Intent(ActivityPrincipal.this, ActivityExperiments.class));
                 return true;
             } else if (id == R.id.action_tutorial) {
                 startIntroductionActivity();
                 return true;
             }
 
             return false;
         }
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         // stop updating the alerts
         serviceAlertsViewModel.setRunningDownloadRequests(false);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
         serviceAlertsViewModel.launchAlertsPeriodCheck();
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/backend/utils.java b/app/src/main/java/it/reyboz/bustorino/backend/utils.java
index a70cd80..ebd050b 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/utils.java
+++ b/app/src/main/java/it/reyboz/bustorino/backend/utils.java
@@ -1,408 +1,415 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2019 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.backend;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
 import android.util.TypedValue;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import it.reyboz.bustorino.backend.mato.MatoAPIFetcher;
 import it.reyboz.bustorino.fragments.SettingsFragment;
 
 public abstract class utils {
     private static final double EARTH_RADIUS = 6371.009e3;
     public static final String SOURCE_CODE_URL ="https://gitpull.it/source/libre-busto/";
 
 
     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(EARTH_RADIUS *c);
 
     }
     public static Double angleRawDifferenceFromMeters(double distanceInMeters){
          return Math.toDegrees(distanceInMeters/ EARTH_RADIUS);
     }
 
     public static int convertDipToPixelsInt(Context con,double dips)
     {
         return (int) (dips * con.getResources().getDisplayMetrics().density + 0.5f);
     }
 
     /**
      * Convert distance in meters on Earth in degrees of latitude, keeping the same longitude
      * @param distanceMeters distance in meters
      * @return angle in degrees
      */
     public static Double latitudeDelta(Double distanceMeters){
         final double angleRad =  distanceMeters/EARTH_RADIUS;
         return Math.toDegrees(angleRad);
     }
 
     /**
      * Convert distance in meters on Earth in degrees of longitude, keeping the same latitude
      * @param distanceMeters distance in meters
      * @param latitude the latitude that is fixed
      * @return angle in degrees
      */
     public static Double longitudeDelta(Double distanceMeters, Double latitude){
         final double theta = Math.toRadians(latitude);
         final double denom = Math.abs(Math.cos(theta));
         final double angleRad =  2*Math.asin(Math.sin(distanceMeters / EARTH_RADIUS) / denom);
         return Math.toDegrees(angleRad);
     }
 
     public static float convertDipToPixels(Context con, float dp){
         return convertDipToPixels(con.getResources(), dp);
     }
     public static float convertDipToPixels(Resources res, float dp){
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,res.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;
     }
     final static Pattern ROMAN_PATTERN =  Pattern.compile(
             "^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$");
     private static boolean isRomanNumber(String str){
         if(str.isEmpty()) return false;
         final Matcher matcher = ROMAN_PATTERN.matcher(str);
         return matcher.find();
     }
 
     public static String toTitleCase(String givenString, boolean lowercaseRest) {
         String[] arr = givenString.trim().split(" ");
         StringBuilder sb = new StringBuilder();
         //Log.d("BusTO chars", "String parsing: "+givenString+" in array: "+ Arrays.toString(arr));
         for (String s : arr) {
             if (s.length() > 0) {
                 String[] allsubs = s.split("\\.");
 
                 boolean addPoint = s.contains(".");
                 /*if (s.contains(".lli")|| s.contains(".LLI")) //Fratelli
                 {
                 DOESN'T ALWAYS WORK
                     addPoint = false;
                     allsubs = new String[]{s};
                 }*/
                 boolean first = true;
                 for (String subs : allsubs) {
                     if(first) first=false;
                     else {
                         if (addPoint) sb.append(".");
                         sb.append(" ");
                     }
                     if(isRomanNumber(subs)){
                         //add and skip the rest
                         sb.append(subs);
                         continue;
                     }
                     //SPLIT ON ', check if contains "D'"
                     if(subs.toLowerCase(Locale.ROOT).startsWith("d'")){
                         sb.append("D'");
                         subs = subs.substring(2);
                     }
                     int index = 0;
                     char c = subs.charAt(index);
                     if(subs.length() > 1 && c=='('){
                         sb.append(c);
                         index += 1;
                         c = subs.charAt(index);
                     }
                     sb.append(Character.toUpperCase(c));
                     if (lowercaseRest)
                         sb.append(subs.substring(index+1).toLowerCase(Locale.ROOT));
                     else
                         sb.append(subs.substring(index+1));
 
                 }
                 if(addPoint && allsubs.length == 1) sb.append('.');
                 sb.append(" ");
                 /*sb.append(Character.toUpperCase(arr[i].charAt(0)));
                 if (lowercaseRest)
                     sb.append(arr[i].substring(1).toLowerCase(Locale.ROOT));
                 else
                     sb.append(arr[i].substring(1));
                 sb.append(" ");
 
                  */
             } else sb.append(s);
         }
         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);
         } else{
             Log.e("BusTO","openIceweasel can't find a browser");
         }
     }
 
     /**
      * Get the default list of fetchers for arrival times
      * @return array of ArrivalsFetchers to use
      */
     public static ArrivalsFetcher[] getDefaultArrivalsFetchers(){
         return  new ArrivalsFetcher[]{  new MatoAPIFetcher(),
                  new GTTJSONFetcher(), new FiveTScraperFetcher()};
     }
     /**
      * Get the default list of fetchers for arrival times
      * @return array of ArrivalsFetchers to use
      */
     public static List<ArrivalsFetcher> getDefaultArrivalsFetchers(Context context){
         SharedPreferences defSharPref = PreferenceManager.getDefaultSharedPreferences(context);
         final Set<String> setSelected = new HashSet<>(defSharPref.getStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE,
                 new HashSet<>()));
         if (setSelected.isEmpty()) {
             return Arrays.asList(new MatoAPIFetcher(),
                     new GTTJSONFetcher(), new FiveTScraperFetcher());
         }else{
             ArrayList<ArrivalsFetcher> outFetchers = new ArrayList<>(4);
             /*for(String s: setSelected){
                 switch (s){
                     case "matofetcher":
                         outFetchers.add(new MatoAPIFetcher());
                         break;
                     case "fivetapifetcher":
                         outFetchers.add(new FiveTAPIFetcher());
                         break;
                     case "gttjsonfetcher":
                         outFetchers.add(new GTTJSONFetcher());
                         break;
                     case "fivetscraper":
                         outFetchers.add(new FiveTScraperFetcher());
                         break;
                     default:
                         throw  new IllegalArgumentException();
                 }
             }*/
             if (setSelected.contains("matofetcher")) {
                 outFetchers.add(new MatoAPIFetcher());
                 setSelected.remove("matofetcher");
             }
             if (setSelected.contains("fivetapifetcher")) {
                 outFetchers.add(new FiveTAPIFetcher());
                 setSelected.remove("fivetapifetcher");
             }
             if (setSelected.contains("gttjsonfetcher")){
                 outFetchers.add(new GTTJSONFetcher());
                 setSelected.remove("gttjsonfetcher");
             }
             if (setSelected.contains("fivetscraper")) {
                 outFetchers.add(new FiveTScraperFetcher());
                 setSelected.remove("fivetscraper");
             }
             if(!setSelected.isEmpty()){
                 Log.e("BusTO-Utils","Getting some fetchers values which are not contemplated: "+setSelected);
             }
 
             return outFetchers;
         }
     }
     /*public String getShorterDirection(String headSign){
         String[] parts = headSign.split(",");
         if (parts.length<=1){
             return  headSign.trim();
         }
         String first = parts[0].trim();
         String second = parts[1].trim();
         String firstLower = first.toLowerCase(Locale.ITALIAN);
         switch (firstLower){
             case "circolare destra":
             case "circolare sinistra":
                 case
         }
     }*/
     /**
      * 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();
     }
 
     public static <T> Set<T> convertArrayToSet(T[] array)
     {
         // Create an empty Set
         Set<T> set = new HashSet<>();
         // Add each element into the set
         set.addAll(Arrays.asList(array));
 
         // Return the converted Set
         return set;
     }
 
     public static <T> String giveClassesForArray(T[] array){
         StringBuilder sb = new StringBuilder();
         for (T f: array){
             sb.append("");
             sb.append(f.getClass().getSimpleName());
             sb.append("; ");
         }
         return sb.toString();
     }
 
     public static Spanned convertHtml(String text) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             return Html.fromHtml(text, Html.FROM_HTML_MODE_COMPACT);
         } else {
             return Html.fromHtml(text);
         }
     }
     /**
      * Convert an integer (long) timestamp into a String
      * @param timestamp the timestamp in seconds (NOT milliseconds)
      * @return the formatted String
      */
     public static String unixTimestampToLocalTime(long timestamp){
         return unixTimestampToLocalTime(timestamp, "dd/MM/yyyy HH:mm:ss");
     }
     /**
      * Convert an integer (long) timestamp into a String
      * @param timestamp the timestamp in seconds (NOT milliseconds)
      * @param patternFormat the format to convert it to
      * @return the formatted String
      */
     public static String unixTimestampToLocalTime(long timestamp, String patternFormat) {
         Date date = new Date(timestamp * 1000L); // seconds to milliseconds
         SimpleDateFormat format = new SimpleDateFormat(patternFormat, Locale.getDefault());
         return format.format(date);
     }
+
+    public static Double roundDecimalUsingBigDecimal(Double value, int decimalPlace) {
+        return new BigDecimal(value).setScale(decimalPlace,
+                RoundingMode.HALF_UP).stripTrailingZeros().doubleValue();
+    }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/BackupImportFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/BackupImportFragment.kt
index 1a6adf1..86007dc 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/BackupImportFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/BackupImportFragment.kt
@@ -1,315 +1,315 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2024 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.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.CheckBox
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import de.siegmar.fastcsv.reader.CsvReader
 import de.siegmar.fastcsv.writer.CsvWriter
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.data.UserDB
 import it.reyboz.bustorino.util.ImportExport
 import java.io.*
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
 
 
 /**
  * A simple [Fragment] subclass.
  * Use the [BackupImportFragment.newInstance] factory method to
  * create an instance of this fragment.
  */
 class BackupImportFragment : Fragment() {
 
     private val saveFileLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
                 result.data?.data?.also { uri ->
                     writeDataZip(uri)
                 }
             }
         }
 
     private val openFileLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (!(loadFavorites|| loadPreferences)){
                 Toast.makeText(context, R.string.message_check_at_least_one, Toast.LENGTH_SHORT).show()
             }
             else if (result.resultCode == Activity.RESULT_OK) {
                 result.data?.data?.also { uri ->
                     loadZipData(uri,loadFavorites, loadPreferences)
                 }
             }
         }
 
 
     private lateinit var saveButton: Button
     private var loadFavorites = true
     private var loadPreferences = true
     private lateinit var checkFavorites: CheckBox
     private lateinit var checkPreferences: CheckBox
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         /*arguments?.let {
             param1 = it.getString(ARG_PARAM1)
             param2 = it.getString(ARG_PARAM2)
         }*/
     }
 
 
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
-        val rootview= inflater.inflate(R.layout.fragment_test_saving, container, false)
+        val rootview= inflater.inflate(R.layout.fragment_backup, container, false)
 
         saveButton = rootview.findViewById(R.id.saveButton)
         saveButton.setOnClickListener {
             startFileSaveIntent()
         }
         checkFavorites = rootview.findViewById(R.id.favoritesCheckBox)
         checkFavorites.setOnCheckedChangeListener { _, isChecked ->
             loadFavorites = isChecked
 
         }
         checkPreferences = rootview.findViewById(R.id.preferencesCheckBox)
         checkPreferences.setOnCheckedChangeListener { _, isChecked ->
             loadPreferences = isChecked
 
         }
         val readFavoritesButton = rootview.findViewById<Button>(R.id.loadDataButton)
         readFavoritesButton.setOnClickListener {
             startOpenCSVIntent()
         }
 
 
         return rootview
     }
     private fun startFileSaveIntent() {
         val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             val day_string = getCurrentDateString()
             type = "application/zip" //"text/csv" // Set MIME type to CSV
             putExtra(Intent.EXTRA_TITLE, "busto_data_${day_string}.zip") // Default file name
             // Optionally, specify a URI for the directory that should be opened in
             // the system file picker before your app creates the document.
             //putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri)
         }
         saveFileLauncher.launch(intent)
     }
 
     private fun writeCsv(uri: Uri){
         val context = context ?: return
         val contentResolver = context.contentResolver
         contentResolver.openOutputStream(uri)?.use {
             OutputStreamWriter(it).use {wr->
                 val csvWriter = CsvWriter.builder().build(wr)
                 val userDB = UserDB.getInstance(context)
                 userDB.writeFavoritesToCsv(csvWriter)
                 csvWriter.close()
-                Toast.makeText(context, R.string.saved_data, Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, R.string.backup_completed_toast, Toast.LENGTH_SHORT).show()
             }
 
         }
     }
     private fun writeStringToZipOS(string: String, zipOutputStream: ZipOutputStream){
         val bais = ByteArrayInputStream(string.toByteArray())
         val bytes = ByteArray(1024)
         var length: Int
         while ((bais.read(bytes).also { length = it }) >= 0) {
             zipOutputStream.write(bytes, 0, length)
         }
     }
 
     private fun readFileToString(zipInputStream: ZipInputStream): String{
         val buffer = ByteArrayOutputStream()
         val data = ByteArray(1024)
         var count: Int
         // Read the content of the specific entry into the buffer
         while (zipInputStream.read(data, 0, data.size).also { count = it } != -1) {
             buffer.write(data, 0, count)
         }
         // Convert the buffer's content to a string
         return buffer.toString()
     }
 
     private fun writeDataZip(uri: Uri){
         val context = context ?: return
         val contentResolver = context.contentResolver
         contentResolver.openOutputStream(uri)?.use {outs ->
             val bof = BufferedOutputStream(outs)
             val zipOutputStream = ZipOutputStream(bof)
 
             //write main preferences
             zipOutputStream.putNextEntry(ZipEntry(MAIN_PREF_NAME))
             var sharedPrefs = PreferencesHolder.getMainSharedPreferences(context)
             var jsonPref = ImportExport.writeSharedPreferencesIntoJSON(sharedPrefs)
             writeStringToZipOS(jsonPref.toString(2), zipOutputStream)
             zipOutputStream.closeEntry()
 
             zipOutputStream.putNextEntry(ZipEntry(APP_PREF_NAME))
             sharedPrefs = PreferencesHolder.getAppPreferences(context)
             jsonPref = ImportExport.writeSharedPreferencesIntoJSON(sharedPrefs)
             writeStringToZipOS(jsonPref.toString(2), zipOutputStream)
             zipOutputStream.closeEntry()
             //add CSV
             zipOutputStream.putNextEntry(ZipEntry(FAVORITES_NAME))
             val outWriter = OutputStreamWriter(zipOutputStream)
             val csvWriter = CsvWriter.builder().build(outWriter)
             val userDB = UserDB.getInstance(context)
             userDB.writeFavoritesToCsv(csvWriter)
             csvWriter.flush()
             outWriter.flush()
             zipOutputStream.closeEntry()
 
             zipOutputStream.close()
 
-            Toast.makeText(context, R.string.saved_data, Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, R.string.backup_completed_toast, Toast.LENGTH_SHORT).show()
         }
     }
     private fun loadZipData(uri: Uri, loadFavorites: Boolean, loadPreferences: Boolean){
         val context = context ?: return
         val contentResolver = context.contentResolver
         contentResolver.openInputStream(uri)?.use {ins->
             ZipInputStream(ins).use {zipstream->
                 var entry: ZipEntry? = zipstream.nextEntry
 
                 while (entry != null) {
                     Log.d("testSavingFragment", "read file: ${entry.name}")
                     when (entry.name){
                         FAVORITES_NAME -> if (loadFavorites) {
 
                             val reader = InputStreamReader(zipstream)
                             val csvReader = CsvReader.builder().ofCsvRecord(reader)
 
                             val userDB =  UserDB.getInstance(context)
                             val updated = userDB.insertRowsFromCSV(csvReader)
 
                             //userDB.close()
                             //csvReader.close()
                             Log.d(DEBUG_TAG, "Inserted $updated rows into UserDB - Favorites")
                         }
                         APP_PREF_NAME -> if(loadPreferences){
                             val jsonString = readFileToString(zipstream)
                             try {
                                 val pref = PreferencesHolder.getAppPreferences(context)
                                 ImportExport.importJsonToSharedPreferences(pref, jsonString, null, Regex("osmdroid\\."))
                             } catch (e: Exception){
                                 Log.e(DEBUG_TAG, "Cannot read app preferences from file")
                                 e.printStackTrace()
                             }
                         }
                         //Main preferences contains the lines favorites
                         MAIN_PREF_NAME -> if(loadFavorites){
                             val jsonString = readFileToString(zipstream)
                             try {
                                 val pref = PreferencesHolder.getMainSharedPreferences(context)
                                 //In the future, if we move the favorite lines to a different file,
                                 // We should check here if the key is in the jsonObject, and copy it to the other file
                                 ImportExport.importJsonToSharedPreferences(pref, jsonString, PreferencesHolder.IGNORE_KEYS_LOAD_MAIN, null,
                                     PreferencesHolder.KEYS_MERGE_SET)
                             } catch (e: Exception){
                                 Log.e(DEBUG_TAG, "Cannot read main preferences from file")
                                 e.printStackTrace()
                             }
                         }
                     }
                     //load new entry
                     entry = zipstream.nextEntry
                 }
 
             }
             Toast.makeText(context, R.string.data_imported_backup, Toast.LENGTH_SHORT).show()
         }
 
     }
 
     ///OPEN CSV
     private fun startOpenCSVIntent(){
         val intent= Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             type = "application/zip" // Set MIME type
             // Optionally, specify a URI for the directory that should be opened in
             // the system file picker before your app creates the document.
             //putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri)
         }
         openFileLauncher.launch(intent)
     }
 
     private fun importCSVIntoFavorites(uri: Uri){
         val context = context ?: return
         val contentResolver = context.contentResolver
         contentResolver.openInputStream(uri)?.use {
             InputStreamReader(it).use { stream ->
                 val csvReader = CsvReader.builder().ofCsvRecord(stream)
 
                 val userDB =  UserDB.getInstance(context)
                 val updated = userDB.insertRowsFromCSV(csvReader)
                 Toast.makeText(context, "Read $updated favorites", Toast.LENGTH_SHORT).show()
                 //userDB.close()
                 csvReader.close()
             }
         }
     }
 
     companion object {
 
         const val FILE_SAVE = "favorites.csv"
         const val DEBUG_TAG ="BusTO-TestSave"
 
         const val FAVORITES_NAME = "favorites.csv"
         const val MAIN_PREF_NAME = "preferences_main.json"
         const val APP_PREF_NAME = "preferences_app.json"
 
         @JvmStatic
         fun newInstance() =
             BackupImportFragment().apply {
                 arguments = Bundle() /*.apply {
                     putString(ARG_PARAM1, param1)
                     putString(ARG_PARAM2, param2)
                 }
                 */
             }
 
         fun getCurrentDateString(): String{
 
             val dateFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.ITALY)
             val date = Date()
             return  dateFormat.format(date)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
index da915fc..bfec583 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
@@ -1,1134 +1,1159 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2025 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.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Context.LOCATION_SERVICE
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.location.Location
 import android.location.LocationManager
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.gson.JsonObject
 import it.reyboz.bustorino.BuildConfig
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.FiveTNormalizer
 import it.reyboz.bustorino.backend.LivePositionTripPattern
 import it.reyboz.bustorino.backend.LivePositionsServiceStatus
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.backend.gtfs.GtfsUtils
 import it.reyboz.bustorino.backend.gtfs.LivePositionUpdate
 import it.reyboz.bustorino.backend.utils
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.data.gtfs.TripAndPatternWithStops
 import it.reyboz.bustorino.map.MapLibreLocationEngine
 import it.reyboz.bustorino.map.MapLibreUtils
 import it.reyboz.bustorino.middleware.FusedNativeLocationProvider
 import it.reyboz.bustorino.util.Permissions
 import it.reyboz.bustorino.util.ViewUtils
 import it.reyboz.bustorino.viewmodels.LivePositionsViewModel
 import it.reyboz.bustorino.viewmodels.MapStateViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.maplibre.android.MapLibre
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.LocationComponentActivationOptions
 import org.maplibre.android.location.engine.LocationEngineCallback
 import org.maplibre.android.location.engine.LocationEngineRequest
 import org.maplibre.android.location.engine.LocationEngineResult
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.Property.ICON_ANCHOR_CENTER
 import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP
 import org.maplibre.android.style.layers.Property.TEXT_ANCHOR_CENTER
 import org.maplibre.android.style.layers.Property.TEXT_ROTATION_ALIGNMENT_VIEWPORT
 import org.maplibre.android.style.layers.PropertyFactory
 import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonSource
 import org.maplibre.geojson.Feature
 import org.maplibre.geojson.FeatureCollection
 import org.maplibre.geojson.Point
 import kotlin.time.Duration.Companion.milliseconds
 
 abstract class GeneralMapLibreFragment: ScreenBaseFragment(), OnMapReadyCallback {
     protected var map: MapLibreMap? = null
     protected var shownStopInBottomSheet : Stop? = null
     //protected var savedMapStateOnPause : Bundle? = null
 
 
     protected var fragmentListener: CommonFragmentListener? = null
 
     // Declare a variable for MapView
     protected var mapView: MapView? = null
     protected lateinit var mapStyle: Style
     protected lateinit var stopsSource: GeoJsonSource
     protected lateinit var busesSource: GeoJsonSource
     protected lateinit var selectedStopSource: GeoJsonSource
     protected lateinit var selectedBusSource: GeoJsonSource //= GeoJsonSource(SEL_BUS_SOURCE)
 
     protected lateinit var sharedPreferences: SharedPreferences
     protected lateinit var bottomSheetBehavior: BottomSheetBehavior<RelativeLayout>
 
     protected var locationEngine: MapLibreLocationEngine? = null
     protected lateinit var locationProvider: FusedNativeLocationProvider
 
     protected var shownToastNoPosition = false
     protected var locationEnabledOnDevice = true
 
     //TODO ACTIVATE THIS
     private val preferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener(){ pref, key ->
         /*when(key){
             SettingsFragment.LIBREMAP_STYLE_PREF_KEY -> reloadMap()
         }
 
          */
         if(key == SettingsFragment.LIBREMAP_STYLE_PREF_KEY){
             Log.d(DEBUG_TAG,"ASKING RELOAD OF MAP")
 
-            reloadMap()
+            //reloadMap()
         }
     }
 
+    /**
+     * What to do when requesting the permission, when it's ok, initialize the map location component
+     */
     protected val positionRequestResponder = registerForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions(), ActivityResultCallback{ res ->
             if(!(res.containsKey(PERM_LOC_COARSE)&&res.containsKey(PERM_LOC_FINE))){
                 Log.e(DEBUG_TAG, "Location request does not have the correct keys")
             } else if(res[PERM_LOC_COARSE]!! && res[PERM_LOC_FINE]!!){
                 //permission OK, init map location
                 val mMap = map
                 if(mMap == null){
                     Log.w(DEBUG_TAG, "Location request completed, but map is null!")
                 }else{
                     initializeMapLocationComponent(mMap,requireContext(), null)
                 }
             } else{
                 // PERMISSION DENIED
                 // TODO find better way to show the necessity of the permission
                 if(shouldShowRequestPermissionRationale(PERM_LOC_FINE))
                     Toast.makeText(requireContext(),
                         R.string.enable_position_message_map, Toast.LENGTH_SHORT).show()
             }
         }
     )
     //Bottom sheet behavior in GeneralMapLibreFragment
     protected var bottomLayout: RelativeLayout? = null
     protected lateinit var stopTitleTextView: TextView
     protected lateinit var stopNumberTextView: TextView
     protected lateinit var linesPassingTextView: TextView
     protected lateinit var extraBottomTextView: TextView
     protected lateinit var arrivalsCard: CardView
     protected lateinit var directionsCard: CardView
     protected lateinit var bottomrightImage: ImageView
     protected lateinit var locationComponent: LocationComponent
     protected lateinit var busPositionsIconButton: ImageButton
 
     protected var lastLocation : Location? = null
 
 
     private var lastMapStyle =""
 
     //BUS POSITIONS
     protected val updatesByVehDict = HashMap<String, LivePositionTripPattern>(5)
     protected val animatorsByVeh = HashMap<String, ValueAnimator>()
     protected var vehShowing = ""
     protected var lastUpdateTime:Long = -2
 
     private val lifecycleOwnerLiveData = getViewLifecycleOwnerLiveData()
 
 
     //extra items to use the LibreMap
     protected var symbolManager : SymbolManager? = null
     protected var stopActiveSymbol: Symbol? = null
     protected var stopsLayerStarted = false
     protected val livePositionsViewModel : LivePositionsViewModel by activityViewModels()
 
     //private lateinit var symbolManager: SymbolManager
     protected val mapStateViewModel: MapStateViewModel by viewModels()
     protected var locationInitialized = false
     protected var mapInitialized = false
     protected var receivedFirstLocation = false
 
 
     //location callback to decide if to zoom to the user position
     @SuppressLint("MissingPermission")
     protected val mapLibreLocationCallback = object : LocationEngineCallback<LocationEngineResult> {
         override fun onSuccess(result: LocationEngineResult) {
             val location: Location? = result.lastLocation
             Log.d(DEBUG_TAG, "Received location $location")
             location?.let {
                 //check timing of the location
                 val currentTime = System.currentTimeMillis()
                 val discard = (currentTime - it.time) > 90 * 1000.0  // discard if it is Older than 60 seconds
                 if(!discard) {
                     if (!receivedFirstLocation) {
                         onFirstReceivedLocation(it)
                     }
                     receivedFirstLocation = true
                 }
             }
 
             if(receivedFirstLocation){
-                //remove this
+                //remove this listener once we have received the location
                 locationEngine?.removeLocationUpdates(this)
             }
 
         }
 
         override fun onFailure(exception: Exception) {
             Log.e(DEBUG_TAG, "Error in getting position: ${exception.message}")
         }
     }
 
     protected val deviceLocationStatusListener = FusedNativeLocationProvider.LocationStatusListener { isEnabled ->
         mapStateViewModel.locationDeviceEnabled.value = isEnabled
         if(locationEnabledOnDevice && !isEnabled && locationInitialized) {
             warnLocationNotEnabledOnDevice()
             //setMapLocationEnabled(false)
         }
         locationEnabledOnDevice = isEnabled
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         //sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         lastMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
 
         //init map
         MapLibre.getInstance(requireContext())
 
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         lastMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
         Log.d(DEBUG_TAG, "onCreateView lastMapStyle: $lastMapStyle")
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         //init bottom sheet
         val bottomSheet = view.findViewById<RelativeLayout>(R.id.bottom_sheet)
         bottomLayout = bottomSheet
         stopTitleTextView = view.findViewById(R.id.stopTitleTextView)
         stopNumberTextView = view.findViewById(R.id.stopNumberTextView)
         linesPassingTextView = view.findViewById(R.id.linesPassingTextView)
         arrivalsCard = view.findViewById(R.id.arrivalsCardButton)
         directionsCard = view.findViewById(R.id.directionsCardButton)
         bottomrightImage = view.findViewById(R.id.rightmostImageView)
         bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
         extraBottomTextView = view.findViewById(R.id.extraBottomTextView)
 
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
     }
 
     override fun onResume() {
         super.onResume()
         mapView?.onResume()
         val newMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
         Log.d(DEBUG_TAG, "onResume newMapStyle: $newMapStyle, lastMapStyle: $lastMapStyle")
-        if(newMapStyle!=lastMapStyle){
-            reloadMap()
-        }
+        // TODO: reload style if user changed preferences
+        //if(newMapStyle!=lastMapStyle){
+        //    reloadMap()
+        //}
     }
 
     override fun onLowMemory() {
         mapView?.onLowMemory()
         super.onLowMemory()
     }
 
     override fun onStart() {
         super.onStart()
         mapView?.onStart()
     }
 
     override fun onDestroy() {
         mapView?.onDestroy()
         Log.d(DEBUG_TAG, "Destroyed mapView Fragment!!")
         super.onDestroy()
     }
 
     override fun onStop() {
         mapView?.onStop()
         super.onStop()
     }
 
     override fun onPause() {
         mapView?.onPause()
         super.onPause()
     }
 
 
     override fun onDestroyView() {
         bottomLayout = null
         locationProvider.removeListener(deviceLocationStatusListener)
         mapInitialized = false
         locationInitialized = false
         super.onDestroyView()
     }
 
     protected fun warnLocationNotEnabledOnDevice(){
         context?.let{
             Toast.makeText(it,R.string.enable_location_message,Toast.LENGTH_SHORT).show()
         }
     }
 
     protected fun reloadMap(){
         /*map?.let {
             Log.d("GeneralMapFragment", "RELOADING MAP")
             //save map state
             savedMapStateOnPause = saveMapStateInBundle()
 
             onMapDestroy()
             //Destroy and recreate MAP
             mapView.onDestroy()
             mapView.onCreate(null)
             mapView.getMapAsync(this)
         }
 
          */
-        //TODO figure out how to switch map safely
     }
 
     //For extra stuff to do when the map is destroyed
     abstract fun onMapDestroy()
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if(context is CommonFragmentListener){
             fragmentListener = context
         } else throw RuntimeException("$context must implement CommonFragmentListener")
 
     }
 
     protected fun stopToGeoJsonFeature(s: Stop): Feature{
         return Feature.fromGeometry(
             Point.fromLngLat(s.longitude!!, s.latitude!!),
             JsonObject().apply {
                 addProperty("id", s.ID)
                 addProperty("name", s.stopDefaultName)
                 //addProperty("routes", s.routesThatStopHereToString()) // Add routes array to JSON object
             }
         )
     }
     protected fun isPointInsideVisibleRegion(p: LatLng, other: Boolean): Boolean{
         val bounds = map?.projection?.visibleRegion?.latLngBounds
         var inside = other
         bounds?.let { inside = it.contains(p) }
         return inside
     }
 
     protected fun isPointInsideVisibleRegion(lat: Double, lon: Double, other: Boolean): Boolean{
         val p = LatLng(lat, lon)
         return isPointInsideVisibleRegion(p, other)
     }
 
 
     protected fun removeVehiclesData(vehs: List<String>){
         for(v in vehs){
             if (updatesByVehDict.contains(v)) {
                 updatesByVehDict.remove(v)
                 if (animatorsByVeh.contains(v)){
                     animatorsByVeh[v]?.cancel()
                     animatorsByVeh.remove(v)
                 }
             }
             if (vehShowing==v){
                 hideStopOrBusBottomSheet()
             }
         }
     }
 
     // Hide the bottom sheet and remove extra symbol
     protected open fun hideStopOrBusBottomSheet(){
         if (stopActiveSymbol!=null){
             symbolManager?.delete(stopActiveSymbol)
             stopActiveSymbol = null
         }
         if(!showOpenStopWithSymbolLayer()){
             selectedStopSource.setGeoJson(FeatureCollection.fromFeatures(ArrayList<Feature>()))
         }
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
         //isBottomSheetShowing = false
 
         //reset states
         shownStopInBottomSheet = null
         if (vehShowing!=""){
             //we are hiding a vehicle
             vehShowing = ""
             updatePositionsIcons(true)
         }
         extraBottomTextView.visibility = View.GONE
 
     }
 
     protected fun initSymbolManager(mapReady: MapLibreMap , style: Style){
         val sm = SymbolManager(mapView!!, mapReady, style)
         sm.iconAllowOverlap = true
         sm.textAllowOverlap = false
         sm.addClickListener { _ ->
             if (stopActiveSymbol != null) {
                 hideStopOrBusBottomSheet()
                 return@addClickListener true
             } else
                 return@addClickListener false
         }
         symbolManager = sm
     }
 
     /**
      * Change the icon indicating the status of the live Positions
      */
     protected fun setBusPositionsIcon(enabled: Boolean, error: Boolean){
         val ctx = requireContext()
         if(!enabled)
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_inactive))
         else if(error)
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_notworking))
         else
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_active))
 
     }
 
 
     abstract fun onMapLocationComponentInitialized()
 
     @SuppressLint("MissingPermission")
     protected fun setLocationComponentEnabled(enabled: Boolean): Boolean{
         var changed = false
         map?.apply {
             if(locationComponent.isLocationComponentEnabled !=enabled)
             locationComponent.isLocationComponentEnabled= enabled
         changed = true}
         Log.d(DEBUG_TAG, "Asked to set location component enabled: $enabled, changed: $changed")
         mapStateViewModel.locationUserActive.value = enabled
 
 
         return changed
     }
 
     @SuppressLint("MissingPermission")
     protected fun initializeMapLocationComponent(map: MapLibreMap, context: Context, style: Style?){
         val mStyle = style ?: map.style
         if(locationInitialized){
             Log.w(DEBUG_TAG, "trying to initialize Location Component, but it is already done")
             return
         }
         mStyle?.let{ style ->
             locationComponent = map.locationComponent
 
             locationProvider = FusedNativeLocationProvider(context)
             locationProvider.addListener(deviceLocationStatusListener)
             locationEngine = MapLibreLocationEngine(locationProvider)
             val options = LocationComponentActivationOptions.builder(context, style)
                 .useDefaultLocationEngine(false)
                 .locationEngine(locationEngine)
                 .build()
             locationComponent.activateLocationComponent(options)
 
-            if(BuildConfig.DEBUG) Log.d(DEBUG_TAG, "Requesting location updates")
-            locationEngine!!.requestLocationUpdates(LocationEngineRequest.Builder(500).setDisplacement(20.0f).build(),
-                    mapLibreLocationCallback, null)
+            if(BuildConfig.DEBUG) Log.d(DEBUG_TAG, "Initializing location, request initial position")
+            startInitialPositionRequest()
 
             if(!locationEnabledOnDevice){
                 warnLocationNotEnabledOnDevice()
             }else {
                 setLocationComponentEnabled(true)
             }
             locationInitialized = true
             onMapLocationComponentInitialized()
         }
     }
 
+    @SuppressLint("MissingPermission")
+    protected fun startInitialPositionRequest(){
+        locationEngine?.requestLocationUpdates(LocationEngineRequest.Builder(500).setDisplacement(20.0f).build(),
+            mapLibreLocationCallback, null)
+
+    }
+    protected fun stopInitialPositionRequest(){
+        locationEngine?.removeLocationUpdates(mapLibreLocationCallback)
+    }
+
 
     /**
      * Update function for the bus positions
      * Takes the processed updates and saves them accordingly
      * Unified version that works with both fragments
      *
      * @param incomingData Map of updates with optional trip and pattern information
      * @param hasVehicleTracking If true, checks if vehShowing is updated and calls callback (default: true)
      * @param trackVehicleCallback Optional callback to show vehicle details when vehShowing is updated
      */
     protected fun updateBusPositionsInMap(
         incomingData: HashMap<String, Pair<LivePositionUpdate,TripAndPatternWithStops?>>,
         hasVehicleTracking: Boolean = false,
         trackVehicleCallback: ((String) -> Unit)? = null
     ) {
         val vehsNew = HashSet(incomingData.values.map { up -> up.first.vehicle })
         val vehsOld = HashSet(updatesByVehDict.keys)
 
         Log.d(DEBUG_TAG, "In fragment, have ${incomingData.size} updates to show")
 
         var countUpds = 0
         var createdVehs = 0
 
         for (upsWithTrp in incomingData.values) {
             val newPos = upsWithTrp.first
             val patternStops = upsWithTrp.second
             val vehID = newPos.vehicle
 
             // Validate coordinates
             if (!vehsOld.contains(vehID)) {
                 if (newPos.latitude <= 0 || newPos.longitude <= 0) {
                     Log.w(DEBUG_TAG, "Update ignored for veh $vehID on line ${newPos.routeID}, lat: ${newPos.latitude}, lon ${newPos.longitude}")
                     continue
                 }
             }
 
             if (vehsOld.contains(vehID)) {
                 // Changing the location of an existing bus
                 val oldPosData = updatesByVehDict[vehID]!!
                 val oldPos = oldPosData.posUpdate
                 val oldPattern = oldPosData.pattern
 
                 var avoidShowingUpdateBecauseIsImpossible = false
 
                 // Check for impossible route changes
                 if (oldPos.routeID != newPos.routeID) {
                     val dist = LatLng(oldPos.latitude, oldPos.longitude).distanceTo(
                         LatLng(newPos.latitude, newPos.longitude)
                     )
                     val speed = dist * 3.6 / (newPos.timestamp - oldPos.timestamp) // km/h
                     Log.w(DEBUG_TAG, "Vehicle $vehID changed route from ${oldPos.routeID} to ${newPos.routeID}, distance: $dist, speed: $speed")
                     if (speed > 120 || speed < 0) {
                         avoidShowingUpdateBecauseIsImpossible = true
                     }
                 }
 
                 if (avoidShowingUpdateBecauseIsImpossible) {
                     Log.w(DEBUG_TAG, "Update for vehicle $vehID skipped")
                     continue
                 }
 
                 // Check if position actually changed
                 val samePosition = (oldPos.latitude == newPos.latitude) &&
                         (oldPos.longitude == newPos.longitude)
 
                 val setPattern = (oldPattern == null) && (patternStops != null)
 
                 // Copy old bearing if new one is missing
                 if (newPos.bearing == null && oldPos.bearing != null) {
                     newPos.bearing = oldPos.bearing
                 }
 
                 if (!samePosition || setPattern) {
                     val newOrOldPosInBounds = isPointInsideVisibleRegion(
                         newPos.latitude, newPos.longitude, true
                     ) || isPointInsideVisibleRegion(oldPos.latitude, oldPos.longitude, true)
 
                     if (newOrOldPosInBounds) {
                         // Update pattern data if available
                         patternStops?.let {
                             updatesByVehDict[vehID]!!.pattern = it.pattern
                         }
                         // Animate the position change
                         animateNewPositionMove(newPos)
                     } else {
                         // Update position without animation
                         updatesByVehDict[vehID] = LivePositionTripPattern(
                             newPos,
                             patternStops?.pattern
                         )
                     }
                 }
                 countUpds++
             } else {
                 // New vehicle - create entry
                 updatesByVehDict[vehID] = LivePositionTripPattern(
                     newPos,
                     patternStops?.pattern
                 )
                 createdVehs++
             }
 
             // Update vehicle details if this is the shown/tracked vehicle
             if (hasVehicleTracking && vehShowing.isNotEmpty() && vehID == vehShowing) {
                 trackVehicleCallback?.invoke(vehID)
             }
         }
 
         // Remove old positions
         Log.d(DEBUG_TAG, "Updated $countUpds vehicles, created $createdVehs vehicles")
         vehsOld.removeAll(vehsNew)
 
         // Clean up stale vehicles (not updated for 2 minutes)
         val currentTimeStamp = System.currentTimeMillis() / 1000
         for (vehID in vehsOld) {
             val posData = updatesByVehDict[vehID]!!
             if (currentTimeStamp - posData.posUpdate.timestamp > 2 * 60) {
                 // Remove the bus
                 updatesByVehDict.remove(vehID)
                 // Cancel and remove animator if exists
                 animatorsByVeh[vehID]?.cancel()
                 animatorsByVeh.remove(vehID)
             }
         }
 
         // Update UI
         updatePositionsIcons(false)
     }
 
     /**
      * Shared bottom sheet setup. The [onDirectionsClick] lambda is called when
      * directionsCard is tapped; it receives the pattern code (empty string when
      * no pattern is available) so each subclass can navigate as it sees fit.
      */
     protected fun showVehicleTripInBottomSheet(
         veh: String,
         onDirectionsClick: (patternCode: String, veh: String) -> Unit
     ) {
         val data = updatesByVehDict[veh] ?: run {
             Log.w(DEBUG_TAG, "Asked to show vehicle $veh, but it's not present in the updates")
             return
         }
         bottomLayout?.let {
             val lineName = FiveTNormalizer.fixShortNameForDisplay(
                 GtfsUtils.getLineNameFromGtfsID(data.posUpdate.routeID), false
             )
             val pat = data.pattern
             if (pat != null) {
                 stopTitleTextView.text = pat.headsign
                 stopTitleTextView.visibility = View.VISIBLE
                 stopNumberTextView.text = getString(R.string.line_fill_towards, lineName)
             } else {
                 stopTitleTextView.visibility = View.GONE
                 stopNumberTextView.text = getString(R.string.line_fill, lineName)
             }
             directionsCard.setOnClickListener {
                 onDirectionsClick(pat?.code ?: "", veh)
             }
             directionsCard.visibility = View.VISIBLE
             bottomrightImage.setImageDrawable(
                 ResourcesCompat.getDrawable(resources, R.drawable.ic_magnifying_glass, activity?.theme)
             )
             val colorBlue = ResourcesCompat.getColor(resources, R.color.blue_500, activity?.theme)
             ViewCompat.setBackgroundTintList(directionsCard, ColorStateList.valueOf(colorBlue))
             linesPassingTextView.text = getString(R.string.vehicle_fill, data.posUpdate.vehicle)
             arrivalsCard.visibility = View.GONE
 
             extraBottomTextView.text = getString(R.string.updated_fill,  utils.unixTimestampToLocalTime(data.posUpdate.timestamp))
             extraBottomTextView.visibility = View.VISIBLE
         }
         vehShowing = veh
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
         updatePositionsIcons(true)
         Log.d(DEBUG_TAG, "Shown vehicle $veh in bottom sheet")
     }
 
     /**
      * Update the bus positions displayed on the map, from the existing data
      *
      * @param forced If true, forces immediate update ignoring the 60ms throttle
      */
     protected fun updatePositionsIcons(forced: Boolean) {
         // Avoid frequent updates - throttle to max once per 60ms
         val currentTime = System.currentTimeMillis()
         if (!forced && currentTime - lastUpdateTime < 60) {
             // Schedule delayed update
             if(lifecycleOwnerLiveData.value != null)
                 viewLifecycleOwner.lifecycleScope.launch {
                     delay(200.milliseconds)
                     updatePositionsIcons(forced)
                 }
             return
         }
 
         val busFeatures = ArrayList<Feature>()
         val selectedBusFeatures = ArrayList<Feature>()
 
         for (dat in updatesByVehDict.values) {
             val pos = dat.posUpdate
             val point = Point.fromLngLat(pos.longitude, pos.latitude)
 
             val newFeature = Feature.fromGeometry(
                 point,
                 JsonObject().apply {
                     addProperty("veh", pos.vehicle)
                     addProperty("trip", pos.tripID)
                     addProperty("bearing", pos.bearing ?: 0.0f)
                     addProperty("line", pos.routeID.substringBeforeLast('U'))
                 }
             )
 
             // Separate selected vehicle from others
             if (vehShowing.isNotEmpty() && vehShowing == dat.posUpdate.vehicle) {
                 selectedBusFeatures.add(newFeature)
             } else {
                 busFeatures.add(newFeature)
             }
         }
 
         busesSource.setGeoJson(FeatureCollection.fromFeatures(busFeatures))
         selectedBusSource.setGeoJson(FeatureCollection.fromFeatures(selectedBusFeatures))
 
         lastUpdateTime = System.currentTimeMillis()
     }
 
     /**
      * Animates the transition of a vehicle from its current position to a new position
      * This is the tricky part - we need to set the new positions with the data and redraw them all
      *
      * @param positionUpdate The new position update to animate to
      */
     protected fun animateNewPositionMove(positionUpdate: LivePositionUpdate) {
         val vehID = positionUpdate.vehicle
 
         // Check if vehicle exists in our tracking dictionary
         if (vehID !in updatesByVehDict.keys) {
             return
         }
 
         val currentUpdate = updatesByVehDict[vehID] ?: run {
             Log.e(DEBUG_TAG, "Have to run animation for veh $vehID but not in the dict")
             return
         }
 
         // Cancel any current animation for this vehicle
         animatorsByVeh[vehID]?.cancel()
 
         val posUp = currentUpdate.posUpdate
         val currentPos = LatLng(posUp.latitude, posUp.longitude)
         val newPos = LatLng(positionUpdate.latitude, positionUpdate.longitude)
 
         // Create animator for smooth transition
         val valueAnimator = ValueAnimator.ofObject(
             MapLibreUtils.LatLngEvaluator(),
             currentPos,
             newPos
         )
 
         valueAnimator.addUpdateListener { animation ->
             val latLng = animation.animatedValue as LatLng
 
             // Update position during animation
             updatesByVehDict[vehID]?.let { update ->
                 update.posUpdate.latitude = latLng.latitude
                 update.posUpdate.longitude = latLng.longitude
                 updatePositionsIcons(false)
             } ?: run {
                 Log.w(DEBUG_TAG, "The bus position to animate has been removed, but the animator is still running!")
             }
         }
 
         // Set the new position as current but keep old coordinates for animation start
         positionUpdate.latitude = posUp.latitude
         positionUpdate.longitude = posUp.longitude
         updatesByVehDict[vehID]!!.posUpdate = positionUpdate
 
         // Configure and start animation
         valueAnimator.duration = 300
         valueAnimator.interpolator = LinearInterpolator()
         valueAnimator.start()
 
         // Store animator for potential cancellation
         animatorsByVeh[vehID] = valueAnimator
     }
 
     /// STOP OPENING
     abstract fun showOpenStopWithSymbolLayer(): Boolean
     /**
      * Update the bottom sheet with the stop information
      */
     protected fun openStopInBottomSheet(stop: Stop){
         bottomLayout?.let {
 
             //lay.findViewById<TextView>(R.id.stopTitleTextView).text ="${stop.ID} - ${stop.stopDefaultName}"
             val stopName = stop.stopUserName ?: stop.stopDefaultName
             stopTitleTextView.text = stopName//stop.stopDefaultName
             stopNumberTextView.text = getString(R.string.stop_fill,stop.ID)
             stopTitleTextView.visibility = View.VISIBLE
 
             val string_show = if (stop.numRoutesStopping==0) ""
             else requireContext().getString(R.string.lines_fill, stop.routesThatStopHereToString())
             linesPassingTextView.text = string_show
             linesPassingTextView.visibility = View.VISIBLE
 
             //SET ON CLICK LISTENER
             arrivalsCard.setOnClickListener{
                 fragmentListener?.requestArrivalsForStopID(stop.ID)
             }
 
             arrivalsCard.visibility = View.VISIBLE
             directionsCard.visibility = View.VISIBLE
 
             directionsCard.setOnClickListener {
                 ViewUtils.openStopInOutsideApp(stop, context)
             }
             context?.let {
                 val colorIcon = ViewUtils.getColorFromTheme(it, android.R.attr.colorAccent)//ResourcesCompat.getColor(resources,R.attr.colorAccent,activity?.theme)
                 ViewCompat.setBackgroundTintList(directionsCard, ColorStateList.valueOf(colorIcon))
             }
 
             bottomrightImage.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.navigation_right,  activity?.theme))
 
         }
         //add stop marker
         if (stop.latitude!=null && stop.longitude!=null) {
             Log.d(DEBUG_TAG, "Showing stop: ${stop.ID}")
 
             if (showOpenStopWithSymbolLayer()) {
                 stopActiveSymbol = symbolManager?.create(
                     SymbolOptions()
                         .withLatLng(LatLng(stop.latitude!!, stop.longitude!!))
                         .withIconImage(STOP_ACTIVE_IMG)
                         .withIconAnchor(ICON_ANCHOR_CENTER)
                 )
             } else {
                 val list = ArrayList<Feature>()
                 list.add(stopToGeoJsonFeature(stop))
                 selectedStopSource.setGeoJson(
                     FeatureCollection.fromFeatures(list)
                 )
             }
 
         }
         Log.d(DEBUG_TAG, "Shown stop $stop in bottom sheet")
         shownStopInBottomSheet = stop
 
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
     }
 
 
 
     protected fun stopAnimations(){
         for(anim in animatorsByVeh.values){
             anim.cancel()
         }
     }
 
     protected fun addImagesStyle(style: Style){
         style.addImage(
             STOP_IMAGE_ID,
             ResourcesCompat.getDrawable(resources,R.drawable.bus_stop_new, activity?.theme)!!)
 
         style.addImage(STOP_ACTIVE_IMG, ResourcesCompat.getDrawable(resources, R.drawable.bus_stop_new_highlight, activity?.theme)!!)
         style.addImage("ball",ResourcesCompat.getDrawable(resources, R.drawable.ball, activity?.theme)!!)
         style.addImage(BUS_IMAGE_ID,ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon, activity?.theme)!!)
         style.addImage(BUS_SEL_IMAGE_ID, ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon_sel, activity?.theme)!!)
         val polyIconArrow = ResourcesCompat.getDrawable(resources, R.drawable.arrow_up_box_fill, activity?.theme)!!
         style.addImage(POLY_ARROW, polyIconArrow)
 
     }
 
     protected fun initStopsLayer(style: Style, stopsFeatures: FeatureCollection?){
         //determine default layer
         var layerAbove = ""
         if (lastMapStyle == MapLibreUtils.STYLE_OSM_RASTER){
             layerAbove = "osm-raster"
         } else if (lastMapStyle == MapLibreUtils.STYLE_VECTOR){
             layerAbove = "symbol-transit-airfield"
         }
         initStopsLayer(style, stopsFeatures, layerAbove)
     }
 
     protected fun initStopsLayer(style: Style, stopsFeatures: FeatureCollection?, stopsLayerAbove: String){
 
 
         stopsSource = GeoJsonSource(STOPS_SOURCE_ID,stopsFeatures ?: FeatureCollection.fromFeatures(ArrayList<Feature>()))
         style.addSource(stopsSource)
 
 
         // Stops layer
         val stopsLayer = SymbolLayer(STOPS_LAYER_ID, STOPS_SOURCE_ID)
         stopsLayer.withProperties(
             PropertyFactory.iconImage(STOP_IMAGE_ID),
             PropertyFactory.iconAnchor(ICON_ANCHOR_CENTER),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true)
             )
 
         style.addLayerAbove(stopsLayer, stopsLayerAbove ) //"label_country_1") this with OSM Bright
 
 
         selectedStopSource = GeoJsonSource(SEL_STOP_SOURCE, FeatureCollection.fromFeatures(ArrayList<Feature>()))
         style.addSource(selectedStopSource)
 
         val selStopLayer = SymbolLayer(SEL_STOP_LAYER, SEL_STOP_SOURCE)
         selStopLayer.withProperties(
             PropertyFactory.iconImage(STOP_ACTIVE_IMG),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true),
             PropertyFactory.iconAnchor(ICON_ANCHOR_CENTER),
 
             )
         style.addLayerAbove(selStopLayer, STOPS_LAYER_ID)
 
         stopsLayerStarted = true
     }
 
     /**
      * Setup the Map Layers
      */
     protected fun setupBusLayer(style: Style, withLabels: Boolean =false, busIconsScale: Float = 1.0f) {
         // Buses source
         busesSource = GeoJsonSource(BUSES_SOURCE_ID)
         style.addSource(busesSource)
         //style.addImage("bus_symbol",ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon, activity?.theme)!!)
 
         selectedBusSource = GeoJsonSource(SEL_BUS_SOURCE)
         style.addSource(selectedBusSource)
 
         // Buses layer
         val busesLayer = SymbolLayer(BUSES_LAYER_ID, BUSES_SOURCE_ID).apply {
             withProperties(
                 PropertyFactory.iconImage(BUS_IMAGE_ID),
                 PropertyFactory.iconSize(busIconsScale),
                 PropertyFactory.iconAllowOverlap(true),
                 PropertyFactory.iconIgnorePlacement(true),
                 PropertyFactory.iconRotate(Expression.get("bearing")),
                 PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)
 
             )
             if (withLabels){
                 withProperties(PropertyFactory.textAnchor(TEXT_ANCHOR_CENTER),
                     PropertyFactory.textAllowOverlap(true),
                     PropertyFactory.textField(Expression.get("line")),
                     PropertyFactory.textColor(Color.WHITE),
                     PropertyFactory.textRotationAlignment(TEXT_ROTATION_ALIGNMENT_VIEWPORT),
                     PropertyFactory.textSize(12f),
                     PropertyFactory.textFont(arrayOf("noto_sans_regular")))
             }
         }
         style.addLayerAbove(busesLayer, STOPS_LAYER_ID)
 
         val selectedBusLayer = SymbolLayer(SEL_BUS_LAYER, SEL_BUS_SOURCE).apply {
             withProperties(
             PropertyFactory.iconImage(BUS_SEL_IMAGE_ID),
             PropertyFactory.iconSize(busIconsScale),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true),
             PropertyFactory.iconRotate(Expression.get("bearing")),
             PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)
             )
             if (withLabels){
                 withProperties(PropertyFactory.textAnchor(TEXT_ANCHOR_CENTER),
                     PropertyFactory.textAllowOverlap(true),
                     PropertyFactory.textField(Expression.get("line")),
                     PropertyFactory.textColor(Color.WHITE),
                     PropertyFactory.textRotationAlignment(TEXT_ROTATION_ALIGNMENT_VIEWPORT),
                     PropertyFactory.textSize(12f),
                     PropertyFactory.textFont(arrayOf("noto_sans_regular")))
             }
         }
 
         style.addLayerAbove(selectedBusLayer, BUSES_LAYER_ID)
 
     }
     /**
      * Method used for enabling / disabling the location from the buttons
      */
     protected fun switchUserLocationStatus(view: View?){
         val enabled = if(locationInitialized) locationComponent.isLocationComponentEnabled else false
         val context = context ?: return
         if(enabled) {
+            if(!receivedFirstLocation){
+                //use case: the user has decided to disable the location before the first position arrived
+                stopInitialPositionRequest()
+            }
+            // we have to disable it
             setMapLocationEnabled(false)
         }
         else if(deviceHasLocationProvider()) {
             if(Permissions.bothLocationPermissionsGranted(context)){
                 if(!locationEnabledOnDevice){
                     warnLocationNotEnabledOnDevice()
                 } else{
                     setMapLocationEnabled(true)
                 }
             } else{
                 Log.d(DEBUG_TAG, "Requesting permissions to show location")
                 Permissions.getInstance(context).checkRequestLocationPermissions(requireActivity(), positionRequestResponder)
             }
         } else{
             context.let {
                 Toast.makeText(it, R.string.no_gps_on_device, Toast.LENGTH_SHORT).show()
             }
+            //adjust ui
+            setLocationIconEnabled(false)
         }
 
     }
 
     /**
      * Set the map location component enabled
      */
     @SuppressLint("MissingPermission")
     protected fun setMapLocationEnabled(enabled: Boolean){
         Log.d(DEBUG_TAG, "Setting map location enabled: $enabled")
         map?.locationComponent?.isLocationComponentEnabled = enabled
         //map?.cameraPosition =
         mapStateViewModel.locationUserActive.value = enabled
         onMapLocationEnabled(enabled)
     }
+
+    /**
+     * Function to run at the first time the fragment is opened
+     * Check if we have the permissions, and then initialize the map location component
+     * If we don't have it, request the permission
+     */
     protected fun checkInitMapLocation(mapReady: MapLibreMap,style: Style, context: Context) {
         //enable location
         val hasGps = deviceHasLocationProvider()
         val permissions = Permissions.getInstance(context)
         if(hasGps) {
             if (Permissions.bothLocationPermissionsGranted(context)) {
                 Log.d(DEBUG_TAG, "Have got the location permission, init location component")
                 initializeMapLocationComponent(mapReady, context, style)
             }else {
                 var req = false
                 activity?.let{
                     req = permissions.checkRequestLocationPermissions(it, positionRequestResponder)
                 }
 
                 if(!req) {
                     setMapLocationEnabled(false)
                 }
 
             }
         }
     }
 
     /**
      * Set the UI elements showing that the user location is disabled
      */
     abstract fun onMapLocationEnabled(active: Boolean)
 
     /**
      * Helper function to actually set the icon
      */
     abstract fun setLocationIconEnabled(enabled: Boolean)
 
     /**
      * Called when we receive the first fix on the user location
      */
     abstract fun onFirstReceivedLocation(location: Location)
 
     protected fun isBottomSheetShowing(): Boolean {
         return bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED
     }
 
     protected fun deviceHasLocationProvider(): Boolean{
         val locManager = requireContext().getSystemService(LOCATION_SERVICE) as LocationManager
-        return locManager.allProviders.size > 0
+        return locManager.allProviders.isNotEmpty()
     }
 
     /**
      * Update automatically the icon when the live position service changes status
      */
     protected fun observeStatusLivePositions(){
         livePositionsViewModel.serviceStatus.observe(viewLifecycleOwner){ status ->
             //if service is active, update the bus positions icon
             when(status) {
                 LivePositionsServiceStatus.OK ->
                     setBusPositionsIcon(true, error = false)
 
                 LivePositionsServiceStatus.NO_POSITIONS -> setBusPositionsIcon(true, error = true)
 
                 else -> setBusPositionsIcon( true, error = true)
             }
         }
     }
 
     /**
      * Clear all buses from the map
      */
     protected fun clearAllBusPositionsInMap(){
         for ((k, anim) in animatorsByVeh){
             anim.cancel()
         }
         animatorsByVeh.clear()
         updatesByVehDict.clear()
         updatePositionsIcons(forced = false)
     }
 
     protected fun setCameraPosition(latitude: Double, longitude: Double, zoom: Double) {
         map?.cameraPosition = CameraPosition.Builder()
             .target(LatLng(latitude, longitude))
             .zoom(zoom)
             .build()
     }
 
     protected fun showToastLocation(enabled: Boolean){
         val textid = if (enabled) R.string.location_enabled  else R.string.location_disabled
         context?.let{
             Toast.makeText(it,textid,Toast.LENGTH_SHORT).show()
         }
     }
 
 
 
 
     companion object{
         private const val DEBUG_TAG="GeneralMapLibreFragment"
 
         const val BUSES_SOURCE_ID = "buses-source"
         const val BUSES_LAYER_ID = "buses-layer"
 
         const val SEL_STOP_SOURCE="selected-stop-source"
         const val SEL_STOP_LAYER = "selected-stop-layer"
 
         const val SEL_BUS_SOURCE = "sel_bus_source"
         const val SEL_BUS_LAYER = "sel_bus_layer"
 
         const val KEY_LOCATION_ENABLED="location_enabled"
 
 
         protected const val STOPS_SOURCE_ID = "stops-source"
         protected const val STOPS_LAYER_ID = "stops-layer"
 
         protected const val STOP_IMAGE_ID = "stop-img"
         protected const val STOP_ACTIVE_IMG = "stop_active_img"
         protected const val BUS_IMAGE_ID = "bus_symbol"
         protected const val BUS_SEL_IMAGE_ID = "sel_bus_symbol"
 
         protected const val POLYLINE_LAYER = "polyline-layer"
         protected const val POLYLINE_SOURCE = "polyline-source"
 
         protected const val POLY_ARROWS_LAYER = "arrows-layer"
         protected const val POLY_ARROWS_SOURCE = "arrows-source"
         protected const val POLY_ARROW ="poly-arrow-img"
 
         private const val PERM_LOC_COARSE = Manifest.permission.ACCESS_COARSE_LOCATION
         private const val PERM_LOC_FINE = Manifest.permission.ACCESS_FINE_LOCATION
 
         //TODO: this is hardcoded, make it modifiable by the user
         protected const val MAX_DIST_KM = 90.0
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
index eea90d9..337bb10 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/MapLibreFragment.kt
@@ -1,752 +1,750 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2025 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.annotation.SuppressLint
 import android.content.Context
 import android.location.Location
 import android.location.LocationManager
 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.RelativeLayout
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.preference.PreferenceManager
 import androidx.room.concurrent.AtomicBoolean
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.backend.gtfs.LivePositionUpdate
 import it.reyboz.bustorino.backend.mato.MQTTMatoClient
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.data.gtfs.TripAndPatternWithStops
 import it.reyboz.bustorino.map.MapLibreLocationEngine
 import it.reyboz.bustorino.map.MapLibreStyles
 import it.reyboz.bustorino.viewmodels.StopsMapViewModel
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.camera.CameraUpdateFactory
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.geometry.LatLngBounds
 import org.maplibre.android.location.engine.LocationEngineCallback
 import org.maplibre.android.location.engine.LocationEngineResult
 import org.maplibre.android.location.modes.CameraMode
 import org.maplibre.android.location.modes.RenderMode
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.Style
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.geojson.Feature
 import org.maplibre.geojson.FeatureCollection
 
 /**
  * A simple [Fragment] subclass.
  * Use the [MapLibreFragment.newInstance] factory method to
  * create an instance of this fragment.
  */
 class MapLibreFragment : GeneralMapLibreFragment() {
 
 
     private val stopsViewModel: StopsMapViewModel by viewModels()
     private var stopsShowing = ArrayList<Stop>(0)
 
     // Sources for stops and buses are in GeneralMapLibreFragment
     private var isUserMovingCamera = false
     private var lastStopsSizeShown = 0
     private var lastBBox = LatLngBounds.from(2.0, 2.0, 1.0,1.0)
     private var stopsRedrawnTimes = 0
 
     //bottom Sheet behavior in GeneralMapLibreFragment
     //private var stopActiveSymbol: Symbol? = null
 
     // Location stuff
     private lateinit var locationManager: LocationManager
     private lateinit var userLocationButton: ImageButton
     private lateinit var centerUserButton: ImageButton
     private lateinit var followUserButton: ImageButton
 
     private var followingUserLocation = false
     private var ignoreCameraMovementForFollowing = true
     private var restoredMapCamera = AtomicBoolean()
     //BUS POSITIONS
     private var usingMQTTPositions = true // THIS IS INSIDE VIEW MODEL NOW
 
     private val symbolsToUpdate = ArrayList<Symbol>()
 
     private var initialStopToShow : Stop? = null
     private var initialStopShown = false
     private var waitingDelayedBusUpdate = false
 
     //shown stuff
     //private var savedStateOnStop : Bundle? = null
 
     private val showBusLayer = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
             initialStopToShow = Stop.fromBundle(arguments)
             if (initialStopToShow==null){
 
             } else if(!initialStopToShow!!.hasCoords()){
                 //null the stop if it doesn't have coordinates, we cannot find it
                 initialStopToShow = null
             }
         }
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
         val rootView =  inflater.inflate(R.layout.fragment_map_libre,
             container, false)
         //reset the counter
         lastStopsSizeShown = 0
         stopsRedrawnTimes = 0
         stopsLayerStarted = false
         symbolsToUpdate.clear()
 
         // Init layout view
 
         // Init the MapView
         mapView = rootView.findViewById(R.id.libreMapView)
 
         mapView!!.onCreate(savedInstanceState)
         mapView!!.getMapAsync(this)
 
         //init bottom sheet
         val bottomSheet = rootView.findViewById<RelativeLayout>(R.id.bottom_sheet)
         bottomLayout = bottomSheet
         stopTitleTextView = bottomSheet.findViewById(R.id.stopTitleTextView)
         stopNumberTextView = bottomSheet.findViewById(R.id.stopNumberTextView)
         linesPassingTextView = bottomSheet.findViewById(R.id.linesPassingTextView)
         arrivalsCard = bottomSheet.findViewById(R.id.arrivalsCardButton)
         directionsCard = bottomSheet.findViewById(R.id.directionsCardButton)
 
         userLocationButton = rootView.findViewById(R.id.locationEnableIcon)
         userLocationButton.setOnClickListener(this::switchUserLocationStatus)
         followUserButton = rootView.findViewById(R.id.followUserImageButton)
         centerUserButton = rootView.findViewById(R.id.centerMapImageButton)
         busPositionsIconButton = rootView.findViewById(R.id.busPositionsImageButton)
         busPositionsIconButton.setOnClickListener {
             LivePositionsDialogFragment().show(parentFragmentManager, "LivePositionsDialog")
         }
         bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
 
         arrivalsCard.setOnClickListener {
             if(context!=null){
                 Toast.makeText(context,"ARRIVALS", Toast.LENGTH_SHORT).show()
             }
         }
         centerUserButton.setOnClickListener {
             if(context!=null && locationComponent.isLocationComponentEnabled) {
                 val location = locationComponent.lastKnownLocation
 
                 location?.let {
                     mapView?.getMapAsync { map ->
                         map.animateCamera(CameraUpdateFactory.newCameraPosition(
                             CameraPosition.Builder().target(LatLng(location.latitude, location.longitude)).build()), 500)
                     }
                 }
             }
         }
         followUserButton.setOnClickListener {
             // onClick user following button
             if(context!=null && locationInitialized && locationComponent.isLocationComponentEnabled){
 
                 // CameraMode.TRACKING makes the camera move and jump to the location
                setFollowUserLocation(!followingUserLocation)
             }
         }
         //locationManager = requireActivity().getSystemService(Context.LOCATION_SERVICE) as LocationManager
         /*
         if (Permissions.bothLocationPermissionsGranted(requireContext()) && deviceHasGpsProvider()) {
 
             requestInitialUserLocation()
         } else{
             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()
             }
             // PERMISSIONS REQUESTED AFTER MAP SETUP
         }
 
          */
 
 
         // Setup close button
         rootView.findViewById<View>(R.id.btnClose).setOnClickListener {
             hideStopOrBusBottomSheet()
         }
         observeStatusLivePositions()
         //observe change in source of the live positions
         livePositionsViewModel.useMQTTPositionsLiveData.observe(viewLifecycleOwner){ useMQTT->
             //Log.d(DEBUG_TAG, "Changed MQTT positions, now have to use MQTT: $useMQTT")
             if (showBusLayer && isResumed) {
                 //Log.d(DEBUG_TAG, "Deciding to switch, the current source is using MQTT: $usingMQTTPositions")
                 if(useMQTT!=usingMQTTPositions){
                     // we have to switch
                     val clearPos = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean("positions_clear_on_switch_pref", true)
                     livePositionsViewModel.clearOldPositionsUpdates()
                     if(useMQTT){
                         //switching to MQTT, the GTFS positions are disabled automatically
                         livePositionsViewModel.requestMatoPosUpdates(MQTTMatoClient.LINES_ALL)
                     } else{
                         //switching to GTFS RT: stop Mato, launch first request
                         livePositionsViewModel.stopMatoUpdates()
                         livePositionsViewModel.requestGTFSUpdates()
                     }
                     Log.d(DEBUG_TAG, "Should clear positions: $clearPos")
                     if (clearPos) {
                         livePositionsViewModel.clearAllPositions()
                         //force clear of the viewed data
                         if(vehShowing.isNotEmpty()) hideStopOrBusBottomSheet()
                         clearAllBusPositionsInMap()
                     }
 
                 }
             }
             usingMQTTPositions = useMQTT
 
         }
         mapStateViewModel.locationUserActive.observe(viewLifecycleOwner){
             setLocationIconEnabled(it)}
         mapStateViewModel.followingUserPosition.observe(viewLifecycleOwner){ updateFollowingIcon(it)}
 
         Log.d(DEBUG_TAG, "Fragment View Created!")
 
         //TODO: Reshow last open stop when switching back to the map fragment
         return rootView
     }
 
     /**
      * This method sets up the map and the layers
      */
     override fun onMapReady(mapReady: MapLibreMap) {
         this.map = mapReady
         val context = requireContext()
         val mjson = MapLibreStyles.getJsonStyleFromAsset(context, PreferencesHolder.getMapLibreStyleFile(context))
 
         val builder = Style.Builder().fromJson(mjson!!)
 
         mapReady.setStyle(builder) { style ->
 
             mapStyle = style
             //setupLayers(style)
             addImagesStyle(style)
 
             //init stop layer with this
             val stopsInCache = stopsViewModel.stopsToShow.value
             if(stopsInCache.isNullOrEmpty())
                 initStopsLayer(style, null)
             else
                 displayStops(stopsInCache)
             if(showBusLayer) setupBusLayer(style, withLabels = true, busIconsScale = 1.2f)
 
             // Start observing data now that everything is set up
             observeStops()
 
             checkInitMapLocation(mapReady,style, context)
         }
 
 
         mapReady.addOnCameraIdleListener {
             map?.let {
                 val newBbox = it.projection.visibleRegion.latLngBounds
-                if ((newBbox.center==lastBBox.center) && (newBbox.latitudeSpan==lastBBox.latitudeSpan) && (newBbox.longitudeSpan==lastBBox.latitudeSpan)){
-                    //do nothing
-                } else {
-                    stopsViewModel.loadStopsInLatLngBounds(newBbox)
-                    lastBBox = newBbox
 
-                }
+                stopsViewModel.loadStopsInLatLngBounds(newBbox)
+                lastBBox = newBbox
+
+
 
             }
 
         }
         mapReady.addOnCameraMoveStartedListener { v->
             if(v== MapLibreMap.OnCameraMoveStartedListener.REASON_API_GESTURE){
                 //the user is moving the map
                 //isUserMovingCamera = true
                 updateFollowingIcon(false)
             }
         }
 
         mapReady.addOnMapClickListener { point ->
            onMapClickReact(point)
         }
         // we start requesting the bus positions now
         observeBusPositionUpdates()
 
         //Restoring data
 
         if (initialStopToShow!=null && initialStopToShow?.hasCoords() == true){
             val s = initialStopToShow!!
             if(s.hasCoords()){
                 mapReady.cameraPosition = CameraPosition.Builder().target(
                     LatLng(s.latitude!!, s.longitude!!)
                 ).zoom(DEFAULT_ZOOM).build()
             }
             restoredMapCamera.set(true)
         } else{
             var boundsRestored = false
             //restore the map state here
             map?.let{
                 boundsRestored = mapStateViewModel.restoreMapState(it)
                  mapStateViewModel.lastOpenStopID.value?.let{ sID->
                      val s= stopsViewModel.getStopByID(sID)
                      if (s==null) {
                          if(sID.isNotEmpty())
                              Log.w(DEBUG_TAG,"Wanted to open stop $sID in map but it was not loaded!")
                      }
                      else{
                          openStopInBottomSheet(s) }
                  }
 
             }
             if(!boundsRestored){
                 // we have not restored the bounds, open normally in target location
                 // TODO: check that the map is reopened in the same location
                 val lastLoc = mapStateViewModel.locationToShow
                 val defaultLoc = LatLng(DEFAULT_CENTER_LAT, DEFAULT_CENTER_LON)
                 val proposedLoc = lastLoc?.let{ LatLng(lastLoc.latitude, lastLoc.longitude)}
                 val targetLoc = if(proposedLoc == null || proposedLoc.distanceTo(defaultLoc) > MAX_DIST_KM*1000)
                         defaultLoc
                     else proposedLoc
 
 
                 mapReady.cameraPosition = CameraPosition.Builder().target(targetLoc).zoom(DEFAULT_ZOOM).build()
             }
             restoredMapCamera.set(boundsRestored)
 
 
         }
         mapInitialized = true
 
         //pendingLocationActivation = true
         //positionRequestLauncher.launch(Permissions.LOCATION_PERMISSIONS)
 
     }
 
     private fun onMapClickReact(point: LatLng): Boolean{
         map?.let { mapReady ->
             val screenPoint = mapReady.projection.toScreenLocation(point)
             val stopsFeatures = mapReady.queryRenderedFeatures(screenPoint, STOPS_LAYER_ID)
             val busNearby = mapReady.queryRenderedFeatures(screenPoint, BUSES_LAYER_ID)
             Log.d(DEBUG_TAG, "Clicked on stops: $stopsFeatures \n and buses: $busNearby")
             if (stopsFeatures.isNotEmpty()) {
                 val feature = stopsFeatures[0]
                 val id = feature.getStringProperty("id")
                 val name = feature.getStringProperty("name")
                 //Toast.makeText(requireContext(), "Clicked on $name ($id)", Toast.LENGTH_SHORT).show()
                 val stop = stopsViewModel.getStopByID(id)
                 Log.d(DEBUG_TAG, "Decided click is on stop with id $id : $stop")
                 stop?.let { newstop ->
                     val sameStopClicked = shownStopInBottomSheet?.let { newstop.ID==it.ID } ?: false
                     Log.d(DEBUG_TAG, "Hiding clicked stop: $sameStopClicked")
                     if (isBottomSheetShowing()) {
                         hideStopOrBusBottomSheet()
                     }
                     if(!sameStopClicked){
                         openStopInBottomSheet(newstop)
                         //isBottomSheetShowing = true
                         //move camera
                         if (newstop.latitude != null && newstop.longitude != null)
                         //mapReady.cameraPosition = CameraPosition.Builder().target(LatLng(it.latitude!!, it.longitude!!)).build()
                             mapReady.animateCamera(
                                 CameraUpdateFactory.newLatLng(LatLng(newstop.latitude!!, newstop.longitude!!)),
                                 750
                             )
                     }
 
                 }
                 return true
             } else if (busNearby.isNotEmpty()) {
                 val feature = busNearby[0]
                 val vehid = feature.getStringProperty("veh")
                 if (isBottomSheetShowing()) hideStopOrBusBottomSheet()
                 showVehicleTripInBottomSheet(vehid)
                 //move camera to center on vehicle
                 updatesByVehDict[vehid]?.let { dat ->
                     mapReady.animateCamera(
                         CameraUpdateFactory.newLatLng(LatLng(dat.posUpdate.latitude, dat.posUpdate.longitude)), 750
                     )
                 }
                 return true
             }
         }
         return false
     }
 
     override fun showOpenStopWithSymbolLayer(): Boolean {
         return false
     }
     override fun hideStopOrBusBottomSheet(){
         if (shownStopInBottomSheet?.ID == initialStopToShow?.ID){
             initialStopToShow = null
         }
         super.hideStopOrBusBottomSheet()
     }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         fragmentListener = if (context is CommonFragmentListener) {
             context
         } else {
             throw RuntimeException(
                 context.toString()
                         + " must implement FragmentListenerMain"
             )
         }
     }
     override fun onDetach() {
         super.onDetach()
         fragmentListener = null
     }
 
     override fun onStart() {
         super.onStart()
     }
 
     override fun onResume() {
         super.onResume()
         //mapView.onResume() handled in GeneralMapLibreFragment
 
         if(showBusLayer) {
             //first, clean up all the old positions
             livePositionsViewModel.clearOldPositionsUpdates()
 
             if (livePositionsViewModel.useMQTTPositionsLiveData.value!!){
                 livePositionsViewModel.requestMatoPosUpdates(MQTTMatoClient.LINES_ALL)
                 usingMQTTPositions = true
             }
             else {
                 livePositionsViewModel.requestGTFSUpdates()
                 usingMQTTPositions = false
             }
 
             livePositionsViewModel.isLastWorkResultGood.observe(this) { d: Boolean ->
                 Log.d(
                     DEBUG_TAG, "Last trip download result is $d"
                 )
             }
             livePositionsViewModel.tripsGtfsIDsToQuery.observe(this) { dat: List<String> ->
                 Log.i(DEBUG_TAG, "Have these trips IDs missing from the DB, to be queried: $dat")
                 livePositionsViewModel.downloadTripsFromMato(dat)
             }
         }
 
         fragmentListener?.readyGUIfor(FragmentKind.MAP)
     }
 
     override fun onPause() {
         super.onPause()
         Log.d(DEBUG_TAG, "Fragment paused")
 
         map?.let{
             //if map is initialized
             mapStateViewModel.saveMapState(it)
         }
         try{
             //save last location
             map?.locationComponent?.let{
                 if(locationInitialized && it.isLocationComponentActivated){
                     stopsViewModel.lastUserLocation = it.lastKnownLocation
                 }
             }
         }catch (e: Exception){
             Log.w(DEBUG_TAG, "Cannot save lastKnowLocation from map location component,error: ${e.message}")
         }
         mapStateViewModel.lastOpenStopID.postValue(shownStopInBottomSheet?.ID)
         if (livePositionsViewModel.useMQTTPositionsLiveData.value!!) livePositionsViewModel.stopMatoUpdates()
 
     }
 
     override fun onStop() {
         super.onStop()
         Log.d(DEBUG_TAG, "Fragment stopped!")
     }
 
     override fun onMapDestroy() {
         mapStyle.removeLayer(STOPS_LAYER_ID)
         mapStyle.removeSource(STOPS_SOURCE_ID)
 
         mapStyle.removeLayer(BUSES_LAYER_ID)
         mapStyle.removeSource(BUSES_SOURCE_ID)
 
 
     }
     override fun getBaseViewForSnackBar(): View? {
         return mapView
     }
 
     private fun showVehicleTripInBottomSheet(veh: String) {
         val data = updatesByVehDict[veh] ?: return
         super.showVehicleTripInBottomSheet(veh) { patternCode, _ ->
             map?.let { mapStateViewModel.saveMapState(it) }
             fragmentListener?.openLineFromVehicle(
                 data.posUpdate.getLineGTFSFormat(),
                 patternCode,
                 mapStateViewModel.savedCameraState?.toBundle()
             )
         }
     }
     private fun observeStops() {
         // Observe stops
         stopsViewModel.stopsToShow.observe(viewLifecycleOwner) { stops ->
             stopsShowing = ArrayList(stops)
             displayStops(stopsShowing)
             initialStopToShow?.let{ s->
                 //show the stop in the bottom sheet
                 if(!initialStopShown && (s.ID in stopsShowing.map { it.ID })) {
                     val stopToShow = stopsShowing.first { it.ID == s.ID }
                     openStopInBottomSheet(stopToShow)
                     initialStopShown = true
                 }
             }
         }
 
     }
 
     /**
      * Add the stops to the layers
      */
     private fun displayStops(stops: List<Stop>?) {
         if (stops.isNullOrEmpty()) return
 
         if (stops.size==lastStopsSizeShown){
-            Log.d(DEBUG_TAG, "Not updating, have same number of stops. After 3 times")
+            Log.d(DEBUG_TAG, "Not updating, have same number of stops")
             return
         }
         /*if(stops.size> lastStopsSizeShown){
             stopsRedrawnTimes = 0
         } else{
             stopsRedrawnTimes++
         }
 
          */
 
         val features = ArrayList<Feature>()//stops.mapNotNull { stop ->
             //stop.latitude?.let { lat ->
             //    stop.longitude?.let { lon ->
         for (s in stops){
             if (s.latitude!=null && s.longitude!=null)
                 features.add(stopToGeoJsonFeature(s))
 
 
         }
-        Log.d(DEBUG_TAG,"Have put ${features.size} stops to display")
+        Log.d(DEBUG_TAG,"Displaying ${features.size} stops")
 
         // if the layer is already started, substitute the stops inside, otherwise start it
         if (stopsLayerStarted) {
             stopsSource.setGeoJson(FeatureCollection.fromFeatures(features))
             lastStopsSizeShown = features.size
         } else
             map?.let {
                 Log.d(DEBUG_TAG, "Map stop layer is not started yet, init layer")
                 initStopsLayer(mapStyle, FeatureCollection.fromFeatures(features))
                 Log.d(DEBUG_TAG,"Started stops layer on map")
                 lastStopsSizeShown = features.size
                 stopsLayerStarted = true
             }
     }
 
     // --------------- BUS LOCATIONS STUFF --------------------------
     /**
      * Start requesting position updates
      */
     private fun observeBusPositionUpdates() {
         livePositionsViewModel.updatesWithTripAndPatterns.observe(viewLifecycleOwner) { data: HashMap<String, Pair<LivePositionUpdate, TripAndPatternWithStops?>> ->
             Log.d(
                 DEBUG_TAG,
                 "Have " + data.size + " trip updates, has Map start finished: $mapInitialized"
             )
             if (mapInitialized) updateBusPositionsInMap(data, hasVehicleTracking = true) { veh ->
                 showVehicleTripInBottomSheet(veh)
             }
             if (!isDetached && !livePositionsViewModel.useMQTTPositionsLiveData.value!!) livePositionsViewModel.requestDelayedGTFSUpdates(
                 3000
             )
         }
     }
 
 
     // ------ LOCATION STUFF -----
 
 
 
     @SuppressLint("MissingPermission")
     override fun onMapLocationComponentInitialized() {
         //locationComponent.cameraMode = CameraMode.TRACKING
 
         locationComponent.renderMode = RenderMode.COMPASS
         locationComponent.locationEngine?.apply{
             // this is only called once
             getLastLocation(object : LocationEngineCallback<LocationEngineResult> {
                 override fun onSuccess(res: LocationEngineResult?) {
                     Log.d(DEBUG_TAG, "Got the last location, ${res?.lastLocation}")
                     res?.lastLocation?.let { loc ->
                         if(mapInitialized){
                             val newLocation = LatLng(loc.latitude, loc.longitude)
                             //center the position only if it is close enough
                             if(newLocation.distanceTo(DEFAULT_LATLNG) < MAX_DIST_KM * 1000)
                                 map?.cameraPosition = CameraPosition.Builder().target(LatLng(loc.latitude, loc.longitude)).build()
 
                         }
                         else
                            mapStateViewModel.locationToShow = loc
                     }
                 }
 
                 override fun onFailure(p0: java.lang.Exception) {
                     if( p0 is MapLibreLocationEngine.NoLocationException)
                             Log.d(DEBUG_TAG, "Cannot find location: ${p0.message}")
                     else
                         Log.w(DEBUG_TAG, "Failed to get the last location, error: ${p0.message}",)
                 }
 
             })
         }
         if(locationEnabledOnDevice){
             setFollowUserLocation(true)
         }
 
     }
 
     override fun onMapLocationEnabled(active: Boolean) {
         //Extra stuff to do
         setFollowUserLocation(active)
     }
 
     @SuppressLint("MissingPermission")
     override fun onFirstReceivedLocation(location: Location) {
 
         val it = location
         if(locationInitialized && !receivedFirstLocation) {
             //only zoom if the user position is close enough to the center
             val newPoint = LatLng(it.latitude, it.longitude)
             if(newPoint.distanceTo(DEFAULT_LATLNG) > MAX_DIST_KM * 1000){
                 //show Toast
                 if(!shownToastNoPosition) context?.let{ c->
                     Toast.makeText(c, R.string.too_far_not_showing_location, Toast.LENGTH_LONG).show()
                     shownToastNoPosition = true
                 }
                 setLocationComponentEnabled(false)
                 //Update UI Status
                 mapStateViewModel.locationUserActive.value = false
                 mapStateViewModel.followingUserPosition.value = false
             } else {
                 map?.apply {
                     animateCamera(
                         CameraUpdateFactory.newCameraPosition(
                             CameraPosition.Builder().target(LatLng(location.latitude, location.longitude)).build()
                         ),
                         1000
                     )
                     setLocationComponentEnabled(true)
                     locationComponent.cameraMode = CameraMode.TRACKING
                     mapStateViewModel.locationUserActive.value = true
                 }
                 setFollowUserLocation(true)
             }
         }
         else{
             //check for this is when the map is used
             mapStateViewModel.locationToShow = location
         }
     }
 
     override fun setLocationIconEnabled(enabled: Boolean){
         if (enabled)
             userLocationButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.location_circlew_red))
         else
             userLocationButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.location_circlew_grey))
 
     }
 
     private fun updateFollowingIcon(enabled: Boolean){
         if(enabled)
             followUserButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.walk_circle_active))
         else
             followUserButton.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.walk_circle_inactive))
 
     }
 
     /**
      * This sets both the status on the component if it has been activated and the icon in the Fragment
      */
     private fun setFollowUserLocation(enabled: Boolean){
         if(locationInitialized) {
             if (enabled)
                 locationComponent.cameraMode = CameraMode.TRACKING
             else locationComponent.cameraMode = CameraMode.NONE
         }
         //update the icon by updating the livedata
         mapStateViewModel.followingUserPosition.value = enabled
     }
 
 
     companion object {
         private const val STOPS_SOURCE_ID = "stops-source"
         private const val STOPS_LAYER_ID = "stops-layer"
 
         private const val LABELS_LAYER_ID = "bus-labels-layer"
         private const val LABELS_SOURCE = "labels-source"
         private const val STOP_IMAGE_ID ="bus-stop-icon"
         const val DEFAULT_CENTER_LAT = 45.0708
         const val DEFAULT_CENTER_LON = 7.6858
         private val DEFAULT_LATLNG = LatLng(DEFAULT_CENTER_LAT, DEFAULT_CENTER_LON)
         private val DEFAULT_ZOOM = 14.3
         private const val POSITION_FOUND_ZOOM = 16.5
         private const val NO_POSITION_ZOOM = 17.1
 
         private const val DEBUG_TAG = "BusTO-MapLibreFrag"
         private const val STOP_ACTIVE_IMG = "Stop-active"
 
         const val FRAGMENT_TAG = "BusTOMapFragment"
 
         private const val LOCATION_PERMISSION_REQUEST_CODE = 981202
 
         /**
          * Use this factory method to create a new instance of
          * this fragment using the provided parameters.
          *
          * @param stop Eventual stop to center the map into
          * @return A new instance of fragment MapLibreFragment.
          */
         @JvmStatic
         fun newInstance(stop: Stop?) =
             MapLibreFragment().apply {
                 arguments = Bundle().let {
                     // Cannot use Parcelable as it requires higher version of Android
                     //stop?.let{putParcelable(STOP_TO_SHOW, it)}
                     stop?.toBundle(it)
                 }
             }
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/map/MapLibreLocationEngine.kt b/app/src/main/java/it/reyboz/bustorino/map/MapLibreLocationEngine.kt
index 8fdc8d4..6236586 100644
--- a/app/src/main/java/it/reyboz/bustorino/map/MapLibreLocationEngine.kt
+++ b/app/src/main/java/it/reyboz/bustorino/map/MapLibreLocationEngine.kt
@@ -1,118 +1,112 @@
 package it.reyboz.bustorino.map
 
 import android.app.PendingIntent
 import android.os.Looper
 import android.util.Log
 import org.maplibre.android.location.engine.LocationEngine
 import org.maplibre.android.location.engine.LocationEngineCallback
 import org.maplibre.android.location.engine.LocationEngineRequest
 import org.maplibre.android.location.engine.LocationEngineResult
 
 import it.reyboz.bustorino.middleware.FusedNativeLocationProvider
 
 /**
  * Adattatore che implementa l'interfaccia [LocationEngine] di MapLibre
  * delegando a [FusedNativeLocationProvider].
  *
  * Separa completamente la logica di fusione dei provider (in [FusedNativeLocationProvider])
  * dalla traduzione nel contratto MapLibre (qui).
  *
- * Uso:
- *   val provider = FusedNativeLocationProvider(context)
- *   val engine   = MapLibreLocationEngine(provider)
- *   // poi passa engine a LocationComponentActivationOptions
  */
 class MapLibreLocationEngine(
     private val provider: FusedNativeLocationProvider,
 ) : LocationEngine {
 
     // Mappa callback MapLibre → listener del provider, per poterli rimuovere
     private val callbackListeners =
         HashMap<LocationEngineCallback<LocationEngineResult>, FusedNativeLocationProvider.LocationUpdateListener>()
 
 
     override fun getLastLocation(callback: LocationEngineCallback<LocationEngineResult>) {
         val location = provider.getLastLocationFromProviders()
         if (location != null) {
             callback.onSuccess(LocationEngineResult.create(location))
         } else {
             callback.onFailure(NoLocationException())
         }
     }
 
     // -------------------------------------------------------------------------
     // requestLocationUpdates — overload con Looper (quello usato da MapLibre)
     // -------------------------------------------------------------------------
 
     override fun requestLocationUpdates(
         request: LocationEngineRequest,
         callback: LocationEngineCallback<LocationEngineResult>,
         looper: Looper?,
     ) {
         val providerListener = FusedNativeLocationProvider.LocationUpdateListener { location ->
             callback.onSuccess(LocationEngineResult.create(location))
         }
 
         callbackListeners[callback] = providerListener
         provider.addListener(providerListener)
 
         // Avvia (o riavvia) il provider con i parametri della request MapLibre.
         // Se il provider è già attivo con altri listener, stop+start lo ri-configura.
         provider.startUpdates(
             FusedNativeLocationProvider.Options(
                 minIntervalMs    = request.interval,
                 minDisplacementM = request.displacement,
                 looper           = looper,
             )
         )
     }
 
     // -------------------------------------------------------------------------
     // requestLocationUpdates — overload con PendingIntent (background/geofencing)
     // -------------------------------------------------------------------------
 
     override fun requestLocationUpdates(
         request: LocationEngineRequest,
         pendingIntent: PendingIntent,
     ) {
         // PendingIntent is used for background updates via BroadcastReceiver.
         // FusedNativeLocationProvider operates in the foreground: delegating to PendingIntent
         // would require a different architecture (LocationManager.requestLocationUpdates
         // with native PendingIntent). Not supported in this implementation.
         throw UnsupportedOperationException(
             "MapLibreLocationEngine does not support updates via PendingIntent. " +
                     "Use requestLocationUpdates(request, callback, looper) or " +
                     "implement a dedicated BroadcastReceiver."
         )
     }
 
     // -------------------------------------------------------------------------
     // removeLocationUpdates — overload con callback
     // -------------------------------------------------------------------------
 
     override fun removeLocationUpdates(callback: LocationEngineCallback<LocationEngineResult>) {
         callbackListeners.remove(callback)?.let { providerListener ->
             provider.removeListener(providerListener)
         }
         Log.d(DEBUG_TAG, "Removed location updates callback $callback")
     }
 
     // -------------------------------------------------------------------------
     // removeLocationUpdates — overload con PendingIntent
     // -------------------------------------------------------------------------
 
     override fun removeLocationUpdates(pendingIntent: PendingIntent) {
         throw UnsupportedOperationException(
             "MapLibreLocationEngine does not support PendingIntent removal."
         )
     }
     class NoLocationException : Exception()
 
 
     companion object {
         const val DEBUG_TAG = "BusTO-MapLocationEngine"
 
-
-
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
index 0b4b152..0cf734d 100644
--- a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
+++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt
@@ -1,290 +1,290 @@
 /*
 	BusTO - View Model components
     Copyright (C) 2025 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.viewmodels
 
 import android.app.Application
 import android.content.Context
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.map
 import androidx.lifecycle.switchMap
 import androidx.lifecycle.viewModelScope
 import it.reyboz.bustorino.backend.*
 import it.reyboz.bustorino.backend.mato.MatoAPIFetcher
 import it.reyboz.bustorino.data.NextGenDB
 import it.reyboz.bustorino.data.OldDataRepository
 import it.reyboz.bustorino.middleware.RecursionHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicReference
 
 class ArrivalsViewModel(application: Application): AndroidViewModel(application) {
 
     // Arrivals of palina
     val appContext: Context = application.applicationContext
     private val executor = Executors.newFixedThreadPool(2)
     private val oldRepo = OldDataRepository(executor, application)
 
 
     val palinaFromArrivals = MediatorLiveData<Palina>()
     val palinaToShow = MediatorLiveData<Palina>()
     val sourcesLiveData = MediatorLiveData<Passaggio.Source>()
 
     val resultLiveData = MutableLiveData<Fetcher.Result>()
 
     val currentFetchers = MediatorLiveData<List<ArrivalsFetcher>>()
 
     private val stopID = MutableLiveData<String>()
 
     fun setStopId(stopId: String) { stopID.value = (stopId) }
     val stopFavoritesData = stopID.switchMap { oldRepo.getFavoritesLiveDataByStopId(listOf(it))}
     val stopInFavorites = stopFavoritesData.map { it!=null && it.isNotEmpty() }
 
         /// OLD REPO for stops instance
 
     private var stopIdRequested = ""
     private val stopFromDB = MutableLiveData<Stop>()
 
     val arrivalsRequestRunningLiveData = MutableLiveData(false)
 
     private val oldRepoStopCallback = OldDataRepository.Callback<ArrayList<Stop>>{ stopListRes ->
         if(stopIdRequested.isEmpty()) return@Callback
 
         if(stopListRes.isSuccess) {
             val stopF = stopListRes.result!!.filter { s -> s.ID == stopIdRequested }
             if (stopF.isEmpty()) {
                 Log.w(DEBUG_TAG, "Requested stop $stopIdRequested but is not in the list from database: ${stopListRes.result}")
             } else{
                 stopFromDB.postValue(stopF[0])
                 Log.d(DEBUG_TAG, "Setting new stop ${stopF[0]} from database")
             }
         } else{
             Log.e(DEBUG_TAG, "Requested stop ${stopIdRequested} from database but error occured: ${stopListRes.exception}")
         }
     }
 
     init {
 
         palinaFromArrivals.addSource(stopFromDB){
             s ->
             val hasSource = palinaFromArrivals.value?.passaggiSourceIfAny
             //Log.d(DEBUG_TAG, "Have current palina ${palinaLiveData.value!=null}, source passaggi $hasSource,  new incoming stop $s from database")
             val newp = if(palinaFromArrivals.value == null) Palina(s) else Palina.mergePaline(palinaFromArrivals.value, Palina(s))
             //Log.d(DEBUG_TAG, "Merged palina: $newp, num passages: ${newp?.totalNumberOfPassages}, has coords: ${newp?.hasCoords()}")
             newp?.let { pal -> palinaFromArrivals.postValue(pal) }
         }
         palinaToShow.addSource(stopFavoritesData){ dat ->
             val current = palinaFromArrivals.value
             Log.d(DEBUG_TAG, "have palina $current and favorites data: $dat")
             if(dat!=null && current!=null){
                 if(dat.size>0 && dat[0].stopUserName!=null) // is in the favorites
                     current.stopUserName = dat[0].stopUserName
                 //set new data in palinaLiveData
                 palinaToShow.value = current
             }
         }
         palinaToShow.addSource(palinaFromArrivals){ p->
             stopFavoritesData.value?.let {it ->
                 if(it.isNotEmpty() && it[0].stopUserName!=null) {
                     p.stopUserName = it[0].stopUserName
                 }
             }
             palinaToShow.value = p
         }
 
     }
 
     fun clearPalinaArrivals(palina: Palina) : Palina{
         palina.clearRoutes()
         return palina
     }
 
 
     fun requestArrivalsForStop(stopId: String, fetchers: List<ArrivalsFetcher>){
         val context = appContext //application.applicationContext
         currentFetchers.value = fetchers
         //THIS IS TOTALLY WRONG!!!
         /*palinaLiveData.value?.let{
             palinaLiveData.value = clearPalinaArrivals(it)
         }
 
          */
         //request stop from the DB
         stopIdRequested = stopId
         oldRepo.requestStopsWithGtfsIDs(listOf("gtt:$stopId"), oldRepoStopCallback)
         arrivalsRequestRunningLiveData.value = true
         viewModelScope.launch(Dispatchers.IO){
             runArrivalsFetching(stopId, fetchers, context)
         }
     }
 
     fun requestArrivalsForStop(stopId: String, fetchersSources: Array<String>){
         val fetchers = constructFetchersFromStrList(fetchersSources)
         requestArrivalsForStop(stopId, fetchers)
     }
 
-    private suspend fun runArrivalsFetching(stopId: String, fetchers: List<ArrivalsFetcher>, appContext: Context) {
+    private fun runArrivalsFetching(stopId: String, fetchers: List<ArrivalsFetcher>, appContext: Context) {
 
         if (fetchers.isEmpty()) {
             //do nothing
             arrivalsRequestRunningLiveData.postValue(false)
             return
         }
 
         // Equivalente del doInBackground nell'AsyncTask
         val recursionHelper = RecursionHelper(fetchers.toTypedArray())
         var resultPalina : Palina? = null
 
         val stringBuilder = StringBuilder()
         for (f in fetchers) {
             stringBuilder.append("")
             stringBuilder.append(f.javaClass.simpleName)
             stringBuilder.append("; ")
         }
         Log.d(DEBUG_TAG, "Using fetchers: $stringBuilder")
 
         val resultRef = AtomicReference<Fetcher.Result>()
 
         while (recursionHelper.valid()) {
 
             val fetcher = recursionHelper.getAndMoveForward()
 
             sourcesLiveData.postValue(fetcher.sourceForFetcher)
 
 
             if (fetcher is ArrivalsFetcherContext) {
                 fetcher.setContext(appContext)
             }
             Log.d(DEBUG_TAG, "Using the ArrivalsFetcher: ${fetcher.javaClass}")
 
             // Verifica se è un fetcher per MetroStop da saltare
             try {
                 if (fetcher is FiveTAPIFetcher && stopId.toInt() >= 8200) {
                     continue
                 }
             } catch (ex: NumberFormatException) {
                 Log.e(DEBUG_TAG, "The stop number is not a valid integer, expect failures")
             }
 
             // Legge i tempi di arrivo
             val palina = fetcher.ReadArrivalTimesAll(stopId, resultRef)
 
             Log.d(DEBUG_TAG, "Arrivals fetcher: $fetcher\n\tProgress: ${resultRef.get()}")
 
 
             // Gestione del FiveTAPIFetcher per ottenere le direzioni
             if (fetcher is FiveTAPIFetcher) {
                 val branchResultRef = AtomicReference<Fetcher.Result>()
                 val branches = fetcher.getDirectionsForStop(stopId, branchResultRef)
                 Log.d(DEBUG_TAG, "FiveTArrivals fetcher: $fetcher\n\tDetails req: ${branchResultRef.get()}")
 
                 if (branchResultRef.get() == Fetcher.Result.OK) {
                     palina.addInfoFromRoutes(branches)
 
                     // Inserisce i dati nel database
                     viewModelScope.launch(Dispatchers.IO) {
                         //modify the DB in another coroutine in the background
                         NextGenDB.insertBranchesIntoDB(appContext,branches)
                     }
 
                 } else {
                     resultRef.set(Fetcher.Result.NOT_FOUND)
                 }
             }
 
             // Unisce percorsi duplicati
             palina.mergeDuplicateRoutes(0)
 
             if (resultRef.get() == Fetcher.Result.OK && palina.getTotalNumberOfPassages() == 0) {
                 resultRef.set(Fetcher.Result.EMPTY_RESULT_SET)
                 Log.d(DEBUG_TAG, "Setting empty results")
             }
             //reportProgress
             resultLiveData.postValue(resultRef.get())
 
             // Se è un MatoAPIFetcher con risultati validi, salviamo i dati
             if (resultPalina == null && fetcher is MatoAPIFetcher && palina.queryAllRoutes().size > 0) {
                 resultPalina = palina
             }
 
             // Se abbiamo un risultato OK, restituiamo la palina
             if (resultRef.get() == Fetcher.Result.OK) {
                 setResultAndPalinaFromFetchers(palina, Fetcher.Result.OK)
 
                 return
             }
             //end Fetchers loop
         }
 
         // Se arriviamo qui, tutti i fetcher hanno fallito
         //failedAll = true
 
         // Se abbiamo comunque una palina, la restituiamo
         resultPalina?.let {
             setResultAndPalinaFromFetchers(it, resultRef.get())
         }
         //in ogni caso, settiamo la richiesta come conclusa
         arrivalsRequestRunningLiveData.postValue(false)
         Log.d(DEBUG_TAG, "Finished fetchers available to search arrivals for palina stop $stopId")
     }
 
     private fun setResultAndPalinaFromFetchers(palina: Palina, fetcherResult: Fetcher.Result) {
         arrivalsRequestRunningLiveData.postValue(false)
         resultLiveData.postValue(fetcherResult)
         Log.d(DEBUG_TAG, "Have new result palina for stop ${palina.ID}, source ${palina.passaggiSourceIfAny} has coords: ${palina.hasCoords()}")
         Log.d(DEBUG_TAG, "Old palina liveData is: ${palinaFromArrivals.value?.stopDisplayName}, has Coords ${palinaFromArrivals.value?.hasCoords()}")
         palinaFromArrivals.postValue(Palina.mergePaline(palina, palinaFromArrivals.value))
     }
     companion object{
         const val DEBUG_TAG="BusTO-ArrivalsViMo"
 
         @JvmStatic
         fun getFetcherFromStrSource(src:String): ArrivalsFetcher?{
             val srcEnum = Passaggio.Source.valueOf(src)
 
             val fe: ArrivalsFetcher? = when(srcEnum){
                 Passaggio.Source.FiveTAPI -> FiveTAPIFetcher()
                 Passaggio.Source.GTTJSON ->  GTTJSONFetcher()
                 Passaggio.Source.FiveTScraper -> FiveTScraperFetcher()
                 Passaggio.Source.MatoAPI -> MatoAPIFetcher()
                 Passaggio.Source.UNDETERMINED -> null
                 null -> null
             }
             return fe
         }
 
         @JvmStatic
         fun constructFetchersFromStrList(sources: Array<String>): List<ArrivalsFetcher>{
             val fetchers = mutableListOf<ArrivalsFetcher>()
             for(s in sources){
                 val fe = getFetcherFromStrSource(s)
                 if(fe!=null){
                     fetchers.add(fe)
                 } else{
                     Log.d(DEBUG_TAG, "Cannot convert fetcher source $s to a fetcher")
                 }
             }
 
             return fetchers
         }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/FavoritesViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/FavoritesViewModel.kt
index df233b7..2164ae7 100644
--- a/app/src/main/java/it/reyboz/bustorino/viewmodels/FavoritesViewModel.kt
+++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/FavoritesViewModel.kt
@@ -1,92 +1,95 @@
 package it.reyboz.bustorino.viewmodels
 
 import android.app.Application
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.application
 import androidx.lifecycle.map
 import androidx.lifecycle.switchMap
 import androidx.lifecycle.viewModelScope
 import androidx.work.WorkInfo
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.backend.StopFavoritesData
 import it.reyboz.bustorino.data.DBUpdateWorker.Companion.getWorkInfoLiveData
 import it.reyboz.bustorino.data.FavoritesLiveData
 import it.reyboz.bustorino.data.OldDataRepository
 import it.reyboz.bustorino.data.QueryLiveData
 import kotlinx.coroutines.launch
 import java.util.concurrent.Executors
 
 class FavoritesViewModel(application: Application) : AndroidViewModel(application) {
 
     val oldRepo: OldDataRepository
 
     init {
         val executor = Executors.newCachedThreadPool()
         oldRepo = OldDataRepository(executor, application)
     }
     /*var favoritesLiveData: FavoritesLiveData? = null
 
     override fun onCleared() {
         if (favoritesLiveData != null) favoritesLiveData!!.onClear()
         super.onCleared()
     }
 
     val favorites: FavoritesLiveData
         get() {
             if (favoritesLiveData == null) {
                 favoritesLiveData = FavoritesLiveData(application, true)
             }
             return favoritesLiveData!!
         }
 */
     val isDBUpdating = getWorkInfoLiveData(application).map { wilist ->
         var isUpdating = false
         if(wilist.isNotEmpty()){
             val wi = wilist[0]
             isUpdating = wi.state == WorkInfo.State.RUNNING
         }
         isUpdating
     }
 
 
     // ---- NEW CODE -----
     // this code is not active now, but it is gonna be useful for the day when the ContentObserver is gonna be dismissed
     //for all favorites
     val favoritesWithStop = MediatorLiveData<List<Stop>>()
     val favoritesNoStop = oldRepo.getFavoritesLiveData()
 
     val stopsForFavorites = favoritesNoStop.switchMap {
         val sids = it.map { d-> d.stopID }
         oldRepo.getStopsForIdsLiveData(sids)
     }
 
     init{
         // this fetches the stops when I have gotten the favorites
         favoritesWithStop.addSource(favoritesNoStop){ dat ->
             if(dat!=null) stopsForFavorites.value?.let{ stops ->
                 matchFavoritesStopsAndUpdate(dat, stops)
             }
         }
 
         favoritesWithStop.addSource(stopsForFavorites) { stops ->
             favoritesNoStop.value?.let { fav ->
                 if(stops!=null){
                     matchFavoritesStopsAndUpdate(fav, stops)
                 }
             }
         }
     }
     fun matchFavoritesStopsAndUpdate(fav: List<StopFavoritesData>, stops: List<Stop>) {
         //copy favorites info
-        for(s in stops) {
-            val di = fav.first{ it.stopID == s.ID}
-            di.addToStop(s)
+        val stopsSave = ArrayList<Stop>()
+        for (f in fav) {
+           stops.firstOrNull{ it.ID == f.stopID }?.let { s ->
+               f.addToStop(s)
+               stopsSave.add(s)
+           }
         }
-        favoritesWithStop.value = stops
+        favoritesWithStop.value = stopsSave
     }
     companion object {
         const val DEBUG_TAG = "BusTO-FavoritesViewM"
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/StopsMapViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/StopsMapViewModel.kt
index 0c01ed3..8269f59 100644
--- a/app/src/main/java/it/reyboz/bustorino/viewmodels/StopsMapViewModel.kt
+++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/StopsMapViewModel.kt
@@ -1,150 +1,119 @@
 /*
 	BusTO - View Model components
     Copyright (C) 2025 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.viewmodels
 
 import android.app.Application
 import android.location.Location
-import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.switchMap
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.data.OldDataRepository
+import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.geometry.LatLngBounds
 import org.maplibre.geojson.BoundingBox
 import java.util.concurrent.Executors
 import kotlin.collections.ArrayList
 import kotlin.math.abs
 
 class StopsMapViewModel(application: Application): AndroidViewModel(application) {
 
 
     private val executor = Executors.newFixedThreadPool(2)
     private val oldRepo = OldDataRepository(executor, application)
 
     //private var stopsShownIDs = HashSet<String>()
     //private var allStopsLoaded = HashMap<String,Stop>()
 
     private val boundingBoxLoaded = MutableLiveData<BoundingBox>()
-    val stopsInBoundingBox = MutableLiveData<ArrayList<Stop>>()
-
-    private val callback =
-        OldDataRepository.Callback<ArrayList<Stop>> { res ->
-                if(res.isSuccess){
-                    stopsInBoundingBox.postValue(res.result)
-                    Log.d(DEBUG_TAG, "Setting value of stops in bounding box")
-                }
-        }
+    //val stopsToShow = MediatorLiveData<ArrayList<Stop>>()
 
     fun getStopByID(id: String): Stop? {
         return stopsToShow.value?.firstOrNull{ s-> s.ID == id}
     }
 
     fun getAllStopsLoaded(): ArrayList<Stop>?{
         return stopsToShow.value
     }
 
-    /*fun requestStopsInBoundingBox(bb: BoundingBox) {
-        bb.let {
-            Log.d(DEBUG_TAG, "Launching stop request")
-            oldRepo.requestStopsInArea(it.latSouth, it.latNorth, it.lonWest, it.lonEast, callback)
-        }
+    private fun checkDistanceBbox(boxCurrent: BoundingBox, boxNew: BoundingBox): Double{
+        val d1 = LatLng(boxCurrent.north(), boxCurrent.east()).distanceTo(
+            LatLng(boxNew.north(), boxNew.east())
+        )
+        val d2 = LatLng(boxCurrent.south(), boxCurrent.west()).distanceTo(
+            LatLng(boxNew.south(), boxNew.west())
+        )
+        return Math.max(d1,d2)
     }
-
-     */
     private fun updateBoundingBox(boundingBox: BoundingBox){
         val current = boundingBoxLoaded.value
         if(current == null){
             boundingBoxLoaded.value = boundingBox
         } else{
             val bb = boundingBox
-            val mix = BoundingBox.fromLngLats(Math.min(current.west(), bb.west()),
+            val bnew = BoundingBox.fromLngLats(Math.min(current.west(), bb.west()),
                 Math.min(current.south(), bb.south()), Math.max(current.north(), bb.east()),
                 Math.max(current.north(), bb.north()))
 
-            boundingBoxLoaded.value = mix
+            val newDistance = checkDistanceBbox(current, bnew)
+            if(newDistance > 5) {
+                Log.d(DEBUG_TAG, "New box is larger than current, new max distance: $newDistance")
+                boundingBoxLoaded.value = bnew
+            } else{
+                //Log.d(DEBUG_TAG, "New box is NOT larger than current, not updating")
+            }
         }
     }
 
     fun loadStopsInLatLngBounds(bb: LatLngBounds){
-        val extra = 0.05
+        val extra = 0.01
         val deltaLong = abs(bb.longitudeEast - bb.longitudeWest) * extra
         val deltaLat = abs(bb.latitudeNorth - bb.latitudeSouth) * extra
 
         val newBB = BoundingBox.fromLngLats(bb.longitudeWest - deltaLat,
             bb.latitudeSouth -deltaLong,
             bb.longitudeEast + deltaLong,
             bb.latitudeNorth +deltaLat)
 
         updateBoundingBox(newBB)
         /*Log.d(DEBUG_TAG, "Launching stop request")
 
         oldRepo.requestStopsInArea(bb.latitudeSouth-deltaLat, bb.latitudeNorth+deltaLat,
             bb.longitudeWest-deltaLong, bb.longitudeEast+deltaLong,
             addStopsCallback)
 
          */
 
     }
 
-    /*private val addStopsCallback =
-        OldDataRepository.Callback<ArrayList<Stop>> { res ->
-            if(res.isSuccess) res.result?.let{ newStops ->
-                //val stopsAdd = stopsToShow.value ?: ArrayList()
-                /*for (s in newStops){
-                    if (s.ID !in stopsShownIDs){
-                        stopsShownIDs.add(s.ID)
-                        stopsAdd.add(s)
-                        allStopsLoaded[s.ID] = s
-                    }
-                }
-
-                 */
-                allStopsLoaded.clear()
-                for(stop in newStops){
-                    allStopsLoaded[stop.ID] = stop
-                }
-                Log.d(DEBUG_TAG, "Loaded ${newStops.size} stops")
-                stopsToShow.postValue(newStops)
-                //Log.d(DEBUG_TAG, "Loaded ${stopsAdd.size} stops in total")
-            }
-        }
-
-     */
-    /*stopsToShow.addSource(boundingBoxLoaded){
-        oldRepo.requestStopsInArea(it.south(), it.north(),
-            it.west(), it.east(),
-            addStopsCallback)
-    }
-
-     */
-
     val stopsToShow = boundingBoxLoaded.switchMap {
         oldRepo.requestStopsInAreaLiveData(it.south(), it.north(), it.west(), it.east())
     }
 
 
     //this is only saved at the end, is it really necessary?
     var lastUserLocation: Location? = null
 
     companion object{
         private const val DEBUG_TAG = "BusTOStopMapViewModel"
+
+        private const val DECIMAL_PLACES = 8
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_backup.xml b/app/src/main/res/layout/fragment_backup.xml
new file mode 100644
index 0000000..80e3c72
--- /dev/null
+++ b/app/src/main/res/layout/fragment_backup.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".fragments.BackupImportFragment"
+                android:padding="10dp"
+                android:paddingEnd="5dp"
+                android:paddingStart="5dp"
+>
+
+        <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:id="@+id/topPartCardView"
+                app:cardElevation="5dp"
+                app:cardCornerRadius="10dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentEnd="true"
+                android:layout_margin="5dp"
+                android:layout_marginBottom="10dp"
+        >
+            <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:padding="10dp"
+                    android:layout_height="wrap_content"
+ >
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:fontFamily="@font/lato_bold"
+                          android:text="@string/backup_title"
+                          android:textSize="22sp"
+                          android:id="@+id/backupTitleText"
+                          app:layout_constraintTop_toTopOf="parent"
+                          app:layout_constraintStart_toStartOf="parent"
+                          app:layout_constraintEnd_toEndOf="parent"
+                          android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                          android:layout_marginBottom="10dp"
+                          app:layout_constraintBottom_toTopOf="@id/saveButton"
+                />
+            <Button
+                    android:text="@string/btn_backup_message"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" android:id="@+id/saveButton"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/backupTitleText"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    app:layout_constraintVertical_bias="0.0"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    android:backgroundTint="?attr/colorAccent"
+
+            />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+
+
+    <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/bottomPartCardview"
+            android:layout_below="@id/topPartCardView"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="10dp"
+            android:layout_margin="5dp"
+    >
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:padding="10dp"
+                android:layout_height="wrap_content">
+
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:fontFamily="@font/lato_bold"
+                      android:text="@string/restore_title"
+                      android:textSize="22sp"
+                      android:id="@+id/restoreTitleText"
+                      app:layout_constraintTop_toTopOf="parent"
+                      app:layout_constraintStart_toStartOf="parent"
+                      app:layout_constraintEnd_toEndOf="parent"
+                      android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                      android:layout_marginBottom="10dp"
+                      app:layout_constraintBottom_toTopOf="@id/favoritesCheckBox"
+                      />
+
+        <CheckBox
+                android:text="@string/load_file_favorites"
+                android:layout_width="wrap_content"
+                android:checked="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/restoreTitleText"
+                app:layout_constraintBottom_toTopOf="@id/preferencesCheckBox"
+                app:layout_constraintHorizontal_bias="0.0"
+                android:layout_marginStart="15dp"
+                android:minHeight="48dp"
+                android:layout_height="wrap_content"
+                android:id="@+id/favoritesCheckBox"/>
+        <CheckBox
+                android:text="@string/load_preferences"
+                android:layout_width="wrap_content"
+                android:checked="true"
+                app:layout_constraintTop_toBottomOf="@id/favoritesCheckBox"
+                app:layout_constraintBottom_toTopOf="@id/loadDataButton"
+                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                android:layout_marginStart="15dp"
+                android:minHeight="48dp"
+                android:layout_marginTop="8dp"
+
+                android:layout_height="wrap_content" android:id="@+id/preferencesCheckBox"/>
+        <Button
+                android:text="@string/btn_load_backup_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" android:id="@+id/loadDataButton"
+                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/preferencesCheckBox"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginTop="18dp"
+                app:layout_constraintVertical_bias="0.0"
+                android:backgroundTint="?attr/colorAccent"
+
+
+        />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_test_saving.xml b/app/src/main/res/layout/fragment_test_saving.xml
deleted file mode 100644
index cf77e5d..0000000
--- a/app/src/main/res/layout/fragment_test_saving.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".fragments.BackupImportFragment">
-    <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <Button
-                android:text="@string/btn_backup_message"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/saveButton"
-                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/favoritesCheckBox"
-                android:layout_marginTop="50dp"
-                android:layout_marginBottom="50dp"
-                app:layout_constraintVertical_bias="0.0"
-                app:layout_constraintVertical_chainStyle="packed"
-                android:backgroundTint="?attr/colorAccent"
-
-        />
-
-
-        <CheckBox
-                android:text="@string/load_file_favorites"
-                android:layout_width="wrap_content"
-                android:checked="true"
-                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/saveButton"
-                app:layout_constraintBottom_toTopOf="@id/preferencesCheckBox"
-                app:layout_constraintVertical_bias="0.0"
-                android:minHeight="48dp"
-
-                android:layout_height="wrap_content" android:id="@+id/favoritesCheckBox"/>
-        <CheckBox
-                android:text="@string/load_preferences"
-                android:layout_width="wrap_content"
-                android:checked="true"
-                app:layout_constraintTop_toBottomOf="@id/favoritesCheckBox"
-                app:layout_constraintBottom_toTopOf="@id/loadDataButton"
-                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintVertical_bias="0.0"
-                android:minHeight="48dp"
-                android:layout_marginTop="8dp"
-
-                android:layout_height="wrap_content" android:id="@+id/preferencesCheckBox"/>
-        <Button
-                android:text="@string/btn_load_backup_message"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/loadDataButton"
-                app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/preferencesCheckBox"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginTop="18dp"
-                app:layout_constraintVertical_bias="0.0"
-                android:backgroundTint="?attr/colorAccent"
-
-
-        />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b8872a7..245273f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,251 +1,250 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="yes">Oui</string>
     <string name="title_activity_settings">Paramètres</string>
     <string name="search">Rechercher</string>
     <string name="insert_bus_stop_number">Numéro de l\'arrêt de bus</string>
     <string name="insert_bus_stop_number_error">Insérer le numéro de l\'arrêt de bus</string>
     <string name="message_install_barcode_scanner">Cette application nécessite une autre application pour scanner les codes QR. Souhaitez-vous installer Barcode Scanner maintenant ?</string>
     <string name="insert_bus_stop_name_error">Insérer le nom de l\'arrêt de bus</string>
     <string name="route_towards_destination">%1$s vers %2$s</string>
     <string name="route_towards_unknown">%s (destination inconnue)</string>
     <string name="network_error">Vérifiez votre connexion Internet !</string>
     <string name="query_too_short">Nom trop court, tapez davantage de caractères et réessayez</string>
     <string name="parsing_error">Erreur lors de l\'analyse du site 5T/GTT (foutu site!)</string>
     <string name="results">Sélectionner l\'arrêt de bus…</string>
     <string name="line">Ligne</string>
     <string name="lines_fill">Lignes: %1$s</string>
     <string name="extraurban_lines">Lignes interurbaines</string>
     <string name="direction_duep">Destination:</string>
     <string name="no_passages">Aucun planning trouvé</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Code source</string>
     <string name="action_licence">Licence</string>11
     <string name="added_in_favorites">L\'arrêt de bus est désormais dans vos favoris</string>
     <string name="favorites_lines">Favoris</string>
     <string name="about_activity">À propos de l\\\'application</string>
     <string name="close_tutorial_short">Fermer le tutoriel</string>
     <string name="directions_capitalize_everything">Majuscules partout</string>
     <string name="pref_shown_startup_def_desc">Appuyez pour modifier</string>
     <string name="pref_lines_click_msg">Afficher les arrivées à l\'appui sur un arrêt</string>
     <string name="pref_experimental_msg">Activer les fonctions expérimentales</string>
     <string name="positions_source_mato_descr">MaTO (le plus fréquemment mis à jour, parfois avec erreurs)</string>
     <string name="remove_all_trips">Supprimer les données des trajets (libère de l\'espace)</string>
     <string name="grant_location_permission">Autoriser l\'accès à la localisation</string>
     <string name="location_permission_granted">Permission d\'accès à la localisation accordée</string>
     <string name="location_permission_not_granted">Permission d\'accès à la localisation refusée</string>
     <string name="close_tutorial">OK, fermer le tutoriel</string>
     <string name="backup_restore">Sauvegarder et restaurer</string>
-    <string name="backup_activity">Importer/Exporter les préférences</string>
     <string name="data_imported_backup">La sauvegarde a été importée</string>
     <string name="message_check_at_least_one">Vérifiez cocher au moins un élément à importer !</string>
     <string name="load_file_favorites">Importer les favoris depuis une sauvegarde</string>
     <string name="load_preferences">Importer les préférences depuis une sauvegarde</string>
     <string name="passages_fill">Arrivées à: %1$s</string>
     <string name="action_about_more">En savoir plus</string>
     <string name="action_author">Rencontrer l\'auteur</string>
     <string name="action_help">Aide</string>
     <string name="lines">Lignes</string>
     <string name="urban_lines">Lignes urbaines</string>
     <string name="turist_lines">Lignes touristiques</string>
     <string name="no_qrcode">Aucun code QR trouvé, essayez d\'utiliser une autre application pour le scanner</string>
     <string name="action_wiki">Ouvrez la wiki</string>
     <string name="favorites_line_remove">Ligne retirée de vos favoris</string>
     <string name="arrival_times">Heures d\'arrivée</string>
     <string name="removed_from_favorites">Arrêt de bus retiré de vos favoris</string>
     <string name="favorites_line_add">Ligne ajoutée à vos favoris</string>
     <string name="title_activity_favorites">Favoris</string>
     <string name="no_passages_title">Aucune arrivée trouvée pour les lignes :</string>
     <string name="action_rename_bus_stop_username">Renommer</string>
     <string name="cannot_show_on_map_no_position">Impossible de trouver la position de l\'arrêt</string>
     <string name="settings_search_radius">Distance maximale (en mètres)</string>
     <string name="enable_position_message_map">Autorisez l\'accès à la localisation pour l\'afficher sur la carte</string>
     <string name="database_update_msg_inapp">Mise à jour de la base de données en cours…</string>
     <string name="settings_reset_database">Lancer la mise à jour manuelle de la base de données</string>
     <string name="enable_location_message">Veuillez activer la localisation sur l\'appareil</string>
     <string name="database_update_msg_notif">Mise à jour de la base de données</string>
     <string name="database_update_req">Forcer la mise à jour de la base de données</string>
     <string name="arrivals_card_at_the_stop">à l\'arrêt</string>
     <string name="show_arrivals">Afficher les arrivées</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="mqtt_notification_text">Le service de localisation en temps réel MaTO live bus est en cours d\'exécution</string>
     <string name="storage_permission">stockage</string>
     <string name="stop_search_view_title">Rechercher par arrêt</string>
     <string name="message_crash">L\'application a planté en raison d\'un bug.\nSi vous le souhaitez, vous pouvez aidez les développeurs en envoyant le rapport de plantage par e-mail.\nVeuillez noter que ce rapport ne comporte aucune donnée sensible, seulement quelques informations sur votre téléphone et la configuration/l\'état de l\'application.</string>
     <string name="drawer_open">Ouvrir le menu de navigation</string>
     <string name="experiments">Fonctions expérimentales</string>
     <string name="requesting_db_update">Lancement de la mise à jour de la base de données</string>
     <string name="search_box_lines_suggestion_filter">Filtrer par nom</string>
     <string name="directions_capitalize_no_change">Ne pas modifier la direction des arrivées</string>
     <string name="directions_capitalize_first_letter">Majuscules sur la première lettre uniquement</string>
     <string name="pref_shown_startup">Section à afficher au démarrage</string>
     <string name="positions_source_pref_title">"Source de la localisation en temps réel pour les bus et les trams"</string>
     <string name="long_press_stop_4_options">Appui long sur l\'arrêt pour afficher les options</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (moins fréquemment mis à jour, mais plus précis)</string>
     <string name="all_trips_removed">Tous les trajets GTFS ont été supprimés de la base de données</string>
     <string name="btn_backup_message">Sauvegarde dans un fichier</string>
     <string name="grant_notification_permission">Activer les notifications</string>
     <string name="notification_permission_granted">Notifications activées</string>
     <string name="btn_load_backup_message">Importer depuis une sauvegarde</string>
     <string name="title_barcode_scanner_install">Installer Barcode Scanner ?</string>
     <string name="howDoesItWork"><b>Appuyez sur l\\\'étoile</b> pour ajouter l\'arrêt de bus à vos favoris\n\n<b>Pour lire les fiches horaires:</b>\n<b> 12:56*</b> Heures d\'arrivée en temps réel\n<b> 12:56</b> Heures d\'arrivée programmées\n\n<b>Tirez vers le bas pour actualiser</b> la fiche\n <b>Appui long sur la source des arrivées</b> pour la modifier</string>
     <string name="about_channel"><![CDATA[
     <h2>Actualités et mises à jour</h2>
     <p>Sur le canal Telegram, vous pouvez retrouver des informations sur les dernières mises à jour de l\'application</p>
     ]]></string>
     <string name="previous">Précédent</string>
     <string name="qrcode">Scanner le code QR</string>
     <string name="next">Suivant</string>
     <string name="insert_bus_stop_name">Nom de l\'arrêt de bus</string>
     <string name="no_arrivals_stop">Aucune arrivée prévue pour cette arrêt</string>
     <string name="no_bus_stop_have_this_name">Il semble qu\'il n\\\'y a aucun arrêt de bus avec ce nom</string>
     <string name="action_about">À propos de l\\\'application</string>
     <string name="no_lines_found">Aucune ligne trouvée dans cette catégorie</string>
     <string name="no_lines_found_query">Aucune ligne ne correspond à la recherche</string>
     <string name="line_fill">Ligne %1$s</string>
     <string name="line_fill_towards">Ligne %1$s, direction:</string>
     <string name="internal_error">Erreur interne inattendue, impossible d\'extraire les données depuis le site GTT/5T</string>
     <string name="action_favorites">Favoris</string>
     <string name="title_activity_map">Carte</string>
     <string name="action_remove_from_favourites">Supprimer</string>
     <string name="dialog_rename_bus_stop_username_title">Renommer l\'arrêt de bus</string>
     <string name="tip_add_favorite">Aucun favori ? Ah ! Appuyez sur l\'étoile au niveau d\'un arrêt de bus pour en ajouter !</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Réinitialiser</string>
     <string name="hint_button">J\'AI COMPRIS !</string>
     <string name="action_view_on_map">Voir sur la carte</string>
     <string name="nearby_stops_message">Arrêts à proximité</string>
     <string name="app_version">Version de l\'application</string>
     <string name="num_stops_nearby_not_number">Le nombre d\'arrêts à afficher dans les arrêts récents est invalide</string>
     <string name="invalid_number">Valeur invalide, veuillez saisir un nombre valide</string>
     <string name="position_searching_message">Recherche de l\'emplacement</string>
     <string name="no_stops_nearby">Aucun arrêt à proximité</string>
     <string name="pref_num_elements">Nombre minmum d\'arrêts</string>
     <string name="main_menu_pref">Préférences</string>
     <string name="action_settings">Paramètres</string>
     <string name="general_settings">Général</string>
     <string name="settings_experimental">Fonctionnalités expérimentales</string>
     <string name="pref_recents_group_title">Arrêts récents</string>
     <string name="settings_group_general">Paramètres généraux</string>
     <string name="settings_group_database">Gestion de la base de données</string>
     <string name="enable_position_message_nearby">Autorisez l\'accès à la localisation pour afficher les arrêts à proximité</string>
     <string name="database_update_req_descr">Appuyez pour mettre à jour la base de données maintenant</string>
     <string name="bus_arriving_at">arrive à</string>
     <string name="show_stops">Afficher les arrêts</string>
     <string name="open_telegram">Rejoindre le canal Telegram</string>
     <string name="show_introduction">Afficher l\'introduction</string>
     <string name="bt_center_map_description">Recentrer sur ma position</string>
     <string name="bt_follow_me_description">Me suivre</string>
     <string name="enable_position">Activer ou désactiver la localisation</string>
     <string name="location_enabled">Localisation activée</string>
     <string name="location_disabled">Localisation désactivée</string>
     <string name="map_location_disabled_device">La localisation est désactivée sur l\'appareil</string>
     <string name="times_source_fmt">Source des arrivées : %1$s</string>
     <string name="fivetapifetcher">Application GTT</string>
     <string name="gttjsonfetcher">Site Web de GTT</string>
     <string name="fivetscraper">Site Web de 5T Torino</string>
     <string name="undetermined_source">Non défini</string>
     <string name="arrival_source_changing">Modification de la source des heures d\'arrivée…</string>
     <string name="change_arrivals_source_message">Appui long pour modifier la source des arrivées</string>
     <string name="arrival_times_choice_title">Source des heures d\'arrivée</string>
     <string name="arrival_times_choice_explanation">Sélectionnez les sources d\'heures d\'arrivée à utiliser</string>
     <string name="default_notification_channel_description">Canal par défaut pour les notifications</string>
     <string name="database_notification_channel">Opérations sur la base de données</string>
     <string name="database_notification_channel_desc">Mises à jour de la base de données de l\'application</string>
     <string name="live_position_service_name">BusTO - Service de localisation en temps réel</string>
     <string name="live_positions_notification_channel">Localisation en temps réel</string>
     <string name="live_positions_notification_channel_desc">Affichage de l\'activité associée au service de localisation en temps réel</string>
     <string name="db_trips_download_message">Téléchargement des trajets depuis le serveur de MaTO</string>
     <string name="too_many_permission_asks">Permission pour %1$s demandée à de trop nombreuses reprises</string>
     <string name="permission_storage_maps_msg">Impossible d\'utiliser la carte sans la permission d\'accès au stockage !</string>
     <string name="acra_email_message">L\'application a planté et le rapport de plantage se trouve en pièce-jointe. Veuillez décrire ce que vous faisiez avant le plantage :</string>
     <string name="nav_arrivals_text">Arrivées</string>
     <string name="nav_map_text">Carte</string>
     <string name="nav_favorites_text">Favoris</string>
     <string name="drawer_close">Fermer le menu de navigation</string>
     <string name="donate_now">Offrir un café</string>
     <string name="map">Carte</string>
     <string name="downloading_data_mato">Téléchargement des données depuis le serveur MaTO</string>
     <string name="pref_directions_capitalize">Majuscules pour les directions</string>
     <string name="tutorial_action">Afficher le tutoriel</string>
     <string name="saved_data">Données sauvegardées</string>
     <string name="no">Non</string>
     <string name="app_description">Vous bénéficiez de la dernière technologie en matière de respect de votre vie privée.</string>
     <string name="stop_fill">Arrêt %1$s</string>
     <string name="about_history_bottom"><![CDATA[
 		<h2>Licences</h2>
 		<p>L\'application et le code source associé sont publiés par Valerio Bozzolan et les autres auteurs sous les termes de la licence <i>GNU General Public License v3+</i>.
 		Tout le monde est donc autorisé à utiliser, étudier, améliorer et partager cette application par <b>tout moyen</b> et à <b>toutes fins</b> : à condition de respecter ces droits et d\attribuer l\'œuvre originale à Valerio Bozzolan.</p>
         <br>
 		<h2>Remarques</h2>
 		<p>Cette application a été développée dans l\'espoir d\'<b>être utile à tous</b>, mais elle est fournie sans AUCUNE garantie d\'aucune sorte.</p>
 		<p>Les données utilisées par l\'application proviennent <b>directement</b> de GTT et d\'autres organismes publics : si vous constatez des erreurs, veuillez vous adresser à eux, et non à nous.</p>
 		<p>Cette traduction est gracieusement fournie par Ludovico Pavesi et Fabio Mazza.</p>
 		<p>Bonne utilisation ! :)</p>
     ]]></string>
     <string name="cant_add_to_favorites">Impossible d\'ajouter aux favoris ( stockage plein ou base de données corrompue ?) !</string>
     <string name="cannot_show_on_map_no_activity">Impossible de trouver une application où l\'afficher</string>
     <string name="nearby_arrivals_message">Arrivées à proximité</string>
     <string name="searching_arrivals_fmt">Recherche des arrivées depuis %1$s</string>
     <string name="too_far_not_showing_location">Vous êtes trop loin, position non affichée</string>
     <string name="map_style_pref_title">Style de la carte</string>
     <string name="map_style_versatiles">Versatiles (vectoriel)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, plus légèr)</string>
     <string name="tutorial_first"><![CDATA[Merci d\'avoir installé BusTO, l\'application gratuite, libre et <b>open source</b> pour les transports publics de Turin. Il s\'agit d\'une application <b>indépendante</b>, sans publicité ni traceurs d\'aucune sorte.]]></string>
     <string name="tutorial_search"><![CDATA[Vous pouvez rechercher les horaires d\'arrivée à un arrêt en saisissant le numéro dans le champ de recherche.<br>
 Si vous vous trouvez à un arrêt, vous pouvez scanner le code QR présent sur le panneau en appuyant sur l\'icône à gauche de la barre de recherche.]]></string>
     <string name="tutorial_arrivals"><![CDATA[Une fois que vous avez trouvé un arrêt, vous pouvez l\'enregistrer dans vos <b>favoris</b> en touchant l\'étoile à côté de son nom]]>&gt;</string>
     <string name="tutorial_stops"><![CDATA[Vous pouvez voir les arrêts à proximité directement sur l\'écran principal...]]></string>
     <string name="tutorial_map"><![CDATA[...ou vous pouvez les trouver sur la carte, avec les positions en temps réel des bus circulant dans la ville (en <font color="#2F59CC">bleu</font>)]]></string>
     <string name="tutorial_line"><![CDATA[Vous pouvez également consulter la ligne qui vous intéresse et voir où se trouvent les arrêts, ainsi que les véhicules qui desservent la ligne à ce moment-là. N\'oubliez pas de choisir la direction qui vous intéresse !]]></string>
     <string name="tutorial_menu"><![CDATA[Toutes ces fonctions se trouvent dans le menu latéral.
 Consultez les <b>Paramètres</b> pour personnaliser l\'application, et la section <b>À propos de l\'application</b> si vous souhaitez en savoir plus sur l\'application et ses développeurs.]]></string>
     <string name="tutorial_permissions"><![CDATA[L\'application nécessite l\'autorisation <b>Notifications</b> pour afficher les informations relatives au fonctionnement en arrière-plan.
          Appuyez sur le bouton ci-dessous pour l\'autoriser]]></string>
     <string name="hello_blank_fragment">Bonjour fragment vide</string>
     <string name="no_map_app_to_show_stop">Aucune application trouvée pour afficher l\'arrêt !</string>
     <string name="showing_same_direction">Direction déjà sélectionnée</string>
     <string name="destination_loading">Chargement de la destination…</string>
     <string name="destination_unknown">Destination inconnue</string>
     <string name="live_positions_msg_ok">Le service des positions fonctionne normalement</string>
     <string name="live_positions_msg_no_positions">Aucune position reçue</string>
     <string name="live_positions_msg_connection_error">Erreur de connexion au serveur</string>
     <string name="live_positions_msg_parsing_error">Erreur lors de la lecture de la réponse du serveur</string>
     <string name="live_positions_msg_network_error">Erreur : réponse du serveur de type inattendu</string>
     <string name="live_positions_msg_connecting">Connexion en cours...</string>
     <string name="live_positions_dialog_provider_text">Source des positions en temps réel :</string>
     <string name="live_positions_switch_provider">Changer de source</string>
     <string name="live_positions_preference_switch_clear_title">Supprimer les positions sur la carte lorsque la source des positions en temps réel est modifiée</string>
     <string name="vehicle_fill">Véhicule %1$s</string>
     <string name="about_history_top"><![CDATA[
         <h1>Bienvenue !</h1>
 
         <p>Merci d\'avoir choisi BusTO, une application <b>open source</b> et <b>indépendante</b> utile pour se déplacer dans la ville de Turin avec un <b>logiciel libre</b> !</p>
         <p>BusTO respecte votre <b>vie privée</b> en ne collectant aucune donnée sur votre utilisation. Elle est <b>légère</b> et ne contient aucune <b>publicité</b> !</p>
         <br>
 	<p>Ici, vous trouverez plus d\'informations et des liens concernant le projet.</p>
         <br>
         <h2>Tutoriel</h2>
         <p>Si vous souhaitez consulter à nouveau l\'introduction, utilisez le bouton ci-dessous :</p>
         ]]></string>
     <string name="about_how"><![CDATA[
     <h2>How does it work?</h2>
         <p>Cette application est capable d\'accomplir toutes ces choses incroyables en extrayant des données de <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> ou <b>muoversiatorino.it</b> "pour usage personnel", ainsi que les données ouvertes du site web AperTO (aperto.comune.torino.it) .</p>
         <br>
 		<p>Le travail de plusieurs personnes est à l\'origine de cette application, en particulier :<br>
 		- <b>Fabio Mazza</b>, développeur rockstar senior actuel.<br>
         - <b>Andrea Ugo</b>, développeur junior rockstar actuel.<br>
 		- <b>Silviu Chiriac</b>, créateur du logo du 2021.<br>
 		- <b>Marco M</b>, testeur rockstar et chasseur de bugs.<br>
 		- <b>Ludovico Pavesi</b>, ancien développeur rockstar senior (asd).<br>
 		- <b>Valerio Bozzolan</b>, mainteneur et infrastructures (sponsor).<br>
 		- <b>Marco Gagino</b>, contributeur et créateur de la première icône.<br>
 		- <b>JSoup</b> bibliothèque pour le scraping web.<br>
 		- <b>makovkastar</b> boutons flottants<br>
         - <b>Google</b> pour les icônes et les bibliothèques de support et de design.<br>
         - Autres icônes provenant de <b>Bootstrap</b>, <b>Feather</b> et <b>Hero Icons</b>.<br>
 		- Tous les contributeurs, ainsi que les bêta-testeurs !
 		</p>
 		<br>
 		 Si vous souhaitez obtenir plus d\'informations ou contribuer au développement, utilisez les boutons ci-dessous !</b>
     ]]></string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a110956..36176ca 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,255 +1,258 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">Codice QR</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
     <string name="next">Prossimo</string>
     <string name="previous">Precedente</string>
     <string name="title_barcode_scanner_install">Installare Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR. Vuoi installare Barcode Scanner?</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="no_arrivals_stop">Nessun passaggio trovato alla fermata</string>
     <string name="searching_arrivals_fmt">Ricerca arrivi da %1$s</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages_fill">Fermata: %1$s</string>
     <string name="passages">Fermata:</string>
     <string name="line">Linea</string>
     <string name="lines">Linee</string>
     <string name="urban_lines">Linee urbane</string>
     <string name="extraurban_lines">Linee extraurbane</string>
     <string name="turist_lines">Linee turistiche</string>
     <string name="direction_duep">Direzione:</string>
     <string name="no_lines_found">Nessuna linea in questa categoria</string>
     <string name="no_lines_found_query">Nessuna linea corrisponde alla ricerca</string>
     <string name="search_box_lines_suggestion_filter">Filtra per nome</string>
     <string name="line_fill">Linea %1$s</string>
     <string name="lines_fill">Linee: %1$s</string>
     <string name="line_fill_towards">Linea %1$s, direzione:</string>
     <string name="stop_fill">Fermata %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="vehicle_fill">Matricola %1$s</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code trovato, prova ad usare un\'altra app</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_about">Informazioni</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Vai alla wiki</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="action_open_line">Mostra linea</string>
     <string name="action_show_direction">Vedi direzione</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b> 12:56*</b> Orario in tempo reale\n<b> 12:56</b> Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario. \n<b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo</string>
     <string name="hint_button">OK!</string>
     <string name="about_history_top"><![CDATA["<h1>Benvenuto!</h1>\n        \n        <p>Grazie per aver scelto BusTO, un\'app <b>open source</b> e <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>!</p>\n        <p>BusTO rispetta la tua <b>privacy</b> non raccogliendo nessun dato sull\'utilizzo, ed è <b>leggera</b> e senza <b>pubblicità</b>!</p>\n        <br>\n        <p>Qui puoi trovare più informazioni e link riguardo al progetto.</p>\n\t\t<br>\n        <h2>Schermata iniziale</h2>\n        <p>Se vuoi rivedere la schermata iniziale, usa il pulsante qui sotto:</b>"]]></string>
     <string name="about_channel"><![CDATA[
         <h2>Notizie e aggiornamenti</h2>
         <p>Nel canale Telegram puoi trovare informazioni sugli ultimi aggiornamenti dell\'app</p>
         ]]></string>
     <string name="about_how"><![CDATA["<h2>Ma come funziona?</h2>\n        <p>Quest\'app ottiene i passaggi dei bus, le fermate e altre informazioni utili unendo dati forniti dal sito <b>www.gtt.to.it</b>, <i>www.5t.torino.it</i>, <b>muoversiatorino.it</b> \"per uso personale\" e altre fonti Open Data (aperto.comune.torino.it).</p>\n        <br>\n\t\t<p>Ingredienti:<br>\n\t\t- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>\n\t\t- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>\n\t\t- <b>Silviu Chiriac</b> designer del logo 2021.<br>\n\t\t- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>\n\t\t- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>\n\t\t- <b>Valerio Bozzolan</b> attuale manutentore.<br>\n\t\t- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>\n\t\t- <b>JSoup</b> libreria per \"<i>web scaping</i>\".<br>\n\t\t- <b>Google</b> icone e librerie di supporto e design.<br>\n\t\t- Altre icone da <b>Bootstrap</b>, <b>Feather</b> e <b>Hero Icons</b><br>\n\t\t- Tutti i contributori e i beta tester!\n\t\t</p>\n        <br>\n\t\tSe vuoi avere più informazioni o contribuire allo sviluppo, usa i pulsanti qui sotto!</b>"]]></string>
     <string name="about_history_bottom"><![CDATA[<h2>Licenze</h2>\n\t\t<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3</i> (https://www.gnu.org/licenses/gpl-3.0.html).\n\t\tCiò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan e agli altri autori del codice dell\'app.\n\t\t</p>\n\n\t\t<br>\n\t\t<h2>Note</h2>\n\t\t<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia sul suo funzionamento attuale e/o futuro.</p>\n\t\t<p>Tutti i dati utilizzati dall\'app provengono <b>direttamente</b> da GTT o da simili agenzie pubbliche: se trovi che sono inesatti per qualche motivo, ti invitiamo a rivolgerti a loro.</p>\n\t\t<p>Buon utilizzo! :)</p>]]></string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_msg_inapp">Aggiornamento del database…</string>
     <string name="database_update_msg_notif">Aggiornamento del database</string>
     <string name="database_update_req">Aggiornamento database forzato</string>
     <string name="database_update_req_descr">Tocca per aggiornare ora il database</string>
     <string name="pref_num_elements">Numero minimo di fermate</string>
     <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
     <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
     <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
     <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Lancia aggiornamento manuale del database</string>
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enable_position_message_nearby">Consenti l\'accesso alla posizione per mostrare le fermate vicine</string>
     <string name="enable_location_message">Abilitare la posizione sul dispositivo</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Canale telegram</string>
     <string name="show_introduction">Mostra introduzione</string>
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
     <string name="enable_position">Attiva o disattiva posizione</string>
     <string name="location_enabled">Posizione attivata</string>
     <string name="location_disabled">Posizione disattivata</string>
     <string name="map_location_disabled_device">La posizione è disabilitata sul dispositivo</string>
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Sconosciuta</string>
     <string name="arrival_times_choice_title">Fonti orari di arrivo</string>
     <string name="arrival_times_choice_explanation">Scegli le fonti di orari da usare</string>
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
     <string name="no_passages_title">Nessun passaggio per le linee:</string>
     <string name="default_notification_channel_description">Canale default delle notifiche</string>
     <string name="database_notification_channel">Operazioni sul database</string>
     <string name="database_notification_channel_desc">Informazioni sul database (aggiornamento)</string>
     <string name="live_position_service_name">BusTO - posizioni in tempo reale</string>
     <string name="live_positions_notification_channel">Posizioni in tempo reale</string>
     <string name="live_positions_notification_channel_desc">Attività del servizio delle posizioni in tempo reale</string>
     <string name="mqtt_notification_text">Servizio posizioni MaTO in tempo reale attivo</string>
     <string name="db_trips_download_message">Download dei trip dal server MaTO</string>
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio!</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse:</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
     <string name="arrival_times">Orari di arrivo</string>
     <!--  Preferences -->
     <string name="requesting_db_update">Richiesto aggiornamento del database</string>
     <string name="downloading_data_mato">Download dati dal server MaTO</string>
     <string name="pref_directions_capitalize">Mostra direzioni in maiuscolo</string>
     <string name="directions_capitalize_no_change">Non cambiare</string>
     <string name="directions_capitalize_everything">Tutto in maiuscolo</string>
     <string name="directions_capitalize_first_letter">Solo prima lettera maiuscola</string>
     <string name="pref_lines_click_msg">Mostra arrivi quando tocchi una fermata</string>
     <string name="pref_experimental_msg">Abilita esperimenti</string>
     <string name="pref_shown_startup">Schermata da mostrare all\'avvio</string>
     <string name="pref_shown_startup_def_desc">Tocca per cambiare</string>
     <string name="positions_source_pref_title">Fonte posizioni in tempo reale di bus e tram</string>
     <string name="positions_source_mato_descr">MaTO (aggiornate più spesso, può avere errori)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (aggiornato meno frequentemente, posizioni più controllate)</string>
     <string name="favorites_line_add">Linea aggiunta ai preferiti</string>
     <string name="favorites_line_remove">Linea rimossa dai preferiti</string>
     <string name="favorites_lines">Preferite</string>
     <!-- lines -->
     <string name="long_press_stop_4_options">Tocca a lungo la fermata per le opzioni</string>
     <string name="map_style_pref_title">Stile della mappa</string>
     <string name="map_style_versatiles">Versatiles (vettoriale)</string>
     <string name="map_style_legacy_raster">OSM Legacy (raster, più leggera)</string>
     <string name="remove_all_trips">Rimuovi i dati dei trip (libera spazio)</string>
     <string name="all_trips_removed">Tutti i trip GTFS sono rimossi dal database</string>
     <!-- tutorial -->
     <string name="tutorial_action">Mostra introduzione</string>
     <string name="tutorial_first"><![CDATA[Grazie per aver installato BusTO, l\'app gratuita, libera e <b>open source</b> per il trasporto pubblico di Torino. Stai usando un\'app <b>indipendente</b>, senza pubblicità e senza nessun tracciamento.]]></string>
     <string name="tutorial_search"><![CDATA[Puoi cercare gli orari d\'arrivo ad una fermata inserendo il numero nella casella di ricerca.<br>
 Se ti trovi a una fermata, puoi scansionare il codice QR presente sulla palina toccando l\'icona a sinistra della barra di ricerca.]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Una volta trovata una fermata, puoi aggiungerla ai <b>preferiti</b> toccando la stella a fianco del nome.]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[Con la posizione abilitata, puoi vedere le <b>fermate più vicine</b> a te direttamente nella schermata principale...]]>
     </string>
     <string name="tutorial_map">
         <![CDATA[...oppure puoi trovarle sulla mappa, assieme alle <b>posizioni in tempo reale</b> dei bus e tram (in <font color="#2F59CC">blu</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[Scopri il percorso e le fermate della linea che preferisci, insieme alle posizioni in tempo reale dei bus/tram che la servono. Ricorda di scegliere la direzione che ti interessa!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[Tutte queste funzioni si trovano nel menu laterale.<br>
 Guarda nelle <b>Impostazioni</b> per personalizzare l\'app come preferisci, e su <b>Informazioni</b> per sapere di più sull\'app e il team di sviluppo.]]>
     </string>
     <string name="close_tutorial">Capito, chiudi introduzione</string>
     <string name="close_tutorial_short">Chiudi introduzione</string>
     <string name="tutorial_permissions"><![CDATA[
          L\'app usa le notifiche per fornire informazioni sullo stato delle attività.
          Tocca il bottone per abilitarle.
         ]]></string>
     <string name="grant_location_permission">Abilita accesso alla posizione</string>
     <string name="location_permission_granted">Accesso alla posizione abilitato</string>
     <string name="location_permission_not_granted">Accesso alla posizione non consentito dall\'utente</string>
     <string name="grant_notification_permission">Abilita notifiche</string>
     <string name="notification_permission_granted">Notifiche abilitate</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup e ripristino</string>
-    <string name="backup_activity">Importa / esporta dati</string>
     <string name="saved_data">Dati salvati</string>
+    <string name="backup_title">Backup</string>
+    <string name="restore_title">Ripristino</string>
+    <string name="backup_completed_toast">Backup completato</string>
+    <string name="backup_restore_pref_description">Salva o ripristina i dati</string>
     <string name="btn_backup_message">Salva backup</string>
     <string name="btn_load_backup_message">Importa i dati dal backup</string>
     <string name="data_imported_backup">Backup importato</string>
     <string name="message_check_at_least_one">Seleziona almeno un elemento da importare!</string>
     <string name="load_file_favorites">Importa preferiti dal backup</string>
     <string name="load_preferences">Importa preferenze dal backup</string>
     <string name="no_map_app_to_show_stop">Nessuna app disponibile per mostrare la fermata!</string>
     <string name="destination_unknown">Destinazione sconosciuta</string>
     <string name="showing_same_direction">Direzione già selezionata</string>
     <string name="too_far_not_showing_location">Sei troppo lontano, posizione nascosta</string>
     <string name="destination_loading">Caricamento destinazione…</string>
     <string name="hello_blank_fragment">Ciao fragment vuoto</string>
     <string name="live_positions_msg_ok">Il servizio delle posizioni funziona normalmente</string>
     <string name="live_positions_msg_no_positions">Nessuna posizione ricevuta</string>
     <string name="live_positions_msg_connection_error">Errore nella connessione al server</string>
     <string name="live_positions_msg_parsing_error">Errore nel parsing della risposta</string>
     <string name="live_positions_msg_network_error">Errore: risposta dal server inaspettata</string>
     <string name="live_positions_msg_connecting">In connessione...</string>
     <string name="live_positions_dialog_provider_text">Fonte posizioni in tempo reale:</string>
     <string name="live_positions_switch_provider">Cambia fonte</string>
     <string name="live_positions_preference_switch_clear_title">Rimuovi posizioni sulla mappa quando si cambia fonte delle posizioni in tempo reale</string>
     <string name="updated_fill">Aggiornato: %1$s</string>
     <string name="no_alerts_in_your_language_fill">Nessun avviso nella tua lingua, mostrati in %1$s</string>
     <string name="italian">Italiano</string>
     <string name="english">Inglese</string>
     <string name="alert_line_fill">Avvisi per la linea %1$s:</string>
     <string name="checking_alerts_update">Controllo degli avvisi disponibili in corso</string>
     <string name="no_gps_on_device">Servizio GPS non trovato sul dispositivo!</string>
     <string name="downloading_alerts_message">Download dati avvisi in tempo reale</string>
     <string name="no_permission_dialog_title">Permesso mancante</string>
     <string name="no_permission_dialog_text_location">Per usare questa funzionalità, l\'app necessita dell\'accesso alla posizione, che ora può essere dato solo dalle impostazioni di sistema.</string>
     <string name="no_permission_dialog_open">Apri le impostazioni</string>
     <string name="back_again_to_close">Premi ancora \"indietro\" per uscire dall\'app</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0704935..3a1dbb4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,229 +1,228 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="grant_location_permission">Geef locatietoestemming</string>
-    <string name="backup_activity">Importeer/exporteer voorkeuren</string>
     <string name="tutorial_permissions"><![CDATA[De app heeft toestemming nodig voor <b>Notificaties</b>  om informatie te laten zien over achtergrondprocessen.
          Druk op de knop hieronder om deze toestemming te geven]]></string>
     <string name="location_permission_not_granted">Locatie toestemming is niet verleend</string>
     <string name="notification_permission_granted">Notificaties ingeschakeld</string>
     <string name="saved_data">Data opgeslagen</string>
     <string name="backup_restore">Backup en herstel</string>
     <string name="btn_backup_message">Backup naar bestand</string>
     <string name="message_check_at_least_one">Vink tenminste één item om te importeren!</string>
     <string name="btn_load_backup_message">Importeer data vanuit backup</string>
     <string name="data_imported_backup">Backup is geïmporteerd</string>
     <string name="howDoesItWork"><b>Druk op de ster</b> om de bushalte toe te voegen aan de favorieten\n\n<b>Hoe lees je de tijdslijnen:</b>\n<b>   12:56*</b> Real-time aankomsten\n<b>   12:56</b>  Geplande aankomsten\n\n<b>Veeg naar beneden om het rooster te verversen</b>\n <b>Houd ingedrukt om de aankomsttijdenbron te veranderen</b></string>
     <string name="about_history_top"><![CDATA[
         <h1>Welkom!</h1>
 
         <p>Dank voor het gebruiken van BusTO, een <b>open source</b> en <b>onafhankelijke</b> app die handig is om je te verplaatsen door Turijn met <b>Free/Libre software</b>.</p>
         <br>
         <p>Waarom deze app gebruiken?</p>
 		<p>
         - Je wordt nooit <b>gevolgd</b><br>
         - Je ziet nooit vervelende <b>reclames</b><br>
         - We zullen altijd je <b>privacy</b> respecteren<br>
         - Tot slot, het is lichtgewicht!<br>
         </p>
         <br>
         <h2>Introductie tutorial</h2>
         <p>Als je nog een keer de introductie wilt zien, gebruik dan de knop hieronder:</p>
         ]]></string>
     <string name="search">Zoeken</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="app_description">Wanneer het op privacy respecteren aankomt, maak je gebruik van de laatste inzichten.</string>
     <string name="insert_bus_stop_number">Bushalte nummer</string>
     <string name="insert_bus_stop_name_error">Voer bushalte naam in</string>
     <string name="route_towards_destination">%1$s richting %2$s</string>
     <string name="route_towards_unknown">%s (onbekende bestemming)</string>
     <string name="no_bus_stop_have_this_name">Het lijkt erop dat er geen bushalte met deze naam is</string>
     <string name="no_arrivals_stop">Geen aankomsten voor deze halte</string>
     <string name="parsing_error">Fout bij het parsen van de 5T/GTT website</string>
     <string name="results">Kies de bushalte…</string>
     <string name="line">Lijn</string>
     <string name="lines">Lijnen</string>
     <string name="urban_lines">Stadslijnen</string>
     <string name="extraurban_lines">Lijnen naar buiten de stad</string>
     <string name="turist_lines">Toeristenlijnen</string>
     <string name="no_lines_found">Geen lijnen gevonden in deze categorie</string>
     <string name="no_lines_found_query">Geen lijnen gevonden met deze naam</string>
     <string name="direction_duep">Bestemming:</string>
     <string name="line_fill">Lijn %1$s</string>
     <string name="no_passages">Geen rooster gevonden</string>
     <string name="no_qrcode">Geen QR code gevonden, probeer het met een andere app</string>
     <string name="internal_error">Onverwachte interne fout, kan geen data halen van de GTT/5T website</string>
     <string name="action_help">Hulp</string>
     <string name="action_about">Over de app</string>
     <string name="action_wiki">Draag bij (en)</string>
     <string name="action_source">Broncode</string>
     <string name="action_licence">Licentie</string>11
     <string name="action_author">Ontmoet de maker</string>
     <string name="added_in_favorites">Bushalte is nu in je favorieten</string>
     <string name="removed_from_favorites">Bushalte is verwijderd uit je favorieten</string>
     <string name="favorites_line_add">Lijn toegevoegd aan favorieten</string>
     <string name="favorites_line_remove">Verwijder lijn uit favorieten</string>
     <string name="favorites_lines">Favorieten</string>
     <string name="action_favorites">Favorieten</string>
     <string name="tip_add_favorite">Geen favorieten? Druk op een bushalte ster om deze toe te voegen</string>
     <string name="action_remove_from_favourites">Verwijder</string>
     <string name="action_rename_bus_stop_username">Hernoem</string>
     <string name="about_activity">Over de app</string>
     <string name="arrival_times">Aankomsttijden</string>
     <string name="hint_button">Ik snap het!</string>
     <string name="action_view_on_map">Bekijk op de kaart</string>
     <string name="cannot_show_on_map_no_activity">Kan geen applicatie vinden om in te weergeven</string>
     <string name="cannot_show_on_map_no_position">Kan de positie van de halte niet vinden</string>
     <string name="nearby_stops_message">Haltes in de buurt</string>
     <string name="nearby_arrivals_message">Verbindingen dichtbij</string>
     <string name="position_searching_message">Locatie vinden</string>
     <string name="no_stops_nearby">Geen haltes in de buurt</string>
     <string name="main_menu_pref">Voorkeuren</string>
     <string name="action_settings">Instellingen</string>
     <string name="settings_search_radius">Maximale afstand (meters)</string>
     <string name="settings_group_general">Algemene instellingen</string>
     <string name="enable_position_message_map">Toegang tot locatie toestaan om te laten zien op de kaart</string>
     <string name="enable_position_message_nearby">Toegang tot locatie toestaan om haltes in de buurt te weergeven</string>
     <string name="enable_location_message">Schakel aub de locatie in op het apparaat</string>
     <string name="database_update_msg_inapp">Database update gaande…</string>
     <string name="database_update_msg_notif">Database aan het updaten</string>
     <string name="database_update_req">Forceer database update</string>
     <string name="database_update_req_descr">Klik om de database van de app te updaten</string>
     <string name="bus_arriving_at">arriveert om</string>
     <string name="arrivals_card_at_the_stop">bij de halte</string>
     <string name="show_arrivals">Geef aankomsten weer</string>
     <string name="show_stops">Geef haltes weer</string>
     <string name="open_telegram">Word lid van het Telegramkanaal</string>
     <string name="show_introduction">Laat introductie zien</string>
     <string name="bt_center_map_description">Centreer op mijn locatie</string>
     <string name="bt_follow_me_description">Volg mij</string>
     <string name="enable_position">Schakel locatie in of uit</string>
     <string name="location_enabled">Locatie ingeschakeld</string>
     <string name="location_disabled">Locatie uitgeschakeld</string>
     <string name="map_location_disabled_device">Locatie is uitgeschakeld op dit apparaat</string>
     <string name="times_source_fmt">Aankomsten bron: %1$s</string>
     <string name="fivetapifetcher">GTT Applicatie</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Onbepaald</string>
     <string name="change_arrivals_source_message">Ingedrukt houden om aankomsten bron te veranderen</string>
     <string name="arrival_times_choice_title">Bronnen van aankomsttijden</string>
     <string name="arrival_times_choice_explanation">Selecteer welke bronnen voor aankomsttijden je wilt gebruiken</string>
     <string name="database_notification_channel">Database handelingen</string>
     <string name="live_positions_notification_channel_desc">Laat activiteit zien gerelateerd aan de live positie service</string>
     <string name="db_trips_download_message">Download reizen van de MaTO server</string>
     <string name="too_many_permission_asks">Te vaak om %1$s toestemming gevraagd</string>
     <string name="permission_storage_maps_msg">Kan de kaart niet gebruiken zonder opslagtoestemming</string>
     <string name="acra_email_message">De applicatie is gecrasht en het crashrapport is toegevoegd aan de bijlagen. Beschrijf alsjeblieft wat je aan het doen was voordat de crash zich voordeed:</string>
     <string name="nav_map_text">Kaart</string>
     <string name="nav_favorites_text">Favorieten</string>
     <string name="drawer_open">Open navigatiebalk</string>
     <string name="drawer_close">Sluit navigatiebalk</string>
     <string name="donate_now">Geef ons een koffie</string>
     <string name="map">Kaart</string>
     <string name="stop_search_view_title">Zoek op halte</string>
     <string name="downloading_data_mato">Download data van de MaTO server</string>
     <string name="pref_directions_capitalize">Kapitaliseer routebeschrijving</string>
     <string name="pref_experimental_msg">Schakel experimenten in</string>
     <string name="long_press_stop_4_options">Houd halte ingedrukt voor opties</string>
     <string name="positions_source_pref_title">Bron van realtime posities voor bussen en trams</string>
     <string name="all_trips_removed">Alle GTFS reizen zijn verwijderd van de database</string>
     <string name="tutorial_search"><![CDATA[Je kunt zoeken op aankomsttijden bij de bushalte door het nummer van de halte in te voeren, of een QR code te scannen als je bij de halte staat.
         raak hiervoor het icoon links aan ]]></string>
     <string name="tutorial_arrivals"><![CDATA[Als je een bushalte hebt gevonden, kun je hem in de <b>favorites</b> door op de ster bij de naam te drukken]]></string>
     <string name="tutorial_stops"><![CDATA[Je kunt de haltes dicht bij je zien direct op het hoofdscherm...]]></string>
     <string name="close_tutorial">OK, sluit de tutorial</string>
     <string name="close_tutorial_short">Sluit de tutorial</string>
     <string name="grant_notification_permission">Notificaties inschakelen</string>
     <string name="load_preferences">Importeer voorkeuren vanuit backup</string>
     <string name="next">Volgende</string>
     <string name="insert_bus_stop_number_error">Voer bushalte nummer in</string>
     <string name="network_error">Check je internetverbinding!</string>
     <string name="query_too_short">Te korte naam, typ meer karakters en probeer opnieuw</string>
     <string name="passages_fill">Aankomsten om: %1$s</string>
     <string name="lines_fill">Lijnen: %1$s</string>
     <string name="action_about_more">Meer over</string>
     <string name="title_activity_favorites">Favorieten</string>
     <string name="title_activity_map">Kaart</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="dialog_rename_bus_stop_username_title">Hernoem bushalte</string>
     <string name="previous">Vorige</string>
     <string name="no">Nee</string>
     <string name="message_install_barcode_scanner">Deze applicatie vereist een app om de QR codes te scannen. Wil je nu een Barcode Scanner installeren?</string>
     <string name="insert_bus_stop_name">Bushalte naam</string>
     <string name="yes">Ja</string>
     <string name="title_barcode_scanner_install">Installeer Barcode Scanner?</string>
     <string name="no_passages_title">Geen aankomsten gevonden voor deze lijnen:</string>
     <string name="about_channel"><![CDATA[
     <h2>Nieuws en Updates</h2>
     <p>Op het Telegramkanaal vind je meer informatie over de laatste app updates</p>
     ]]></string>
     <string name="cant_add_to_favorites">Kan niet aan favorieten toevoegen (opslag vol of corrupte database?)!</string>
     <string name="app_version">App versie</string>
     <string name="invalid_number">Ongeldige waarde, vul een geldig getal in</string>
     <string name="num_stops_nearby_not_number">Het aantal haltes dat wordt weergegeven in recente haltes is ongeldig</string>
     <string name="pref_recents_group_title">Recente haltes</string>
     <string name="general_settings">Algemeen</string>
     <string name="pref_num_elements">Minimaal aantal haltes</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="settings_experimental">Experimentele functies</string>
     <string name="settings_group_database">Databasebeheer</string>
     <string name="settings_reset_database">Start handmatige database update</string>
     <string name="default_notification_channel_description">Standaardkanaal voor notificaties</string>
     <string name="database_notification_channel_desc">Updates van de app database</string>
     <string name="live_position_service_name">BusTO - live positie service</string>
     <string name="mqtt_notification_text">MaTO live buspositie service draait</string>
     <string name="live_positions_notification_channel">Live posities</string>
     <string name="storage_permission">opslag</string>
     <string name="message_crash">De applicatie is gecrashed omdat je een bug tegenkwam.\nAls je wilt, kun je de ontwikkelaars helpen door een crashrapport te versturen per email. \nZorg ervoor dat er geen gevoelige data in het rapport is opgenomen, enkel de informatie over je telefoon en app instellingen is hiervoor nodig.</string>
     <string name="arrival_source_changing">Verander aankomsttijden bron…</string>
     <string name="pref_shown_startup">Startscherm</string>
     <string name="nav_arrivals_text">Aankomsten</string>
     <string name="tutorial_menu"><![CDATA[Je kunt alles terugvinden in het zijmenu.
 Kijk in de <b>Instellingen</b> om het gedrag van de app aan te passen, en in <b>Over de app</b> als je meer wilt weten over de app en de ontwikkelaars.]]></string>
     <string name="pref_shown_startup_def_desc">Raak aan om te wijzigen</string>
     <string name="requesting_db_update">Lanceer databaseupdate</string>
     <string name="pref_lines_click_msg">Laat aankomsten zien bij de halte</string>
     <string name="remove_all_trips">Verwijder reisdata (maak ruimte vrij)</string>
     <string name="tutorial_action">Laat tutorial zien</string>
     <string name="tutorial_map"><![CDATA[...of je kunt ze vinden op de kaart, tegelijk met de real-time posities van de bussen die door de stad rijden (in het <font color="#2F59CC">blauw</font>)]]></string>
     <string name="tutorial_line"><![CDATA[Je kunt ook kijken naar de lijn die je zoekt en zien welke haltes er zijn, samen met de voertuigen die de lijn op dat moment aandoen. Onthoud hierbij dat je de juiste richting kiest!]]></string>
     <string name="experiments">Experimenten</string>
     <string name="search_box_lines_suggestion_filter">Filter op naam</string>
     <string name="tutorial_first"><![CDATA[Dank voor het installeren van BusTO, de gratis en <b>open source</b> app voor Turijns openbaar vervoer. Dit is een <b>onafhankelijke</b> app, zonder reclame en zonder tracking.]]></string>
     <string name="location_permission_granted">Locatietoestemming gegeven</string>
     <string name="load_file_favorites">Importeer favorieten vanuit backup</string>
     <string name="about_how"><![CDATA[
     <h2>Deze app is mede mogelijk gemaakt door</h2>
         <p>De app werkt dankzij de data te gebruiken van <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> of <b>muoversiatorino.it</b> "voor persoonlijke doeleinden", tezamen met de open data van de AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>Het werk van diverse mensen achter deze app, in het bijzonder:<br>
 		- <b>Fabio Mazza</b>, huidige senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, huidige junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, ontwerper van het 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester en bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, vorige senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer en infrastructuur (sponsor).<br>
 		- <b>Marco Gagino</b>, bijdrager en ontwerper van het eerste logo.<br>
 		- <b>JSoup</b> web schraper bibliotheek.<br>
 		- <b>makovkastar</b> zwevende knoppen.<br>
         - <b>Google</b> for iconen en ondersteuning en ontwerpbibliotheken.<br>
         - Andere iconen van  <b>Bootstrap</b>, <b>Feather</b>, en <b>Hero Icons</b>.<br>
 		- Alle bijdragers en tevens de betatesters!
 		</p>
 		<br>
 		 Als je meer technische informatie wilt of zelf wilt bijdragen aan de ontwikkeling, gebruik dan de knoppen hieronder!</b>
     ]]></string>
     <string name="about_history_bottom"><![CDATA[
 		<h2>Licenties</h2>
 		<p>De app en de bijbehorende broncode is gepubliceerd door Valerio Bozzolan en andere ontwikkelaars onder de voorwaarden van de <i>GNU General Public License v3+</i>).
 		Iedereen staat het vrij om de app te gebruiken, te bestuderen, te verbeteren en te delen op <b>iedere mogelijke manier</b> en voor <b>ieder doeleinde</b>: onder de voorwaarden dat de beheren van de rechten en het toeschrijven van het originele werk aan Valerio Bozzolan.</p>
         <br>
 		<h2>Notities</h2>
 		<p>Deze app is ontwikkeld met de <b>hoop bruikbaar te zijn voor iedereen</b>, maar komt zonder enige vorm van garantie.</p>
 		<p>De data van de app komt <b>direct</b> van GTT en andere publieke vertegenwoordige: als je fouten vindt, geef die bij hen aan, en niet bij ons.</p>
 		<p>De vertaling is met plezier geleverd door Riccardo Caniato, Marco Gagino, Fabio Mazza en Wouter van Straalen</p>
 		<p>Nu kan ook jij het openbare vervoer hacken! :)</p>
     ]]></string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1e17ae..17942b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,396 +1,402 @@
 <?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_name_gitpull" translatable="false">BusTO git</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="yes">Yes</string>
     <string name="no">No</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
 
     <string name="title_barcode_scanner_install">Install Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">This application requires an app to scan the QR codes. Would you like
         to install Barcode Scanner now?
     </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 has this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</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_fill">Arrivals at: %1$s</string>
     <string name="passages">Arrivals at:</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="urban_lines">Urban lines</string>
     <string name="extraurban_lines">Extra urban lines</string>
     <string name="turist_lines">Tourist lines</string>
     <string name="no_lines_found">No lines found in this category</string>
     <string name="no_lines_found_query">No lines match the searched name</string>
 
 
     <string name="direction_duep">Destination:</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line %1$s</string>
     <string name="line_fill_towards">Line %1$s towards:</string>
     <string name="stop_fill">Stop %1$s</string>
     <string name="vehicle_fill">Vehicle %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code found, try using another app to scan</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 the app</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Open the wiki</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="favorites_line_add">Added line to favorites</string>
     <string name="favorites_line_remove">Remove line from favorites</string>
     <string name="favorites_lines">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_activity">About the app</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="arrival_times">Arrival times</string>
     <string name="no_passages_title">No arrivals found for lines:</string>
     <string name="about_history_top">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, an <b>open source</b> and <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
         <br>
         <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>
         <br>
         <h2>Introductory tutorial</h2>
         <p>If you want to see the introduction again, use the button below:</p>
         ]]></string>
     <string name="about_channel">
         <![CDATA[
     <h2>News and Updates</h2>
     <p>On the Telegram channel, you can find information about the latest app updates</p>
     ]]></string>
     <string name="about_how">
         <![CDATA[
     <h2>How does it work?</h2>
         <p>This app is able to do all the amazing things it does by pulling data from <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> or <b>muoversiatorino.it</b> "for personal use", along with open data from the AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>The work of several people is behind this app, in particular:<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 first icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
         - <b>Google</b> for icons and support and design libraries.<br>
         - Other icons from <b>Bootstrap</b>, <b>Feather</b>, and <b>Hero Icons</b>.<br>
 		- All the contributors, and the beta testers, too!
 		</p>
 		<br>
 		 If you want more information or want to contribute to development, use the buttons below!</b>
     ]]></string>
     <string name="about_history_bottom">
         <![CDATA[
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan and the other authors 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>
         <br>
 		<h2>Notes</h2>
 		<p>This app has been developed with the <b>hope to be useful to everyone</b>, but comes without ANY warranty of any kind.</p>
 		<p>The data used by the app comes <b>directly</b> from GTT and other public agencies: if you find any errors, please take it up to them, not to us.</p>
 		<p>This translation is kindly provided by Riccardo Caniato, Marco Gagino and Fabio Mazza.</p>
 		<p>Now you can hack public transport, too! :)</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="action_open_line">Show line details</string>
     <string name="action_show_direction">Show full direction</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 recent stops is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding location</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 location to show it on the map</string>
     <string name="enable_position_message_nearby">Allow access to location to show stops nearby</string>
     <string name="enable_location_message">Please enable location on the device</string>
     <string name="no_gps_on_device">No GPS receiver found on the device!</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</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>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Join Telegram channel</string>
     <string name="show_introduction">Show introduction</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>
     <string name="enable_position">Enable or disable location</string>
     <string name="location_enabled">Location enabled</string>
     <string name="location_disabled">Location disabled</string>
     <string name="map_location_disabled_device">Location is disabled on device</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="searching_arrivals_fmt">Loading arrivals from %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Undetermined</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>
     <string-array name="arrival_times_source_list">
         <item>@string/source_mato</item>
         <item>@string/fivetapifetcher</item>
         <item>@string/gttjsonfetcher</item>
         <item>@string/fivetscraper</item>
     </string-array>
     <string name="arrival_times_choice_title">Sources of arrival times</string>
     <string name="arrival_times_choice_explanation">Select which sources of arrival times to use</string>
 
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database operations</string>
     <string name="database_notification_channel_desc">Updates of the app database</string>
     <string name="live_position_service_name">BusTO - live position service</string>
     <string name="live_positions_notification_channel">Live positions</string>
     <string name="live_positions_notification_channel_desc">Showing activity related to the live positions service
     </string>
     <string name="mqtt_notification_text">MaTO live bus positions service is running</string>
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</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.
     </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>
     <string name="search_box_lines_suggestion_filter">Filter by name</string>
     <string name="requesting_db_update">Launching database update</string>
     <string name="downloading_data_mato">Downloading data from MaTO server</string>
     <string name="downloading_alerts_message">Downloading realtime alerts data</string>
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item>@string/directions_capitalize_no_change</item>
         <item>@string/directions_capitalize_everything</item>
         <item>@string/directions_capitalize_first_letter</item>
     </string-array>
     <string name="directions_capitalize_no_change">Do not change arrivals directions</string>
     <string name="directions_capitalize_everything">Capitalize everything</string>
     <string name="directions_capitalize_first_letter">Capitalize only first letter</string>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
     <string name="pref_shown_startup">Section to show on startup</string>
     <string name="pref_shown_startup_def_desc">Touch to change it</string>
     <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
     <string name="pref_experimental_msg">Enable experiments</string>
 
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Long press the stop for options</string>
 
     <array name="first_screen_shown">
         <item>@string/nav_arrivals_text</item>
         <item>@string/nav_favorites_text</item>
         <item>@string/nav_map_text</item>
         <item>@string/lines</item>
     </array>
     <string name="positions_source_pref_title">Source of real time positions for buses and trams</string>
     <string name="positions_source_mato_descr">MaTO (updated more frequently, might have errors)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (less frequently updated, more accurate)</string>
     <array name="positions_source_sel">
         <item>@string/positions_source_mato_descr</item>
         <item>@string/positions_source_gtfsrt_descr</item>
     </array>
     <string name="too_far_not_showing_location">"You are too far, not showing your position</string>
     <string name="map_style_pref_title">Style of the map</string>
     <string name="map_style_versatiles">Versatiles (vector)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, lighter)</string>
     <array name="map_style_pref_categories">
         <item>@string/map_style_versatiles</item>
         <item>@string/map_style_legacy_raster</item>
     </array>
 
     <string name="remove_all_trips">Remove trips data (free up space)</string>
     <string name="all_trips_removed">All GTFS trips have been removed from the database</string>
 
     <!-- Tutorial strings -->
     <string name="tutorial_action">Show tutorial</string>
     <string name="tutorial_first">
         <![CDATA[Thank you for installing BusTO, the free and <b>open source</b> app for Turin public transport. This is an <b>independent</b> app, with no ads and no tracking whatsoever.]]> </string>
     <string name="tutorial_search"> <![CDATA[You can search for the arrival times at a bus stop by inserting the number in the top, or scanning a QR code when you are at the stop
         touching the icon on the left ]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Once you have found a bus stop, you can save it in the <b>favorites</b> by touching the star next to its name]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[You can see the stops near your position directly in the main screen...]]>
     </string>
 
     <string name="tutorial_map">
         <![CDATA[...or you can find them in the map, along with the real-time positions of the buses running in the city (in <font color="#2F59CC">blue</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[You can also look at the line you want and see where the stops are, together with the vehicles serving the line at the moment. Remember to choose the direction you\'re interested in!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[You can find all of this from the lateral menu.
 Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About the app</b> section if you want to know more about the app and the developers.]]>
     </string>
     <string name="tutorial_permissions">
         <![CDATA[The app needs the <b>Notifications</b> permission to show the information about background processing.
          Press the button below to grant it]]>
     </string>
     <string name="grant_location_permission">Grant location permission</string>
     <string name="location_permission_granted">Location permission granted</string>
     <string name="location_permission_not_granted">Location permission has not been granted</string>
     <string name="no_permission_dialog_title">Missing permission</string>
     <!-- If more permissions are needed, adapt this string to make if "fillable" -->
     <string name="no_permission_dialog_text_location">To use this functionality, the application needs access to the location, which now can only be granted in the system settings.</string>
     <string name="no_permission_dialog_open">Open settings</string>
 
     <string name="close_tutorial">OK, close the tutorial</string>
     <string name="close_tutorial_short">Close the tutorial</string>
     <string name="grant_notification_permission">Enable notifications</string>
     <string name="notification_permission_granted">Notifications enabled</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup and restore</string>
-    <string name="backup_activity">Import/export preferences</string>
+    <!-- Title of the top section for the backup -->
+    <string name="backup_title">Backup</string>
+    <!-- Title of the bottom section - for restoring data -->
+    <string name="restore_title">Restore</string>
+    <!-- String in the settings screen to describe the action that can be performed -->
+    <string name="backup_restore_pref_description">Backup or restore data</string>
     <string name="saved_data">Data saved</string>
+    <string name="backup_completed_toast">Backup completed</string>
     <string name="btn_backup_message">Backup to file</string>
     <string name="btn_load_backup_message">Import data from backup</string>
     <string name="data_imported_backup">Backup has been imported</string>
     <string name="message_check_at_least_one">Check at least one item to import!</string>
     <string name="load_file_favorites">Import favorites from backup</string>
     <string name="load_preferences">Import preferences from backup</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
     <string name="no_map_app_to_show_stop">No map app present to show the stop!</string>
     <string name="showing_same_direction">Direction is already shown</string>
     <string name="destination_loading">Loading destination…</string>
     <string name="destination_unknown">Destination unknown</string>
     <!-- LIVE POSITIONS DIALOG -->
     <string name="live_positions_msg_ok">Service for positions working normally</string>
     <string name="live_positions_msg_no_positions">No positions received</string>
     <string name="live_positions_msg_connection_error">Error connecting to the server</string>
     <string name="live_positions_msg_parsing_error">Error parsing the server response</string>
     <string name="live_positions_msg_network_error">Error: network response is not as expected</string>
     <string name="live_positions_msg_connecting">Connecting...</string>
     <string name="positions_source_mato_short" translatable="false">MaTO</string>
     <string name="positions_source_gtfsrt_short" translatable="false">GTFS RT</string>
     <string name="live_positions_dialog_provider_text">Live positions source:</string>
     <string name="live_positions_switch_provider">Switch source</string>
     <string name="live_positions_preference_switch_clear_title">Clear bus positions when switching live positions
         source
     </string>
 
     <string name="updated_fill">Updated: %1$s</string>
     <string name="alert_line_fill">Alerts for line %1$s:</string>
     <string name="no_alerts_in_your_language_fill">No alerts in your language, showing in %1$s</string>
     <string name="italian">Italian</string>
     <string name="english">English</string>
     <string name="checking_alerts_update">Checking new alerts now</string>
     <string name="back_again_to_close">Press back again to close the app</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5764814..cf7314c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,85 +1,87 @@
 <resources>
 
     <!--
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
 
     <style name="AppBaseTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
             backward-compatibility can go here.
         -->
     </style>
     <style name="AppMaterialTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
 
     </style>
     <style name="AppMaterialTheme.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
 
     </style>
 
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
 
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- For the preferences Fragment -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
         <item name="android:textColor">@color/grey_700</item>
 
     </style>
 
     <style name="Widget.MyApp.Button" parent="Widget.MaterialComponents.Button">
         <item name="backgroundTint">?attr/colorSecondary</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 
     <!-- For the preferences Fragment -->
     <style name="PreferenceThemeOverlay.">
         <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item>
         <item name="preferenceFragmentStyle">@style/PreferenceFragment</item>
         <item name="preferenceCategoryStyle">@style/Preference.Category</item>
         <item name="preferenceStyle">@style/Preference</item>
         <item name="preferenceInformationStyle">@style/Preference.Information</item>
         <item name="checkBoxPreferenceStyle">@style/Preference.CheckBoxPreference</item>
         <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat</item>
         <item name="dialogPreferenceStyle">@style/Preference.DialogPreference</item>
         <item name="editTextPreferenceStyle">@style/Preference.DialogPreference.EditTextPreference</item>
         <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList</item>
     </style>
     <style name="Widget.AppTheme.NoActionBar.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">
         <item name="android:background">@color/black_overlay</item>
     </style>
 
     <style name="Widget.AppTheme.NoActionBar.ButtonBar.Fullscreen" parent="">
         <item name="android:background">@color/black_overlay</item>
         <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
     </style>
 
     <!-- styles that support night mode -->
     <style name="AppThemeDayNight" parent="Theme.MaterialComponents.DayNight">
     </style>
 
     <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
 
         <item name="android:windowTranslucentStatus">false</item>
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 8fba583..9355a41 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="FavTheme" parent="AppMaterialTheme.NoActionBar">
         <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="AppMaterialTheme.NoActionBar">
         <item name="colorPrimary">@color/teal_500</item>
         <item name="colorPrimaryDark">@color/teal_900</item>
         <item name="colorAccent">@color/blue_700</item>
         <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="MapTheme" parent="AppMaterialTheme.NoActionBar">
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
         <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
 
     <style name="AppTheme.NoActionBar.Light" parent="AppTheme.NoActionBar">
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
+    <style name="BackupTheme" parent="AppThemeDayNight.NoActionBar">
+        <item name="colorPrimary">@color/orange_500</item>
+        <item name="colorPrimaryDark">@color/orange_700</item>
+        <item name="colorAccent">@color/teal_500</item>
+        <item name="colorOnPrimary">@color/white</item>
+    </style>
+
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 7d2b5c8..1380f78 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,138 +1,138 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.preference.PreferenceCategory android:title="@string/general_settings">
         <androidx.preference.ListPreference
             android:key="startup_screen_to_show"
             android:entries="@array/first_screen_shown"
             android:entryValues="@array/first_screen_values"
             android:title="@string/pref_shown_startup"
             android:summary="%s"
             />
 
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
             android:title="@string/map"
     >
         <androidx.preference.ListPreference
                 android:key="libremap_style_1"
                 android:title="@string/map_style_pref_title"
                 android:entries="@array/map_style_pref_categories"
                 android:entryValues="@array/map_style_pref_values"
                 android:summary="%s"
         />
         <androidx.preference.ListPreference
                 android:key="@string/pref_positions_source"
                 android:entries="@array/positions_source_sel"
                 android:entryValues="@array/positions_source_values"
                 android:title="@string/positions_source_pref_title"
                 android:summary="%s"
 
         />
         <!-- NEVER EVER CHANGE THE KEY PROPERTIES -->
         <androidx.preference.CheckBoxPreference
             android:defaultValue="true"
             android:key="positions_clear_on_switch_pref"
             android:title="@string/live_positions_preference_switch_clear_title"
             app:singleLineTitle="false"
             />
 
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
             android:title="@string/pref_recents_group_title">
         <!--
     <androidx.preference.EditTextPreference
             android:defaultValue="10"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:inputType="number"
             android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
             app:useSimpleSummaryProvider="true"
             android:digits="0123456789"
     />
     -->
         <androidx.preference.SeekBarPreference
                 android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
                 android:defaultValue="6"
                 android:max="40"
                 app:min="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:showSeekBarValue="true"
 
         />
     <androidx.preference.SeekBarPreference
             android:title="@string/settings_search_radius"
             android:key="@string/pref_key_radius_recents"
             android:defaultValue="500"
             android:max="1000"
             app:min="100"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:showSeekBarValue="true"
 
     />
 
     </androidx.preference.PreferenceCategory>
     <!--
     <androidx.preference.Preference
             android:layout="@layout/pref_extra_version"
             android:key="version"
     />
     -->
     <androidx.preference.PreferenceCategory android:title="@string/arrival_times">
 
         <androidx.preference.MultiSelectListPreference
             android:key="arrivals_fetchers_use_setting"
             android:title="@string/arrival_times_choice_title"
             android:summary="@string/arrival_times_choice_explanation"
             android:entries="@array/arrival_times_source_list"
             android:entryValues="@array/arrivals_sources_values"
             android:defaultValue="@array/arrivals_sources_values_default"
             />
 
         <androidx.preference.ListPreference
             android:title="@string/pref_directions_capitalize"
             android:entries="@array/directions_capitalize"
             android:entryValues="@array/directions_capitalize_keys"
             android:key="@string/pref_arrival_times_capit"
         />
     </androidx.preference.PreferenceCategory>
 
     <!--TODO: If we want lines preferences (eg showing arrivals on click)
     <androidx.preference.PreferenceCategory android:title="@string/lines">
         <androidx.preference.CheckBoxPreference
                 android:title=""
             />
     </androidx.preference.PreferenceCategory>
     -->
 
     <androidx.preference.PreferenceCategory android:title="Database">
             <androidx.preference.Preference
                 android:title="@string/database_update_req"
                 android:summary="@string/database_update_req_descr"
                 android:key="pref_db_update_now"
             />
         <androidx.preference.Preference
                 android:title="@string/remove_all_trips"
                 android:key="pref_clear_gtfs_trips"
             />
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory android:title="@string/backup_restore">
         <androidx.preference.Preference
-            android:title="@string/backup_activity"
+            android:title="@string/backup_restore_pref_description"
             android:key="pref_backup_open"
             />
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
             android:title="@string/settings_experimental">
         <androidx.preference.SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:title="@string/pref_experimental_msg" android:key="@string/pref_key_experimental"/>
     </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>