extract method to load location and handle errors.HEADmaster

1 files changed, 16 insertions, 4 deletions

diff --git a/app/src/main/java/com/stronglifters/app/MainActivity.java b/app/src/main/java/com/stronglifters/app/MainActivity.java
index bd8e3ed..274fa34 100644
--- a/app/src/main/java/com/stronglifters/app/MainActivity.java
+++ b/app/src/main/java/com/stronglifters/app/MainActivity.java
@@ -22,9 +22,9 @@ public class MainActivity extends AppCompatActivity implements TurbolinksAdapter
     turbolinksView = (TurbolinksView) findViewById(R.id.turbolinks_view);
 
     // this for debug builds of your app (it is off by default)
-    // TurbolinksSession.getDefault(this).setDebugLoggingEnabled(true);
+    TurbolinksSession.getDefault(this).setDebugLoggingEnabled(true);
 
-    location = getIntent().getStringExtra(INTENT_URL) != null ? getIntent().getStringExtra(INTENT_URL) : BASE_URL;
+    location = loadLocation();
 
     TurbolinksSession.getDefault(this)
       .activity(this)
@@ -33,6 +33,11 @@ public class MainActivity extends AppCompatActivity implements TurbolinksAdapter
       .visit(location);
   }
 
+  private String loadLocation(){
+    String intent = getIntent().getStringExtra(INTENT_URL);
+    return intent == null ? BASE_URL : intent;
+  }
+
   @Override
   protected void onRestart() {
     super.onRestart();
@@ -68,7 +73,6 @@ public class MainActivity extends AppCompatActivity implements TurbolinksAdapter
   public void visitProposedToLocationWithAction(String location, String action) {
     Intent intent = new Intent(this, MainActivity.class);
     intent.putExtra(INTENT_URL, location);
-
     this.startActivity(intent);
   }
 
@@ -79,7 +83,15 @@ public class MainActivity extends AppCompatActivity implements TurbolinksAdapter
         .adapter(this)
         .restoreWithCachedSnapshot(false)
         .view(turbolinksView)
-        .visit(BASE_URL + "/error");
+        .visit(BASE_URL + "/404");
+    }
+    else {
+      TurbolinksSession.getDefault(this)
+        .activity(this)
+        .adapter(this)
+        .restoreWithCachedSnapshot(false)
+        .view(turbolinksView)
+        .visit(BASE_URL + "/500");
     }
   }
 }