diff --git a/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
index 9ef37d320f6f5f7f2d8afc43866f198b81957b47..2985ca7ecd7409eb4d3cfde5c353a0dac6541fe9 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
@@ -36,13 +36,13 @@ public class HIstoryActivity extends AppCompatActivity {
 
 
         String fetchResults = null;
-//        try {
-//            githubSearchResults = NetworkUtils.getResponseFromHttpUrl(new URL(api.HISTORY_URL + "1"));
-            fetchResults = "[{\"id\":\"1\",\"id_user\":\"1\",\"sport_name\":\"jogging\",\"sport_date\":\"2018-02-14\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"11:00:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"2\",\"id_user\":\"1\",\"sport_name\":\"jogging\",\"sport_date\":\"2018-02-15\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"11:00:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"3\",\"id_user\":\"1\",\"sport_name\":\"plank\",\"sport_date\":\"2018-02-16\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"09:45:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"4\",\"id_user\":\"1\",\"sport_name\":\"push-up\",\"sport_date\":\"2018-02-16\",\"sport_time_start\":\"10:00:00\",\"sport_time_end\":\"10:30:00\",\"created_at\":null,\"updated_at\":null}]";
+        try {
+            fetchResults = NetworkUtils.getResponseFromHttpUrl(new URL(api.HISTORY_URL + "1"));
+//            fetchResults = "[{\"id\":\"1\",\"id_user\":\"1\",\"sport_name\":\"jogging\",\"sport_date\":\"2018-02-14\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"11:00:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"2\",\"id_user\":\"1\",\"sport_name\":\"jogging\",\"sport_date\":\"2018-02-15\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"11:00:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"3\",\"id_user\":\"1\",\"sport_name\":\"plank\",\"sport_date\":\"2018-02-16\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"09:45:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"4\",\"id_user\":\"1\",\"sport_name\":\"push-up\",\"sport_date\":\"2018-02-16\",\"sport_time_start\":\"10:00:00\",\"sport_time_end\":\"10:30:00\",\"created_at\":null,\"updated_at\":null}]";
             initializeData(fetchResults);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
         mRecyclerView = (RecyclerView) findViewById(R.id.rv_history);
 
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java b/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
index b02ca174a28c02c324771cd97f0bf1773b73fa6d..666572e23393dd79d1bd8d9dd4e845a1108a5573 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
@@ -5,7 +5,7 @@ package com.example.leo.fitnessdiy.routes;
  */
 
 public class api {
-    public static final String BASE_URL = "http://192.168.100.102/fitness_server/";
+    public static final String BASE_URL = "http://10.5.26.200/fitness-server/";
 
     public static final String HISTORY_URL = BASE_URL + "history.php?user=";
 }
diff --git a/gradle.properties b/gradle.properties
index 587d5bd674e12e88a7a0bda235f1603b6fc681a1..b30aa687d299822586e8f9908e7834d3dfe63a9c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,12 +12,12 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Mon Feb 19 17:06:30 GMT+07:00 2018
+#Mon Feb 19 17:31:00 GMT+07:00 2018
 systemProp.http.proxyPassword=02414056
-systemProp.https.proxyUser=leo16515325
-systemProp.https.proxyPort=8080
 systemProp.http.proxyHost=cache.itb.ac.id
-systemProp.https.proxyPassword=02414056
+systemProp.https.proxyPort=8080
+systemProp.https.proxyUser=leo16515325
 systemProp.https.proxyHost=cache.itb.ac.id
-systemProp.http.proxyPort=8080
+systemProp.https.proxyPassword=02414056
 systemProp.http.proxyUser=leo16515325
+systemProp.http.proxyPort=8080