Clean code

thunder/src/main/java/com/xunlei/downloadlib/XLDownloadManager.java

@@ -40,7 +40,7 @@ public class XLDownloadManager {
     }
 
     public void init() {
-        InitParam param = new InitParam(context.getFilesDir().getAbsolutePath());
+        InitParam param = new InitParam(context.getFilesDir().getPath());
         loader.init(param.getSoKey(), "com.android.providers.downloads", param.mAppVersion, "", getPeerId(), getGuid(), param.mStatSavePath, param.mStatCfgSavePath, XLUtil.getNetworkType(context), param.mPermissionLevel, param.mQueryConfOnInit);
         getDownloadLibVersion(new GetDownloadLibVersion());
         setOSVersion(Build.VERSION.INCREMENTAL + "_alpha");
@@ -86,7 +86,7 @@ public class XLDownloadManager {
     }
 
     private String getGuid() {
-        return XLUtil.getGuid().mGuid;
+        return XLUtil.getGuid();
     }
 
     public void releaseTask(long taskId) {

thunder/src/main/java/com/xunlei/downloadlib/android/XLUtil.java

@@ -34,12 +34,8 @@ public class XLUtil {
         return sb.toString();
     }
 
-    public static GuidInfo getGuid() {
-        GuidInfo guidInfo = new GuidInfo();
-        GuidType guidType = GuidType.DEFAULT;
-        guidInfo.mGuid = getIMEI() + "_" + getMAC();
-        guidInfo.mType = guidType;
-        return guidInfo;
+    public static String getGuid() {
+        return getIMEI() + "_" + getMAC();
     }
 
     public static String getBSSID(Context context) {
@@ -119,19 +115,7 @@ public class XLUtil {
         }
     }
 
-    public enum GuidType {
-        DEFAULT,
-    }
-
     public enum NetWorkCarrier {
-        UNKNOWN,
-        CMCC,
-        CU,
-        CT
-    }
-
-    public static class GuidInfo {
-        public String mGuid = null;
-        public GuidType mType = GuidType.DEFAULT;
+        UNKNOWN, CMCC, CU, CT
     }
 }