Refactor for AppCompat (using AS3.3 canary 6 + custom fixes)

Author: fat-tire

cSploit/src/main/java/org/csploit/android/core/System.java

@@ -18,7 +18,6 @@
  */
 package org.csploit.android.core;
 
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.content.Context;
@@ -35,6 +34,8 @@
 import android.os.PowerManager.WakeLock;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.SparseIntArray;
 
 import org.apache.commons.compress.utils.IOUtils;
@@ -385,12 +386,12 @@ private static void uncaughtReloadNetworkMapping() throws UnknownHostException,
     mInitialized = true;
   }
 
-  public static boolean checkNetworking(final Activity current) {
+  public static boolean checkNetworking(final FragmentActivity current) {
     if (!mNetwork.isConnected()) {
 
       Intent intent = new Intent();
       intent.putExtra(WifiScannerFragment.CONNECTED, false);
-      current.setResult(Activity.RESULT_OK, intent);
+      current.setResult(AppCompatActivity.RESULT_OK, intent);
 
       String title = current.getString(R.string.error);
       String message = current.getString(R.string.wifi_went_down);

cSploit/src/main/java/org/csploit/android/gui/dialogs/AboutDialog.java

@@ -18,9 +18,9 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -31,8 +31,8 @@
 
 import java.text.DateFormat;
 
-public class AboutDialog extends AlertDialog{
-  public AboutDialog(Activity activity){
+public class AboutDialog extends AlertDialog {
+  public AboutDialog(FragmentActivity activity){
     super(activity);
 
     DateFormat df = DateFormat.getDateTimeInstance();

cSploit/src/main/java/org/csploit/android/gui/dialogs/ChangelogDialog.java

@@ -19,10 +19,10 @@
 package org.csploit.android.gui.dialogs;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.widget.TextView;
 
@@ -41,7 +41,7 @@ public class ChangelogDialog extends AlertDialog
   private ProgressDialog mLoader = null;
 
   @SuppressLint("SetJavaScriptEnabled")
-  public ChangelogDialog(final Activity activity){
+  public ChangelogDialog(final AppCompatActivity activity){
     super(activity);
 
     this.setTitle("Changelog");

cSploit/src/main/java/org/csploit/android/gui/dialogs/ChoiceDialog.java

@@ -18,9 +18,9 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -33,7 +33,7 @@ public interface ChoiceDialogListener{
     void onChoice(int choice);
   }
 
-  public ChoiceDialog(final Activity activity, String title, String[] choices, final ChoiceDialogListener listener){
+  public ChoiceDialog(final FragmentActivity activity, String title, String[] choices, final ChoiceDialogListener listener){
     super(activity);
 
     this.setTitle(title);

cSploit/src/main/java/org/csploit/android/gui/dialogs/ConfirmDialog.java

@@ -18,9 +18,9 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 
 import org.csploit.android.R;
 
@@ -31,7 +31,7 @@ public interface ConfirmDialogListener{
     void onCancel();
   }
 
-  public ConfirmDialog(String title, CharSequence message, Activity activity, ConfirmDialogListener confirmDialogListener){
+  public ConfirmDialog(String title, CharSequence message, FragmentActivity activity, ConfirmDialogListener confirmDialogListener){
     super(activity);
 
     this.setTitle(title);

cSploit/src/main/java/org/csploit/android/gui/dialogs/CustomFilterDialog.java

@@ -18,9 +18,9 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -34,7 +34,7 @@ public interface CustomFilterDialogListener{
     void onInputEntered(ArrayList<String> from, ArrayList<String> to);
   }
 
-  public CustomFilterDialog(String title, Activity activity, final CustomFilterDialogListener listener){
+  public CustomFilterDialog(String title, AppCompatActivity activity, final CustomFilterDialogListener listener){
     super(activity);
 
     final View view = LayoutInflater.from(activity).inflate(R.layout.plugin_mitm_filter_dialog, null);

cSploit/src/main/java/org/csploit/android/gui/dialogs/ErrorDialog.java

@@ -18,12 +18,12 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 
-public class ErrorDialog extends AlertDialog{
-  public ErrorDialog(String title, String message, final Activity activity){
+public class ErrorDialog extends AlertDialog {
+  public ErrorDialog(String title, String message, final FragmentActivity activity){
     super(activity);
 
     this.setTitle(title);

cSploit/src/main/java/org/csploit/android/gui/dialogs/FatalDialog.java

@@ -18,15 +18,15 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
 public class FatalDialog extends AlertDialog{
-  public FatalDialog(String title, String message, boolean html, final Activity activity){
+  public FatalDialog(String title, String message, boolean html, final FragmentActivity activity){
     super(activity);
 
     this.setTitle(title);
@@ -52,7 +52,7 @@ public void onClick(DialogInterface dialog, int id){
     });
   }
 
-  public FatalDialog(String title, String message, final Activity activity){
+  public FatalDialog(String title, String message, final FragmentActivity activity){
     this(title, message, false, activity);
   }
 }

cSploit/src/main/java/org/csploit/android/gui/dialogs/FinishDialog.java

@@ -18,12 +18,12 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 
 public class FinishDialog extends AlertDialog{
-  public FinishDialog(String title, String message, final Activity activity){
+  public FinishDialog(String title, String message, final FragmentActivity activity){
     super(activity);
 
     this.setTitle(title);

cSploit/src/main/java/org/csploit/android/gui/dialogs/InputDialog.java

@@ -18,9 +18,9 @@
  */
 package org.csploit.android.gui.dialogs;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 import android.text.InputType;
 import android.widget.EditText;
 
@@ -33,11 +33,11 @@ public interface InputDialogListener{
     void onInputEntered(String input);
   }
 
-  public InputDialog(String title, String message, Activity activity, InputDialogListener inputDialogListener){
+  public InputDialog(String title, String message, FragmentActivity activity, InputDialogListener inputDialogListener){
     this(title, message, null, true, false, activity, inputDialogListener);
   }
 
-  public InputDialog(String title, String message, String text, boolean editable, boolean password, Activity activity, InputDialogListener inputDialogListener){
+  public InputDialog(String title, String message, String text, boolean editable, boolean password, FragmentActivity activity, InputDialogListener inputDialogListener){
     super(activity);
 
     mEditText = new EditText(activity);