fix screen leave event bug

Author: MetinArslanturk

library/build.gradle

@@ -39,7 +39,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.metricalp'
                 artifactId = 'android'
-                version = '1.4'
+                version = '1.5'
             }
         }
     }

library/src/main/java/com/metricalp/android/Metricalp.java

@@ -152,26 +152,28 @@ public static boolean screenViewEvent(String path, HashMap<String, String> event
         Metricalp instance = Metricalp.getInstance();
         String prevScreen = instance.getCurrentScreen();
 
-        if (path != null) {
-            attrs.put("path", path);
+        if(path == null) {
+            path = "(not-set)";
         }
 
+        attrs.put("path", path);
+
         HashMap<String, String> screenLeaveAttrs = new HashMap<>();
 
         if (prevScreen != null) {
             screenLeaveAttrs.put("leave_from_path", prevScreen);
             screenLeaveAttrs.put("leave_from_duration", String.valueOf(new Date().getTime() - instance.getScreenDurationStartPoint()));
         }
 
-        instance.setCurrentScreen(null);
-        instance.setScreenDurationStartPoint(new Date().getTime());
-
         attrs.putAll(screenLeaveAttrs);
 
         if (eventAttributes != null) {
             attrs.putAll(eventAttributes);
         }
 
+        instance.setCurrentScreen(attrs.get("path"));
+        instance.setScreenDurationStartPoint(new Date().getTime());
+
         return Metricalp.sendEvent(
                 "screen_view",
                 attrs,
@@ -243,7 +245,9 @@ public void asynchronousPostRequest(String url, String requestBody) {
             public void onFailure(Call call, IOException e) {}
 
             @Override
-            public void onResponse(Call call, Response response) {}
+            public void onResponse(Call call, Response response) {
+                response.close();
+            }
         });
     }
 }