Diff

issue127.diff

diff --git i/app/src/main/java/org/fossasia/openevent/activities/MainActivity.java w/app/src/main/java/org/fossasia/openevent/activities/MainActivity.java
index 1c80d92..9b01b7f 100644
--- i/app/src/main/java/org/fossasia/openevent/activities/MainActivity.java
+++ w/app/src/main/java/org/fossasia/openevent/activities/MainActivity.java
@@ -35,35 +35,30 @@ import org.fossasia.openevent.OpenEventApp;
 import org.fossasia.openevent.R;
 import org.fossasia.openevent.dbutils.DataDownload;
 import org.fossasia.openevent.dbutils.DbSingleton;
-import org.fossasia.openevent.events.CantDownloadEvent;
-import org.fossasia.openevent.events.CounterEvent;
-import org.fossasia.openevent.events.ErrorDialogEvent;
-import org.fossasia.openevent.events.EventDownloadEvent;
-import org.fossasia.openevent.events.MicrolocationDownloadEvent;
-import org.fossasia.openevent.events.NoInternetEvent;
-import org.fossasia.openevent.events.RefreshUiEvent;
-import org.fossasia.openevent.events.SessionDownloadEvent;
-import org.fossasia.openevent.events.SpeakerDownloadEvent;
-import org.fossasia.openevent.events.SponsorDownloadEvent;
-import org.fossasia.openevent.events.TracksDownloadEvent;
-import org.fossasia.openevent.fragments.BookmarksFragment;
-import org.fossasia.openevent.fragments.LocationsFragment;
-import org.fossasia.openevent.fragments.SpeakerFragment;
-import org.fossasia.openevent.fragments.SponsorsFragment;
-import org.fossasia.openevent.fragments.TracksFragment;
+import org.fossasia.openevent.events.*;
+import org.fossasia.openevent.fragments.*;
 
 public class MainActivity extends AppCompatActivity {
 
     private static final String COUNTER_TAG = "Donecounter";
+
+    private final static String STATE_FRAGMENT = "stateFragment";
+
     private DrawerLayout mDrawerLayout;
+
     private Toolbar mToolbar;
+
     private NavigationView navigationView;
+
     private ProgressBar downloadProgress;
+
     private FrameLayout mainFrame;
+
     private int counter;
+
     private int eventsDone;
+
     private int currentMenuItemId;
-    private final static String STATE_FRAGMENT = "stateFragment";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -81,7 +76,7 @@ public class MainActivity extends AppCompatActivity {
         DataDownload download = new DataDownload();
         ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
-        if(networkInfo!=null && networkInfo.isConnected()){
+        if (networkInfo != null && networkInfo.isConnected()) {
             download.downloadVersions();
         } else {
             WiFiDialog(MainActivity.this);
@@ -89,7 +84,7 @@ public class MainActivity extends AppCompatActivity {
 
         this.findViewById(android.R.id.content).setBackgroundColor(Color.LTGRAY);
 
-        if(savedInstanceState == null){
+        if (savedInstanceState == null) {
             currentMenuItemId = R.id.nav_tracks;
         } else {
             currentMenuItemId = savedInstanceState.getInt(STATE_FRAGMENT);
@@ -99,7 +94,7 @@ public class MainActivity extends AppCompatActivity {
 
     }
 
-    public void WiFiDialog(final Activity activity){
+    public void WiFiDialog(final Activity activity) {
         downloadProgress.setVisibility(View.GONE);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setTitle(getString(R.string.net_unavailable))
@@ -109,7 +104,6 @@ public class MainActivity extends AppCompatActivity {
                     public void onClick(DialogInterface dialog, int which) {
                         Intent setNetworkIntent = new Intent(Settings.ACTION_SETTINGS);
                         startActivity(setNetworkIntent);
-                        activity.finish();
                     }
                 })
                 .setNeutralButton(R.string.cancel, null)
@@ -232,7 +226,7 @@ public class MainActivity extends AppCompatActivity {
                 });
     }
 
-    private void doMenuAction(int menuItemId){
+    private void doMenuAction(int menuItemId) {
         FragmentManager fragmentManager = getSupportFragmentManager();
         switch (menuItemId) {
             case R.id.nav_tracks:
@@ -383,7 +377,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     @Subscribe
-    public void ErrorDialog(ErrorDialogEvent event){
+    public void ErrorDialog(ErrorDialogEvent event) {
         downloadProgress.setVisibility(View.GONE);
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.error)
diff --git i/app/src/main/java/org/fossasia/openevent/api/Urls.java w/app/src/main/java/org/fossasia/openevent/api/Urls.java
index dd7d6c6..020e10f 100644
--- i/app/src/main/java/org/fossasia/openevent/api/Urls.java
+++ w/app/src/main/java/org/fossasia/openevent/api/Urls.java
@@ -26,7 +26,7 @@ public abstract class Urls {
 
     public static final String BASE_GET_URL = BASE_URL + "/api/" + API_VERSION;
 
-    public static final String BASE_GET_URL_ALT = "https://raw.githubusercontent.com/fossasia/open-event/master/testapi";
+    public static final String BASE_GET_URL_ALT = "http://www.mocky.io/v2/5682128c120000993893a2c1";
 
 
 }
diff --git i/app/src/main/java/org/fossasia/openevent/events/ErrorDialogEvent.java w/app/src/main/java/org/fossasia/openevent/events/ErrorDialogEvent.java
index 835cb0d..8b400d8 100644
--- i/app/src/main/java/org/fossasia/openevent/events/ErrorDialogEvent.java
+++ w/app/src/main/java/org/fossasia/openevent/events/ErrorDialogEvent.java
@@ -2,9 +2,6 @@ package org.fossasia.openevent.events;
 
 import android.util.Log;
 
-import org.fossasia.openevent.OpenEventApp;
-import org.fossasia.openevent.api.APIClient;
-
 import retrofit.RetrofitError;
 
 /**
@@ -12,48 +9,46 @@ import retrofit.RetrofitError;
  */
 public class ErrorDialogEvent {
 
-    public String ErrorType;
-    public String ErrorDesc;
     public static final String TYPE = "RetrofitError Type";
+
     public static final String ERROR_CODE = "Error Code";
 
-    public ErrorDialogEvent(String s1, String s2){
+    static final String LOGTAG = ErrorDialogEvent.class.getSimpleName();
+
+    public String ErrorType;
+
+    public String ErrorDesc;
+
+    public ErrorDialogEvent(String s1, String s2) {
         this.ErrorType = s1;
         this.ErrorDesc = s2;
     }
 
-    public void ErrorHandlerFunction(RetrofitError cause, ErrorDialogEvent event){
-
-        if (cause.getKind().equals(RetrofitError.Kind.CONVERSION)) {
-            Log.d(TYPE, "ConversionError");
-            event.ErrorType="Conversion Error";
-            event.ErrorDesc=String.valueOf(cause.getCause());
-
-        } else if (cause.getKind().equals(RetrofitError.Kind.HTTP)) {
-
-            Log.d(TYPE, "HTTPError");
-            event.ErrorType="HTTP Error";
-            event.ErrorDesc=String.valueOf(cause.getResponse().getStatus());
-            Log.d(ERROR_CODE, String.valueOf(cause.getResponse().getStatus()));
-
-        } else if (cause.getKind().equals(RetrofitError.Kind.UNEXPECTED)) {
-
-            Log.d(TYPE, "UnexpectedError");
-            event.ErrorType="Unexpected Error";
-            event.ErrorDesc=String.valueOf(cause.getCause());
-
-        } else if (cause.getKind().equals(RetrofitError.Kind.NETWORK)) {
-
-            Log.d(TYPE, "NetworkError");
-            event.ErrorType="Network Error";
-            event.ErrorDesc=String.valueOf(cause.getCause());
-
-        } else {
-
-            Log.d(TYPE, "Other Error");
-            event.ErrorType="Other Error";
-            event.ErrorDesc=String.valueOf(cause.getCause());
-
+    public void ErrorHandlerFunction(RetrofitError cause, ErrorDialogEvent event) {
+
+        Log.e(LOGTAG, cause.toString());
+        switch (cause.getKind()) {
+            case NETWORK:
+                Log.d(TYPE, "NetworkError");
+                event.ErrorType = "Network Error";
+                event.ErrorDesc = String.valueOf(cause.getCause());
+
+                break;
+            case CONVERSION:
+                Log.d(TYPE, "ConversionError");
+                event.ErrorType = "Conversion Error";
+                event.ErrorDesc = String.valueOf(cause.getCause());
+                break;
+            case HTTP:
+                event.ErrorType = "HTTP Error";
+                event.ErrorDesc = String.valueOf(cause.getResponse().getStatus());
+                Log.d(ERROR_CODE, String.valueOf(cause.getResponse().getStatus()));
+                break;
+            case UNEXPECTED:
+                Log.d(TYPE, "UnexpectedError");
+                event.ErrorType = "Unexpected Error";
+                event.ErrorDesc = String.valueOf(cause.getCause());
+                break;
         }
     }
 }