Merge branch 'release/v3.6.10'

Sloy · Sloy · commit 27748d25872a · 2016-05-01T22:48:14.000+02:00
diff --git a/SeviBus/build.gradle b/SeviBus/build.gradle
@@ -25,8 +25,8 @@ apply plugin: 'com.fernandocejas.frodo'
 apply plugin: 'com.github.triplet.play'
 
 
-def myVersionCode = 82
-def myVersionName = "3.6.9"
+def myVersionCode = 85
+def myVersionName = "3.6.10"
 
 android {
     signingConfigs {
@@ -82,6 +82,7 @@ dependencies {
     compile 'com.google.android.gms:play-services-maps:8.1.0'
     compile 'com.google.android.gms:play-services-gcm:8.1.0'
 
+    compile 'com.sloydev:gallego:1.0.0'
     compile 'io.reactivex:rxjava:1.0.16'
     compile 'io.reactivex:rxjava-math:1.0.0'
     compile 'io.reactivex:rxandroid:1.0.1'
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/resources/Debug.java b/SeviBus/src/main/java/com/sloy/sevibus/resources/Debug.java
@@ -47,7 +47,6 @@ public static void setUseFakeLocationProvider(Context context, GoogleMap map) {
 
     public static void registerHandledException(Throwable e) {
         StuffProvider.getCrashReportingTool().regiterHandledException(e);
-        Log.e("Debug", "Handled Exception", e);
     }
 
     public static class FakeLocationSource implements LocationSource{
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/resources/LocationProvider.java b/SeviBus/src/main/java/com/sloy/sevibus/resources/LocationProvider.java
@@ -3,7 +3,7 @@
 
 import android.location.Location;
 
-import com.google.common.base.Optional;
+import com.sloydev.gallego.Optional;
 
 import rx.Observable;
 import rx.subjects.BehaviorSubject;
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/resources/actions/ObtainSingleFavoritaAction.java b/SeviBus/src/main/java/com/sloy/sevibus/resources/actions/ObtainSingleFavoritaAction.java
@@ -1,6 +1,6 @@
 package com.sloy.sevibus.resources.actions;
 
-import com.google.common.base.Optional;
+import com.sloydev.gallego.Optional;
 import com.sloy.sevibus.model.tussam.Favorita;
 import com.sloy.sevibus.resources.datasource.FavoritaDataSource;
 
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/FavoritasListFragment.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/FavoritasListFragment.java
@@ -76,7 +76,13 @@ public void onStart() {
 
     private void recargaListaFavoritas() {
         obtainFavoritasAction.getFavoritas()
-          .subscribe(this::showFavoritasInList);
+          .subscribe(this::showFavoritasInList,
+            throwable -> {
+                Debug.registerHandledException(throwable);
+                if (isAdded()) {
+                    Snackbar.make(getView(), R.string.error_message_generic, Snackbar.LENGTH_SHORT).show();
+                }
+            });
     }
 
     private void showFavoritasInList(List<Favorita> favoritas) {
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/MapContainerFragment.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/MapContainerFragment.java
@@ -2,6 +2,7 @@
 
 import android.location.Location;
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -14,7 +15,6 @@
 import com.google.android.gms.maps.UiSettings;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
-import com.google.common.base.Optional;
 import com.sloy.sevibus.R;
 import com.sloy.sevibus.resources.Debug;
 import com.sloy.sevibus.resources.LocationProvider;
@@ -70,7 +70,13 @@ public void onStart() {
             showMapControls(mShowInterface);
             asociarOpciones(true);
             locationSubscription = locationProvider.observeAvailable()
-              .subscribe(this::onLocationUpdated);
+              .subscribe(this::onLocationUpdated,
+                throwable -> {
+                    Debug.registerHandledException(throwable);
+                    if (isAdded()) {
+                        Snackbar.make(getView(), R.string.error_message_generic, Snackbar.LENGTH_SHORT).show();
+                    }
+                });
         }
     }
 
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/MapaControllerFragment.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/MapaControllerFragment.java
@@ -12,6 +12,7 @@
 import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.Loader;
@@ -220,7 +221,13 @@ public void onStart() {
             comienzaSeguimientoBuses();
         }
         locationSubscription = locationProvider.observeAvailable()
-          .subscribe(this::onLocationUpdated);
+          .subscribe(this::onLocationUpdated,
+            throwable -> {
+                Debug.registerHandledException(throwable);
+                if (isAdded()) {
+                    Snackbar.make(getView(), R.string.error_message_generic, Snackbar.LENGTH_SHORT).show();
+                }
+            });
     }
 
 
@@ -416,6 +423,11 @@ public void setMostrarFavoritas(boolean mostrar) {
                   }
                   mFavoritasLayer = new FavoritasLayer(paradas, getActivity(), getDBHelper());
                   mLayerManager.addLayer(mFavoritasLayer);
+              }, error -> {
+                  Debug.registerHandledException(error);
+                  if (isAdded()) {
+                      Snackbar.make(getView(), R.string.error_message_generic, Snackbar.LENGTH_SHORT).show();
+                  }
               });
         } else {
             if (mFavoritasLayer != null) {
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/ParadaInfoFragment.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/fragments/ParadaInfoFragment.java
@@ -331,15 +331,21 @@ private void updateFavoritaButton() {
         obtainSingleFavoritaAction
           .obtainFavorita(mParada.getNumero())
           .subscribe(favorita -> {
-              if (favorita.isPresent()) {
-                  colorizeScreenFromFavorita(favorita.get());
-                  favoritaButton.setImageResource(R.drawable.ic_fab_star_outline);
-                  favoritaButton.setOnClickListener(v -> onEliminarFavoritaClick());
-              } else {
-                  favoritaButton.setImageResource(R.drawable.ic_fab_star);
-                  favoritaButton.setOnClickListener(v -> onCrearFavoritaClick());
-              }
-          });
+                if (favorita.isPresent()) {
+                    colorizeScreenFromFavorita(favorita.get());
+                    favoritaButton.setImageResource(R.drawable.ic_fab_star_outline);
+                    favoritaButton.setOnClickListener(v -> onEliminarFavoritaClick());
+                } else {
+                    favoritaButton.setImageResource(R.drawable.ic_fab_star);
+                    favoritaButton.setOnClickListener(v -> onCrearFavoritaClick());
+                }
+            },
+            throwable -> {
+                Debug.registerHandledException(throwable);
+                if (isAdded()) {
+                    Snackbar.make(getView(), R.string.error_message_generic, Snackbar.LENGTH_SHORT).show();
+                }
+            });
     }
 
     private void colorizeScreenFromFavorita(Favorita fav) {
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/mvp/presenter/FavoritasMainPresenter.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/mvp/presenter/FavoritasMainPresenter.java
@@ -42,6 +42,8 @@ private void loadFavoritas() {
                   view.hideEmpty();
                   view.showFavoritas(favoritas);
               }
+          }, error -> {
+              view.showError();
           });
     }
 
@@ -58,6 +60,8 @@ public interface View {
         void showFavoritas(List<Favorita> favoritas);
 
         void hideFavoritas();
+
+        void showError();
     }
 
 }
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/mvp/presenter/LineasCercanasPresenter.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/mvp/presenter/LineasCercanasPresenter.java
@@ -61,6 +61,9 @@ private void obtainLineasCercanas(Location location) {
                   view.hideLineas();
                   view.showEmpty();
               }
+          }, throwable -> {
+              view.hideLoading();
+              view.showError();
           });
     }
 
diff --git a/SeviBus/src/main/java/com/sloy/sevibus/ui/mvp/view/FavoritasMainViewContainer.java b/SeviBus/src/main/java/com/sloy/sevibus/ui/mvp/view/FavoritasMainViewContainer.java
@@ -1,6 +1,7 @@
 package com.sloy.sevibus.ui.mvp.view;
 
 import android.app.Activity;
+import android.support.design.widget.Snackbar;
 import android.view.View;
 import android.widget.TextView;
 
@@ -103,8 +104,13 @@ public void hideFavoritas() {
         contenido.setVisibility(View.GONE);
     }
 
+    @Override
+    public void showError() {
+        Snackbar.make(activity.findViewById(android.R.id.content), R.string.favoritas_main_error, Snackbar.LENGTH_LONG).show();
+    }
+
     private void bindViewFavorita(Favorita fav, View v) {
-        if (fav != null) {
+        if (fav != null && fav.getParadaAsociada() != null) {
             Integer numero = fav.getParadaAsociada().getNumero();
             TextView text = (TextView) v.findViewById(R.id.favoritas_main_numero);
             View color = v.findViewById(R.id.favoritas_main_color);
diff --git a/SeviBus/src/main/res/values/strings.xml b/SeviBus/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="paradas_cercanas_cargando">Buscando paradas cercanas a tu posición...</string>
     <string name="lineas_cercanas_cargando">Buscando líneas cercanas a tu posición...</string>
     <string name="lineas_cercanas_empty">No encontramos líneas cercanas a tu posición. ¿Estás fuera de Sevilla?</string>
+    <string name="favoritas_main_error">Ocurrió un error cargando las favoritas :(</string>
     <string name="favoritas_main_empty">Guarda tus paradas favoritas y aparecerán aquí</string>
     <string name="favoritas_main_cargando">Cargando paradas favoritas...</string>
     <string name="search_hint">Nº o nombre</string>
@@ -38,4 +39,5 @@
     \n\nLa posición es aproximada y no se da en tiempo real. Puede no siempre estar disponible para todos los autobuses.
     \n\nLa aplicación no tiene influencia sobre los resultados.</string>
     <string name="nuevo_bonobus_info">Tipos de tajeta soportados actualmente:\n- Bonobús saldo sin transbordo\n- Bonobús saldo con transbordo\n- Tarjeta joven\n- Tarjeta 30 días</string>
+    <string name="error_message_generic">Oops, ocurrió un error :/</string>
 </resources>
diff --git a/SeviBus/src/test/java/com/sloy/sevibus/ui/mvp/presenter/FavoritasMainPresenterTest.java b/SeviBus/src/test/java/com/sloy/sevibus/ui/mvp/presenter/FavoritasMainPresenterTest.java
@@ -87,6 +87,14 @@ public void shows_favoritas_when_received_some_favoritas() throws Exception {
         verify(view).showFavoritas(favoritas);
     }
 
+    @Test
+    public void shows_error_when_received_an_error() throws Exception {
+        when(obtainFavoritasAction.getFavoritas()).thenReturn(Observable.error(new Exception()));
+
+        presenter.initialize(view);
+
+        verify(view).showError();
+    }
 
     private List<Favorita> favoritasListOf(int count) {
         List<Favorita> res = new ArrayList<>();
diff --git a/SeviBus/src/test/java/com/sloy/sevibus/ui/mvp/presenter/LineasCercanasPresenterTest.java b/SeviBus/src/test/java/com/sloy/sevibus/ui/mvp/presenter/LineasCercanasPresenterTest.java
@@ -2,7 +2,7 @@
 
 import android.location.Location;
 
-import com.google.common.base.Optional;
+import com.sloydev.gallego.Optional;
 import com.sloy.sevibus.model.tussam.Linea;
 import com.sloy.sevibus.resources.LocationProvider;
 import com.sloy.sevibus.resources.actions.ObtainLineasCercanasAction;
@@ -18,12 +18,15 @@
 import static org.mockito.Matchers.anyListOf;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static rx.Observable.empty;
+import static rx.Observable.error;
 
 public class LineasCercanasPresenterTest {
 
     @Mock
     LineasCercanasPresenter.View view;
-    @Mock LocationProvider locationProvider;
+    @Mock
+    LocationProvider locationProvider;
     @Mock
     ObtainLineasCercanasAction obtainLineasCercanasAction;
 
@@ -58,7 +61,7 @@ public void shows_lineas_when_updated_with_cercanas_available() throws Exception
     @Test
     public void shows_empty_when_updated_with_no_cercanas() throws Exception {
         when(locationProvider.observe()).thenReturn(aLocation());
-        when(obtainLineasCercanasAction.obtainLineas(any(Location.class))).thenReturn(Observable.empty());
+        when(obtainLineasCercanasAction.obtainLineas(any(Location.class))).thenReturn(empty());
 
         presenter.initialize(view);
         presenter.update();
@@ -72,15 +75,39 @@ public void shows_empty_when_updated_with_no_cercanas() throws Exception {
     @Test
     public void shows_error_when_updated_and_location_is_abstent() throws Exception {
         when(locationProvider.observe()).thenReturn(Observable.just(Optional.absent()));
-        when(obtainLineasCercanasAction.obtainLineas(any(Location.class))).thenReturn(Observable.empty());
+        when(obtainLineasCercanasAction.obtainLineas(any(Location.class))).thenReturn(empty());
 
         presenter.initialize(view);
         presenter.update();
 
+        verify(view).hideLoading();
         verify(view).showError();
+    }
+
+    @Test
+    public void shows_error_when_location_fails() throws Exception {
+        when(locationProvider.observe()).thenReturn(error(new Exception()));
+
+        presenter.initialize(view);
+        presenter.update();
+
         verify(view).hideLoading();
+        verify(view).showError();
     }
 
+    @Test
+    public void shows_error_when_obtain_lineas_fails() throws Exception {
+        when(locationProvider.observe()).thenReturn(aLocation());
+        when(obtainLineasCercanasAction.obtainLineas(any(Location.class))).thenReturn(error(new Exception()));
+
+        presenter.initialize(view);
+        presenter.update();
+
+        verify(view).hideLoading();
+        verify(view).showError();
+    }
+
+
     private Linea lineaCercana() {
         return new Linea();
     }
diff --git a/SeviBus/src/test/java/com/sloy/sevibus/ui/mvp/presenter/ParadasCercanasMainPresenterTest.java b/SeviBus/src/test/java/com/sloy/sevibus/ui/mvp/presenter/ParadasCercanasMainPresenterTest.java
@@ -2,7 +2,7 @@
 
 import android.location.Location;
 
-import com.google.common.base.Optional;
+import com.sloydev.gallego.Optional;
 import com.sloy.sevibus.model.ParadaCercana;
 import com.sloy.sevibus.model.tussam.Parada;
 import com.sloy.sevibus.resources.LocationProvider;
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.0.0'
@@ -11,6 +11,6 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ public static void setUseFakeLocationProvider(Context context, GoogleMap map) {`
`47`	`47`
`48`	`48`	`public static void registerHandledException(Throwable e) {`
`49`	`49`	`StuffProvider.getCrashReportingTool().regiterHandledException(e);`
`50`		`- Log.e("Debug", "Handled Exception", e);`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`public static class FakeLocationSource implements LocationSource{`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ private void loadFavoritas() {`
`42`	`42`	`view.hideEmpty();`
`43`	`43`	`view.showFavoritas(favoritas);`
`44`	`44`	`}`
	`45`	`+ }, error -> {`
	`46`	`+ view.showError();`
`45`	`47`	`});`
`46`	`48`	`}`
`47`	`49`
`@@ -58,6 +60,8 @@ public interface View {`
`58`	`60`	`void showFavoritas(List<Favorita> favoritas);`
`59`	`61`
`60`	`62`	`void hideFavoritas();`
	`63`	`+`
	`64`	`+ void showError();`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ private void obtainLineasCercanas(Location location) {`
`61`	`61`	`view.hideLineas();`
`62`	`62`	`view.showEmpty();`
`63`	`63`	`}`
	`64`	`+ }, throwable -> {`
	`65`	`+ view.hideLoading();`
	`66`	`+ view.showError();`
`64`	`67`	`});`
`65`	`68`	`}`
`66`	`69`