reformat code

Author: dawei101

.idea/misc.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.vm.shadowsocks">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/shadowsocks"
@@ -17,16 +17,16 @@
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <service
             android:name="com.vm.shadowsocks.core.LocalVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
-                <action android:name="android.net.VpnService"/>
+                <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
     </application>

app/src/main/AndroidManifest.xml

@@ -10,41 +10,41 @@
 
 public class ChinaIpMaskManager {
 
-     static SparseIntArray ChinaIpMaskDict = new SparseIntArray(3000);
-     static SparseIntArray MaskDict = new SparseIntArray();
- 
-     public static boolean isIPInChina(int ip){
-    	 boolean found=false;
-    	 for (int i = 0; i < MaskDict.size(); i++) {
-			int mask=MaskDict.keyAt(i);
-			int networkIP = ip & mask;
-			int mask2 = ChinaIpMaskDict.get(networkIP);
-			if(mask2==mask){
-				found= true;
-				break;
-			}
-		 }
-    	 return found;
-     }
-
-     public static void loadFromFile(InputStream inputStream){
-    	 int count=0;
-         try {
-        	byte[] buffer=new byte[4096];
-			while((count = inputStream.read(buffer))>0){
-				 for (int i = 0; i < count; i+=8) {
-					 int ip = CommonMethods.readInt(buffer, i);
-			         int mask = CommonMethods.readInt(buffer, i+4);
-			         ChinaIpMaskDict.put(ip, mask);
-			         MaskDict.put(mask, mask);
-			         //System.out.printf("%s/%s\n", CommonMethods.IP2String(ip),CommonMethods.IP2String(mask));
-				 }
-			 }
-			inputStream.close();
-			System.out.printf("ChinaIpMask records count: %d\n", ChinaIpMaskDict.size());
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-     }
+    static SparseIntArray ChinaIpMaskDict = new SparseIntArray(3000);
+    static SparseIntArray MaskDict = new SparseIntArray();
+
+    public static boolean isIPInChina(int ip) {
+        boolean found = false;
+        for (int i = 0; i < MaskDict.size(); i++) {
+            int mask = MaskDict.keyAt(i);
+            int networkIP = ip & mask;
+            int mask2 = ChinaIpMaskDict.get(networkIP);
+            if (mask2 == mask) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    public static void loadFromFile(InputStream inputStream) {
+        int count = 0;
+        try {
+            byte[] buffer = new byte[4096];
+            while ((count = inputStream.read(buffer)) > 0) {
+                for (int i = 0; i < count; i += 8) {
+                    int ip = CommonMethods.readInt(buffer, i);
+                    int mask = CommonMethods.readInt(buffer, i + 4);
+                    ChinaIpMaskDict.put(ip, mask);
+                    MaskDict.put(mask, mask);
+                    //System.out.printf("%s/%s\n", CommonMethods.IP2String(ip),CommonMethods.IP2String(mask));
+                }
+            }
+            inputStream.close();
+            System.out.printf("ChinaIpMask records count: %d\n", ChinaIpMaskDict.size());
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
 }