settings backup/restore

app/build.gradle

@@ -33,6 +33,7 @@ dependencies {
     compile 'net.danlew:android.joda:2.9.4.2'
     compile 'com.google.firebase:firebase-ads:9.6.1'
     compile 'com.facebook.android:facebook-android-sdk:4.5.0'
+    compile 'com.github.simbiose:Encryption:1.4.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/java/com/rthoni/stssaguenay/business/STSBusiness.java

@@ -4,8 +4,9 @@ import android.content.Context;
 
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
 import com.rthoni.stssaguenay.dataaccess.STSDataAccess;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.UserDbo;
+import com.rthoni.stssaguenay.dbo.UsersSettingsDbo;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -30,15 +31,15 @@ public class STSBusiness {
         return _config;
     }
 
-    public static List<FavouriteStopDbo> getFavouriteStops(Context ctx)
+    public static List<UserFavouriteStopsDbo> getFavouriteStops(Context ctx)
     {
         String str = STSDataAccess.getFavouriteStopsJson(ctx);
-        List<FavouriteStopDbo> dbos = new Vector<>();
+        List<UserFavouriteStopsDbo> dbos = new Vector<>();
         JSONArray json;
         try {
             json = new JSONArray(str);
             for (int i = 0; i < json.length(); ++i) {
-                FavouriteStopDbo dbo = new FavouriteStopDbo();
+                UserFavouriteStopsDbo dbo = new UserFavouriteStopsDbo();
                 dbo.fromJson(json.getJSONObject(i));
                 dbos.add(dbo);
             }
@@ -48,10 +49,10 @@ public class STSBusiness {
         return dbos;
     }
 
-    public static void setFavouriteStops(Context ctx, List<FavouriteStopDbo> favourites)
+    public static void setFavouriteStops(Context ctx, List<UserFavouriteStopsDbo> favourites)
     {
         JSONArray json = new JSONArray();
-        for (FavouriteStopDbo favouriteStopDbo : favourites) {
+        for (UserFavouriteStopsDbo favouriteStopDbo : favourites) {
             json.put(new JSONObject(favouriteStopDbo.toArray()));
         }
         STSDataAccess.setFavouriteStopsJson(ctx, json.toString());
@@ -81,4 +82,16 @@ public class STSBusiness {
             STSDataAccess.setLoggedUserJson(ctx, user.toString());
         }
     }
+
+    public static UsersSettingsDbo getUserSettings(Context ctx)
+    {
+        UsersSettingsDbo settingsDbo = new UsersSettingsDbo();
+        settingsDbo.setFavouriteStops(getFavouriteStops(ctx));
+        return settingsDbo;
+    }
+
+    public static void setUserSettings(Context ctx, UsersSettingsDbo settingsDbo)
+    {
+        setFavouriteStops(ctx, settingsDbo.getFavouriteStops());
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/business/SchedulesBusiness.java

@@ -3,7 +3,7 @@ package com.rthoni.stssaguenay.business;
 import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
 import com.rthoni.stssaguenay.dataaccess.SchedulesDataAccess;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.SchedulesDbo;
 
 import org.joda.time.LocalDateTime;
@@ -16,7 +16,7 @@ import java.util.List;
 
 public class SchedulesBusiness {
 
-    public static LuPromise<List<SchedulesDbo>> getMultiple(LuDataAccessConfigDbo config, List<FavouriteStopDbo> favouriteStopDbos, LocalDateTime date, int count)
+    public static LuPromise<List<SchedulesDbo>> getMultiple(LuDataAccessConfigDbo config, List<UserFavouriteStopsDbo> favouriteStopDbos, LocalDateTime date, int count)
     {
         return SchedulesDataAccess.getMultiple(config, favouriteStopDbos, date, count);
     }

app/src/main/java/com/rthoni/stssaguenay/business/UsersSettingsBusiness.java

@@ -0,0 +1,49 @@
+package com.rthoni.stssaguenay.business;
+
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.luticate.utils.dbo.LuVoidDbo;
+import com.rthoni.stssaguenay.dataaccess.UsersSettingsDataAccess;
+import com.rthoni.stssaguenay.dbo.UsersSettingsDbo;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Created by robin on 10/3/16.
+ */
+
+public class UsersSettingsBusiness {
+
+    public static String encryptSettings(UsersSettingsDbo settingsDbo, String password)
+    {
+        return UsersSettingsDataAccess.encryptSettings(settingsDbo.toString(), password);
+    }
+
+    public static UsersSettingsDbo decryptSettings(String data, String password)
+    {
+        data = UsersSettingsDataAccess.decryptSettings(data, password);
+        if (data == null) {
+            return null;
+        }
+
+        UsersSettingsDbo settings = new UsersSettingsDbo();
+        try {
+            settings.fromJson(new JSONObject(data));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return settings;
+    }
+
+    public static LuPromise<String> get(LuDataAccessConfigDbo config, String id)
+    {
+        return UsersSettingsDataAccess.get(config, id);
+    }
+
+    public static LuPromise<LuVoidDbo> put(LuDataAccessConfigDbo config, String data, String id)
+    {
+        return UsersSettingsDataAccess.put(config, data, id);
+    }
+}

app/src/main/java/com/rthoni/stssaguenay/dataaccess/SchedulesDataAccess.java

@@ -3,7 +3,7 @@ package com.rthoni.stssaguenay.dataaccess;
 import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.business.LuRequest;
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.RoutesDbo;
 import com.rthoni.stssaguenay.dbo.SchedulesDbo;
 
@@ -21,14 +21,14 @@ import java.util.List;
 
 public class SchedulesDataAccess {
 
-    public static LuPromise<List<SchedulesDbo>> getMultiple(LuDataAccessConfigDbo config, List<FavouriteStopDbo> favouriteStopDbos, LocalDateTime date, int count)
+    public static LuPromise<List<SchedulesDbo>> getMultiple(LuDataAccessConfigDbo config, List<UserFavouriteStopsDbo> favouriteStopDbos, LocalDateTime date, int count)
     {
         HashMap<String, String> map = new HashMap<>();
         map.put("count", Integer.toString(count));
         map.put("date", JSONObject.quote(date.toString("y-M-d HH:mm:ss")));
 
         JSONArray stops = new JSONArray();
-        for (FavouriteStopDbo dbo : favouriteStopDbos) {
+        for (UserFavouriteStopsDbo dbo : favouriteStopDbos) {
             for (RoutesDbo routesDbo : dbo.getRoutes()) {
                 JSONObject obj = new JSONObject();
                 try {

app/src/main/java/com/rthoni/stssaguenay/dataaccess/UsersSettingsDataAccess.java

@@ -0,0 +1,63 @@
+package com.rthoni.stssaguenay.dataaccess;
+
+import com.luticate.utils.business.LuPromise;
+import com.luticate.utils.business.LuRequest;
+import com.luticate.utils.dbo.LuBoolDbo;
+import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.luticate.utils.dbo.LuStringDbo;
+import com.luticate.utils.dbo.LuVoidDbo;
+
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+import se.simbio.encryption.Encryption;
+
+/**
+ * Created by robin on 10/3/16.
+ */
+
+public class UsersSettingsDataAccess {
+
+    public static Encryption getEncryption(String password)
+    {
+        return Encryption.getLowIteration(password, "9oCpOJ", "mCX36TazPeC70LfN".getBytes());
+    }
+
+    public static String encryptSettings(String settings, String password)
+    {
+        return getEncryption(password).encryptOrNull(settings);
+    }
+
+    public static String decryptSettings(String data, String password)
+    {
+        return getEncryption(password).decryptOrNull(data);
+    }
+
+    public static LuPromise<String> get(LuDataAccessConfigDbo config, String id)
+    {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("id", JSONObject.quote(id));
+        return LuRequest.get(config, LuStringDbo.class, "users/settings", map)
+                .map(new LuPromise.LuConverter<LuStringDbo, String>() {
+                    @Override
+                    public String convert(LuStringDbo data) {
+                        return data.getString();
+                    }
+                });
+    }
+
+    public static LuPromise<LuVoidDbo> put(LuDataAccessConfigDbo config, String data, String id)
+    {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("id", JSONObject.quote(id));
+        map.put("settings", JSONObject.quote(data));
+        return LuRequest.post(config, LuBoolDbo.class, "users/settings", map)
+                .map(new LuPromise.LuConverter<LuBoolDbo, LuVoidDbo>() {
+                    @Override
+                    public LuVoidDbo convert(LuBoolDbo data) {
+                        return new LuVoidDbo();
+                    }
+                });
+    }
+}

app/src/main/java/com/rthoni/stssaguenay/dbo/FavouriteStopDbo.java → app/src/main/java/com/rthoni/stssaguenay/dbo/UserFavouriteStopsDbo.java

@@ -14,12 +14,14 @@ import java.util.Vector;
  * Created by robin on 10/1/16.
  */
 
-public class FavouriteStopDbo extends LuDbo {
+public class UserFavouriteStopsDbo extends LuDbo {
 
     protected StopsDbo _stop;
 
     protected List<RoutesDbo> _routes;
 
+    protected String _name;
+
     @Override
     public void fromJson(JSONObject json) throws JSONException {
         _stop = new StopsDbo();
@@ -31,6 +33,7 @@ public class FavouriteStopDbo extends LuDbo {
             route.fromJson(routes.getJSONObject(i));
             _routes.add(route);
         }
+        _name = json.getString("name");
     }
 
     @Override
@@ -42,6 +45,7 @@ public class FavouriteStopDbo extends LuDbo {
             routes.add(route.toArray());
         }
         map.put("routes", routes);
+        map.put("name", _name);
         return map;
     }
 
@@ -60,4 +64,20 @@ public class FavouriteStopDbo extends LuDbo {
     public void setRoutes(List<RoutesDbo> routes) {
         _routes = routes;
     }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        _name = name;
+    }
+
+    public String getCustomName()
+    {
+        if (_name != null && !_name.isEmpty()) {
+            return _name;
+        }
+        return _stop.getName();
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/dbo/UsersSettingsDbo.java

@@ -0,0 +1,49 @@
+package com.rthoni.stssaguenay.dbo;
+
+import com.luticate.utils.dbo.LuDbo;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by robin on 10/3/16.
+ */
+
+public class UsersSettingsDbo extends LuDbo {
+    protected List<UserFavouriteStopsDbo> _favouriteStops;
+
+    @Override
+    public void fromJson(JSONObject json) throws JSONException {
+        _favouriteStops = new Vector<>();
+        JSONArray stops = json.getJSONArray("favouriteStops");
+        for (int i = 0; i < stops.length(); ++i) {
+            UserFavouriteStopsDbo stop = new UserFavouriteStopsDbo();
+            stop.fromJson(stops.getJSONObject(i));
+            _favouriteStops.add(stop);
+        }
+    }
+
+    @Override
+    public HashMap<String, Object> toArray() {
+        HashMap<String, Object> map = new HashMap<>();
+        List<HashMap<String, Object>> stops = new Vector<>();
+        for (UserFavouriteStopsDbo stop : _favouriteStops) {
+            stops.add(stop.toArray());
+        }
+        map.put("favouriteStops", stops);
+        return map;
+    }
+
+    public List<UserFavouriteStopsDbo> getFavouriteStops() {
+        return _favouriteStops;
+    }
+
+    public void setFavouriteStops(List<UserFavouriteStopsDbo> favouriteStops) {
+        _favouriteStops = favouriteStops;
+    }
+}

app/src/main/java/com/rthoni/stssaguenay/ui/activities/MainActivity.java

@@ -1,16 +1,21 @@
 package com.rthoni.stssaguenay.ui.activities;
 
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.NavigationView;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -26,11 +31,15 @@ import com.facebook.login.widget.LoginButton;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdView;
 import com.google.android.gms.ads.MobileAds;
+import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.business.LuRequest;
+import com.luticate.utils.dbo.LuVoidDbo;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.STSBusiness;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.business.UsersSettingsBusiness;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.UserDbo;
+import com.rthoni.stssaguenay.dbo.UsersSettingsDbo;
 import com.rthoni.stssaguenay.ui.fragments.HomeFragment;
 
 import org.json.JSONException;
@@ -175,7 +184,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == ADD_FAVOURITE_STOP_REQUEST_CODE && resultCode == RESULT_OK) {
-            FavouriteStopDbo favouriteStopDbo = new FavouriteStopDbo();
+            UserFavouriteStopsDbo favouriteStopDbo = new UserFavouriteStopsDbo();
             try {
                 JSONObject obj = new JSONObject(data.getStringExtra(StopPickerActivity.STOP_EXTRA_NAME));
                 favouriteStopDbo.fromJson(obj);
@@ -183,7 +192,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 e.printStackTrace();
                 return;
             }
-            List<FavouriteStopDbo> favouriteStopDbos = STSBusiness.getFavouriteStops(this);
+            List<UserFavouriteStopsDbo> favouriteStopDbos = STSBusiness.getFavouriteStops(this);
             favouriteStopDbos.add(favouriteStopDbo);
             STSBusiness.setFavouriteStops(this, favouriteStopDbos);
             _goToHome = true;
@@ -196,12 +205,21 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.nav_logout) {
+        if (item.getItemId() == R.id.nav_restore) {
+            restoreSettings();
+        }
+        else if (item.getItemId() == R.id.nav_backup) {
+            backupSettings();
+        }
+        else if (item.getItemId() == R.id.nav_logout) {
             LoginManager.getInstance().logOut();
             STSBusiness.setLoggedUser(this, null);
             updateLoginState();
         }
-        return false;
+        else {
+            return false;
+        }
+        return true;
     }
 
     public void updateLoginState()
@@ -224,4 +242,108 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         STSBusiness.setLoggedUser(this, userDbo);
         updateLoginState();
     }
+
+    public LuPromise<String> askPassword(boolean encrypt)
+    {
+        final LuPromise<String> promise = new LuPromise<>();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.encryption_password);
+        builder.setMessage(encrypt ? R.string.encryption_password_encrypt : R.string.encryption_password_decrypt);
+
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        builder.setView(input);
+
+        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                promise.resolve(input.getText().toString());
+            }
+        });
+        builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+        });
+
+        builder.show();
+        return promise;
+    }
+
+    public void restoreSettings()
+    {
+        final ProgressDialog progressDialog = new ProgressDialog(MainActivity.this);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        progressDialog.setTitle(R.string.loading);
+        progressDialog.setMessage(getString(R.string.settings_restoring));
+
+        UserDbo user = STSBusiness.getLoggedUser(MainActivity.this);
+        UsersSettingsBusiness.get(STSBusiness.getConfig(), user.getId())
+                .then(new LuPromise.LuConsumer<String>() {
+                    @Override
+                    public void execute(final String data) {
+                        progressDialog.dismiss();
+                        if (data == null) {
+                            Toast.makeText(MainActivity.this, R.string.encryption_empty, Toast.LENGTH_LONG).show();
+                            return;
+                        }
+                        askPassword(false).then(new LuPromise.LuConsumer<String>() {
+                            @Override
+                            public void execute(String password) {
+                                UsersSettingsDbo settingsDbo = UsersSettingsBusiness.decryptSettings(data, password);
+                                if (settingsDbo == null) {
+                                    Toast.makeText(MainActivity.this, R.string.encryption_bad_password, Toast.LENGTH_LONG).show();
+                                }
+                                else {
+                                    Toast.makeText(MainActivity.this, R.string.settings_restored, Toast.LENGTH_LONG).show();
+                                    STSBusiness.setUserSettings(MainActivity.this, settingsDbo);
+                                    goToHome();
+                                }
+                            }
+                        });
+                    }
+                }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+                    @Override
+                    public void execute(LuPromise.LuPromiseError data) {
+                        progressDialog.dismiss();
+                        Toast.makeText(MainActivity.this, data.toString(), Toast.LENGTH_LONG).show();
+                    }
+                });
+    }
+
+    public void backupSettings()
+    {
+        askPassword(true).then(new LuPromise.LuConsumer<String>() {
+            @Override
+            public void execute(String password) {
+                UserDbo user = STSBusiness.getLoggedUser(MainActivity.this);
+                UsersSettingsDbo settingsDbo = STSBusiness.getUserSettings(MainActivity.this);
+                String data = UsersSettingsBusiness.encryptSettings(settingsDbo, password);
+                final ProgressDialog progressDialog = new ProgressDialog(MainActivity.this);
+                progressDialog.setIndeterminate(true);
+                progressDialog.setCancelable(false);
+                progressDialog.show();
+                progressDialog.setTitle(R.string.loading);
+                progressDialog.setMessage(getString(R.string.settings_backing_up));
+                UsersSettingsBusiness.put(STSBusiness.getConfig(), data, user.getId())
+                        .then(new LuPromise.LuConsumer<LuVoidDbo>() {
+                            @Override
+                            public void execute(LuVoidDbo data) {
+                                progressDialog.dismiss();
+                                Toast.makeText(MainActivity.this, R.string.settings_backed_up, Toast.LENGTH_LONG).show();
+                            }
+                        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
+                            @Override
+                            public void execute(LuPromise.LuPromiseError data) {
+                                progressDialog.dismiss();
+                                Toast.makeText(MainActivity.this, data.toString(), Toast.LENGTH_LONG).show();
+                            }
+                        });
+            }
+        });
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/activities/StopPickerActivity.java

@@ -10,14 +10,11 @@ import com.google.android.gms.ads.AdView;
 import com.google.android.gms.ads.MobileAds;
 import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
-import com.rthoni.stssaguenay.dbo.RoutesDbo;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.ui.fragments.StopPickerFragment;
 import com.rthoni.stssaguenay.ui.fragments.StopRoutesPickerFragment;
 
-import java.util.List;
-
 public class StopPickerActivity extends AppCompatActivity {
 
     public static String STOP_EXTRA_NAME = "STOP_EXTRA";
@@ -68,9 +65,9 @@ public class StopPickerActivity extends AppCompatActivity {
     {
         StopRoutesPickerFragment f = new StopRoutesPickerFragment();
         f.setStopsDbo(stopDbo);
-        f.setOnRoutesSelected(new LuPromise.LuConsumer<FavouriteStopDbo>() {
+        f.setOnRoutesSelected(new LuPromise.LuConsumer<UserFavouriteStopsDbo>() {
             @Override
-            public void execute(FavouriteStopDbo data) {
+            public void execute(UserFavouriteStopsDbo data) {
                 saveStop(data);
             }
         });
@@ -81,7 +78,7 @@ public class StopPickerActivity extends AppCompatActivity {
                 .commit();
     }
 
-    public void saveStop(FavouriteStopDbo favouriteStopDbo)
+    public void saveStop(UserFavouriteStopsDbo favouriteStopDbo)
     {
         Intent result = new Intent();
         result.putExtra(STOP_EXTRA_NAME, favouriteStopDbo.toString());

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/HomeFragment.java

@@ -18,19 +18,13 @@ import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.STSBusiness;
 import com.rthoni.stssaguenay.business.SchedulesBusiness;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.SchedulesDbo;
 
-import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
-import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 import java.util.Vector;
@@ -63,7 +57,7 @@ public class HomeFragment extends Fragment {
 
     public class FavouriteStopsAdapter extends RecyclerView.Adapter<ViewHolder> {
 
-        private List<FavouriteStopDbo> _favourites;
+        private List<UserFavouriteStopsDbo> _favourites;
 
         private List<SchedulesDbo> _schedules;
 
@@ -79,7 +73,7 @@ public class HomeFragment extends Fragment {
 
         @Override
         public void onBindViewHolder(ViewHolder holder, int position) {
-            final FavouriteStopDbo favouriteStopDbo = _favourites.get(position);
+            final UserFavouriteStopsDbo favouriteStopDbo = _favourites.get(position);
             holder._textView.setText(favouriteStopDbo.getStop().getFullName());
             holder._parentView.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -127,13 +121,13 @@ public class HomeFragment extends Fragment {
             return _favourites == null ? 0 : _favourites.size();
         }
 
-        public void setFavourites(List<FavouriteStopDbo> favourites) {
+        public void setFavourites(List<UserFavouriteStopsDbo> favourites) {
             _favourites = favourites;
             _schedules = null;
             notifyDataSetChanged();
         }
 
-        public List<FavouriteStopDbo> getFavourites() {
+        public List<UserFavouriteStopsDbo> getFavourites() {
             return _favourites;
         }
 
@@ -171,16 +165,16 @@ public class HomeFragment extends Fragment {
 
     public void loadFavourites()
     {
-        List<FavouriteStopDbo> favourites = STSBusiness.getFavouriteStops(getContext());
+        List<UserFavouriteStopsDbo> favourites = STSBusiness.getFavouriteStops(getContext());
         _adapter.setFavourites(favourites);
         loadSchedules();
     }
 
-    public void onFavouriteClicked(FavouriteStopDbo favouriteStopDbo)
+    public void onFavouriteClicked(UserFavouriteStopsDbo favouriteStopDbo)
     {
     }
 
-    public void onFavouriteLongClicked(final FavouriteStopDbo favouriteStopDbo)
+    public void onFavouriteLongClicked(final UserFavouriteStopsDbo favouriteStopDbo)
     {
         new AlertDialog.Builder(getContext())
                 .setIcon(android.R.drawable.ic_dialog_alert)
@@ -191,7 +185,7 @@ public class HomeFragment extends Fragment {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
-                        List<FavouriteStopDbo> favouriteStopDbos = _adapter.getFavourites();
+                        List<UserFavouriteStopsDbo> favouriteStopDbos = _adapter.getFavourites();
                         favouriteStopDbos.remove(favouriteStopDbo);
                         STSBusiness.setFavouriteStops(getContext(), favouriteStopDbos);
 

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopRoutesPickerFragment.java

@@ -20,7 +20,7 @@ import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.RoutesBusiness;
 import com.rthoni.stssaguenay.business.STSBusiness;
-import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.RoutesDbo;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
 
@@ -48,7 +48,7 @@ public class StopRoutesPickerFragment extends Fragment {
 
     private RoutesAdapter _routesAdapter;
 
-    private LuPromise.LuConsumer<FavouriteStopDbo> _onRoutesSelected;
+    private LuPromise.LuConsumer<UserFavouriteStopsDbo> _onRoutesSelected;
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public ImageView _imageView;
@@ -177,14 +177,14 @@ public class StopRoutesPickerFragment extends Fragment {
     public void save()
     {
         if (_onRoutesSelected != null) {
-            FavouriteStopDbo favourite = new FavouriteStopDbo();
+            UserFavouriteStopsDbo favourite = new UserFavouriteStopsDbo();
             favourite.setStop(_stopsDbo);
             favourite.setRoutes(_routesAdapter.getSelectRoutes());
             _onRoutesSelected.execute(favourite);
         }
     }
 
-    public void setOnRoutesSelected(LuPromise.LuConsumer<FavouriteStopDbo> onRoutesSelected) {
+    public void setOnRoutesSelected(LuPromise.LuConsumer<UserFavouriteStopsDbo> onRoutesSelected) {
         _onRoutesSelected = onRoutesSelected;
     }
 }

app/src/main/res/values/strings.xml

@@ -7,21 +7,39 @@
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
+
     <string name="app_name">STS Saguenay</string>
+
     <string name="title_activity_stop_picker">Pick a stop - STS Saguenay</string>
     <string name="favourites_stops">Favourites stops:</string>
     <string name="search_stop">Search a stop</string>
     <string name="pick_routes">Pick your routes for stop %1$s:</string>
     <string name="save">Save</string>
+    <string name="error_try_again">Error. Please try again.</string>
+
     <string name="loading">Loading&#8230;</string>
     <string name="loading_schedules">Loading schedules&#8230;</string>
     <string name="loading_routes">Loading schedules&#8230;</string>
     <string name="loading_stops">Loading stops&#8230;</string>
+
     <string name="favourite_remove">Remove favourite</string>
     <string name="favourite_remove_confirm">Do you really want to remove %1$s?</string>
     <string name="favourite_removed">%1$s has been removed</string>
+
     <string name="drawer_help_message">Log in to access more features</string>
+
     <string name="logout">Logout</string>
     <string name="restore">Restore settings</string>
     <string name="backup">Backup settings</string>
+
+    <string name="encryption_password">Encryption password</string>
+    <string name="encryption_password_encrypt">Please enter an encryption password (you do not need to enter the same as a previous backup):</string>
+    <string name="encryption_password_decrypt">Please enter the password your entered when you did the backup:</string>
+    <string name="encryption_bad_password">Bad encryption password</string>
+    <string name="encryption_empty">No data to restore</string>
+
+    <string name="settings_backed_up">Settings have been backed up</string>
+    <string name="settings_backing_up">Backing up settings&#8230;</string>
+    <string name="settings_restoring">Restoring settings&#8230;</string>
+    <string name="settings_restored">Settings have been restored</string>
 </resources>

build.gradle

@@ -21,6 +21,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://jitpack.io'
+        }
     }
 }
 

luticateutils/src/main/java/com/luticate/utils/business/LuRequest.java

@@ -42,7 +42,7 @@ public class LuRequest {
                     try {
                         JSONObject json = new JSONObject(response);
                         JSONObject obj = null;
-                        if (!json.isNull("data")) {
+                        if (json.has("data")) {
                             obj = json.optJSONObject("data");
                             if (obj == null) {
                                 obj = new JSONObject();

luticateutils/src/main/java/com/luticate/utils/dbo/LuStringDbo.java

@@ -0,0 +1,38 @@
+package com.luticate.utils.dbo;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+/**
+ * Created by robin on 11/27/15.
+ */
+public class LuStringDbo extends LuDbo {
+    public String getString() {
+        return _value;
+    }
+
+    public void setString(String value) {
+        _value = value;
+    }
+
+    private String _value;
+
+    @Override
+    public void fromJson(JSONObject json) throws JSONException {
+        if (json.isNull("value")) {
+            _value = null;
+        }
+        else {
+            _value = json.getString("value");
+        }
+    }
+
+    @Override
+    public HashMap<String, Object> toArray() {
+        HashMap<String, Object> array = new HashMap<>();
+        array.put("value", _value);
+        return array;
+    }
+}