Fix locks threads

prey · Sep 25, 2015 · b2bc908 · b2bc908
1 parent 3312cf4
commit b2bc908
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 653 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.prey"
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 110
-        versionName '1.4.4'
+        versionCode 111
+        versionName '1.4.5'
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -100,19 +100,6 @@
         </activity>
 
 
-        <activity
-            android:name="com.prey.activities.WebViewInitActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:noHistory="true"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name="com.prey.activities.WebViewReadyActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:noHistory="true"
-            android:screenOrientation="portrait" />
-
-
         <activity
             android:name=".activities.InitActivity"
             android:configChanges="keyboardHidden|orientation"

diff --git a/app/src/main/java/com/prey/activities/PasswordActivity.java b/app/src/main/java/com/prey/activities/PasswordActivity.java
@@ -11,6 +11,7 @@
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.text.method.PasswordTransformationMethod;
 import android.view.View;
 import android.widget.Button;
@@ -43,7 +44,10 @@ public void onClick(View v) {
                     if (passwordtyped.length() < 6 || passwordtyped.length() > 32) {
                         Toast.makeText(ctx, ctx.getString(R.string.error_password_out_of_range, 6, 32), Toast.LENGTH_LONG).show();
                     } else {
-                        new CheckPassword().execute(passwordtyped);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+                            new CheckPassword().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,passwordtyped);
+                        else
+                            new CheckPassword().execute(passwordtyped);
                     }
                 }
 

diff --git a/app/src/main/java/com/prey/activities/PermissionInformationActivity.java b/app/src/main/java/com/prey/activities/PermissionInformationActivity.java
@@ -13,21 +13,15 @@
 import com.prey.R;
 
 import android.graphics.Typeface;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.TextView;
 
 import com.prey.PreyLogger;
-import com.prey.activities.javascript.WebAppInterface;
 import com.prey.backwardcompatibility.FroyoSupport;
 
-import java.util.Locale;
-
 public class PermissionInformationActivity extends PreyActivity {
 
     private static final int SECURITY_PRIVILEGES = 10;

diff --git a/app/src/main/java/com/prey/activities/SignInActivity.java b/app/src/main/java/com/prey/activities/SignInActivity.java
@@ -17,6 +17,7 @@
 import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -156,7 +157,10 @@ public void onClick(View v) {
                         if (password.length() < 6 || password.length() > 32) {
                             Toast.makeText(ctx, ctx.getString(R.string.error_password_out_of_range, 6, 32), Toast.LENGTH_LONG).show();
                         } else {
-                            new AddDeviceToAccount().execute(email, password, PreyUtils.getDeviceType(ctx));
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+                                new AddDeviceToAccount().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, email, password, PreyUtils.getDeviceType(ctx));
+                            else
+                                new AddDeviceToAccount().execute(email, password, PreyUtils.getDeviceType(ctx));
                         }
                     }
                 }

diff --git a/app/src/main/java/com/prey/activities/SignUpActivity.java b/app/src/main/java/com/prey/activities/SignUpActivity.java
@@ -17,6 +17,7 @@
 import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -145,7 +146,10 @@ public void onClick(View v) {
                         if (password.length() < 6 || password.length() > 32) {
                             Toast.makeText(ctx, ctx.getString(R.string.error_password_out_of_range, 6, 32), Toast.LENGTH_LONG).show();
                         } else {
-                            new CreateAccount().execute(name, email, password);
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+                                new CreateAccount().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, name, email, password);
+                            else
+                                new CreateAccount().execute(name, email, password);
                         }
                     }
                 }

diff --git a/app/src/main/java/com/prey/activities/WebViewInitActivity.java b/app/src/main/java/com/prey/activities/WebViewInitActivity.java