save status

Author: KagayamaKaede

app/build.gradle

@@ -10,15 +10,15 @@ android {
         applicationId "com.proxy.shadowsocksr"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 4
-        versionName "1.0.3 Beta"
+        versionCode 5
+        versionName "1.0.4 Beta"
     }
     buildTypes {
         debug {
             ndk {
                 moduleName "Jni"
                 stl "stlport_static"
-                abiFilters "armeabi-v7a", "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86_64"
             }
             minifyEnabled true
             shrinkResources true

app/src/main/assets/x86_64/pdnsd

@@ -1,6 +1,9 @@
 package com.proxy.shadowsocksr;
 
 import android.app.Application;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.widget.Toast;
 
 import com.orhanobut.hawk.Hawk;
 import com.orhanobut.hawk.HawkBuilder;
@@ -26,6 +29,18 @@ public void init()
                         HawkBuilder.EncryptionMethod.NO_ENCRYPTION)//TODO: VER.2.0 local profile encrypt.
                 .build();
 
+        //
+        int curVewsionCode = -1;
+        try
+        {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            curVewsionCode = pi.versionCode;
+        }
+        catch (PackageManager.NameNotFoundException ignored)
+        {
+        }
+        //
+
         boolean isFirstUse = Hawk.get("FirstUse", true);
 
         if (isFirstUse)
@@ -38,7 +53,7 @@ public void init()
                     "", false,
                     Consts.defaultTcpProtocol,
                     Consts.defaultObfsMethod,
-                    false,false);
+                    false, false);
             Hawk.put("Sample", dftSSRProfile);
 
             ArrayList<String> svrLst = new ArrayList<>();
@@ -53,6 +68,29 @@ public void init()
             Hawk.put("GlobalProfile", global);
 
             Hawk.put("FirstUse", false);
+            Hawk.put("VersionCode", curVewsionCode);
+        }
+        else
+        {
+            int old = Hawk.get("VersionCode", -1);
+            upgradeProfile(old, curVewsionCode);
+        }
+    }
+
+    private void upgradeProfile(int old, int nevv)
+    {
+        if (old == -1 || nevv == -1)
+        {
+            //clean all and re init
+        }
+        else if (old > nevv)
+        {
+            Toast.makeText(SSRApplication.this, "Downgrade is not allowed!", Toast.LENGTH_SHORT)
+                 .show();
+        }
+        else if (nevv > old)
+        {
+            //upgrade
         }
     }
 }

app/src/main/assets/x86_64/redsocks

@@ -122,6 +122,7 @@ class SSRService extends ISSRService.Stub
             {
                 proxyApps = cp.proxyApps;
             }
+            //
             checkDaemonFile();
             startRunner();
         }
@@ -190,6 +191,13 @@ private void startRunner()
         vpnThread = new SSRVPNThread();
         vpnThread.start();
         //
+        //        Executors.newSingleThreadExecutor().submit(new Runnable()
+        //        {
+        //            @Override public void run()
+        //            {
+        //
+        //            }
+        //        });
         new Thread(new Runnable()
         {
             @Override public void run()
@@ -270,7 +278,6 @@ private void stopRunner()
             vpnThread.stopThread();
             vpnThread = null;
         }
-
         //reset
         killProcesses();
 
@@ -301,15 +308,12 @@ private void startSSRDaemon()
                                        ssrProfile.remotePort,
                                        ssrProfile.localPort,
                                        ssrProfile.passwd,
-                                       ssrProfile.cryptMethod,
-                                       10);
+                                       ssrProfile.cryptMethod, 10);
         ConfFileUtil.writeToFile(ssrconf, new File(Consts.baseDir + "ss-local-vpn.conf"));
 
         StringBuilder sb = new StringBuilder();
-        sb.append(
-                Consts.baseDir + "ss-local -V -u -b 127.0.0.1 -t 600 -c " + Consts.baseDir +
-                "ss-local-vpn.conf -f " + Consts.baseDir +
-                "ss-local-vpn.pid");
+        sb.append(Consts.baseDir + "ss-local -V -u -b 127.0.0.1 -t 600 -c " + Consts.baseDir +
+                  "ss-local-vpn.conf -f " + Consts.baseDir + "ss-local-vpn.pid");
 
         //AUTH
 
@@ -530,13 +534,14 @@ class SSRVPNThread extends Thread
         {
             try
             {
-                LocalSocket ls = new LocalSocket();
-                ls.bind(new LocalSocketAddress(Consts.baseDir + "protect_path",
-                                               LocalSocketAddress.Namespace.FILESYSTEM));
-                lss = new LocalServerSocket(ls.getFileDescriptor());
+                LocalSocket stk = new LocalSocket();
+                stk.bind(new LocalSocketAddress(Consts.baseDir + "protect_path",
+                                                LocalSocketAddress.Namespace.FILESYSTEM));
+                lss = new LocalServerSocket(stk.getFileDescriptor());
             }
             catch (IOException e)
             {
+                Log.e("EXCE-BIND ERR", e.getMessage());
                 return;
             }
 
@@ -547,6 +552,7 @@ class SSRVPNThread extends Thread
                 try
                 {
                     final LocalSocket ls = lss.accept();
+
                     exec.execute(new Runnable()
                     {
                         @SuppressWarnings("ResultOfMethodCallIgnored") @Override public void run()
@@ -560,10 +566,10 @@ class SSRVPNThread extends Thread
 
                                 FileDescriptor[] fds = ls.getAncillaryFileDescriptors();
 
-                                if (fds.length > 0)
+                                if (fds!=null && fds.length > 0)
                                 {
-                                    Method getInt = FileDescriptor.class
-                                            .getDeclaredMethod("getInt$");
+                                    Method getInt = FileDescriptor.class.getDeclaredMethod(
+                                            "getInt$");
                                     Integer fd = (Integer) getInt.invoke(fds[0]);
                                     boolean ret = protect(fd);
 
@@ -573,20 +579,25 @@ class SSRVPNThread extends Thread
 
                                     is.close();
                                     os.close();
-                                    ls.close();
                                 }
                             }
                             catch (Exception e)
                             {
-                                Log.e("EXCE", e.getMessage());
-                                e.printStackTrace();
+                                Log.e("EXCE-internal", e.getMessage());
+                            }
+                            try
+                            {
+                                ls.close();
+                            }
+                            catch (IOException ignored)
+                            {
                             }
                         }
                     });
                 }
                 catch (Exception e)
                 {
-                    Log.e("EXCE","OUT");
+                    Log.e("EXCE-accept", e.getMessage());
                     return;
                 }
             }
@@ -607,7 +618,7 @@ private void closeServerSocket()
             }
         }
 
-        private void stopThread()
+        public void stopThread()
         {
             isRunning = false;
             closeServerSocket();