fix bug where it will tell users that port authority server is actual…

…ly down and ready to push update
rectangle-dbmi · Aug 22, 2016 · 764bc45 · 764bc45
1 parent f453f7c
commit 764bc45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "rectangledbmi.com.pittsburghrealtimetracker"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 75
-        versionName "7.0.2"
+        versionCode 76
+        versionName "7.0.3"
     }
     lintOptions {
         warning 'InvalidPackage'

diff --git a/app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/BusMapFragment.java b/app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/BusMapFragment.java
@@ -564,8 +564,9 @@ public Observable<RouteSelection> call(RouteSelection routeSelection) {
                 }).map(VehicleResponse::getBustimeResponse)
                 .retryWhen(attempt -> attempt
                         .flatMap(throwable -> {
+                            Timber.d(throwable, "Catching error");
                     // theoretically, this should only resubscribe when internet is back
-                    if (throwable instanceof IOException){
+                    if (throwable instanceof IOException && !(throwable instanceof SocketTimeoutException)){
                         if (busListInteraction != null) {
                             busListInteraction.showToast(getString(R.string.disconnected_internet), Toast.LENGTH_SHORT);
                         }
@@ -606,7 +607,7 @@ public Observable<RouteSelection> call(RouteSelection routeSelection) {
                     // otherwise, just run normal onError
                     Timber.d("Not retrying since something should be wrong on " +
                             "Port Authority's end.");
-                    return null;
+                    return Observable.error(throwable);
                 }))
                 .share()
                 .subscribeOn(Schedulers.computation())

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -357,7 +357,7 @@
     <string name="pat_api_exceeded">Port Authority server unavailable. Please try again after midnight.</string>
     <string name="retrofit_network_error">Cannot connect to internet. Please check your data.</string>
     <string name="retrofit_conversion_error">Cannot translate information from Port Authority.</string>
-    <string name="retrofit_http_error">The Port Authority website seems to be down.</string>
+    <string name="retrofit_http_error">Port Authority server is down. Please try again later.</string>
     <string name="retrofit_unexpected_error">An unexpected error occurred. Please contact the
         developers.
     </string>