csploit-oreo branch fork

cSploit/src/main/AndroidManifest.xml

@@ -4,13 +4,17 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />

cSploit/src/main/java/org/csploit/android/MainActivity.java

@@ -72,7 +72,7 @@ public void verifyPerms() {
                 Manifest.permission.READ_PHONE_STATE)
                 != PackageManager.PERMISSION_GRANTED) {
           ActivityCompat.requestPermissions(this,
-                  new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE},
+                  new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
                   MY_PERMISSIONS_WANTED);
         }
     }

cSploit/src/main/java/org/csploit/android/WifiScannerFragment.java

@@ -186,7 +186,8 @@ public void onViewCreated(View v, Bundle savedInstanceState) {
             getActivity().setTheme(R.style.AppTheme);
             v.setBackgroundColor(ContextCompat.getColor(getActivity(), R.color.background_window));
         }
-        mWifiManager = (WifiManager) getActivity().getSystemService(Context.WIFI_SERVICE);
+        /**ADD getApplicationContext().  compatible Android N**/
+        mWifiManager = (WifiManager) getActivity().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         mClipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
         mWifiMatcher = new WirelessMatcher(getResources().openRawResource(R.raw.alice));
         mScanReceiver = new ScanReceiver();

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

@@ -161,6 +161,7 @@ public static void init(Context context) throws Exception {
       mServices = new HashMap<>();
       mPorts = new HashMap<>();
 
+      /** 注释掉唤醒锁和wifi锁后正常
       // if we are here, network initialization didn't throw any error, lock wifi
       WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
 
@@ -171,15 +172,15 @@ public static void init(Context context) throws Exception {
         mWifiLock.acquire();
 
       // wake lock if enabled
-      if (getSettings().getBoolean("PREF_WAKE_LOCK", true)) {
+      if (getSettings().getBoolean("PREF_WAKE_LOCK", false)) {
         PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
 
         if (mWakeLock == null)
           mWakeLock = powerManager.newWakeLock(PowerManager.FULL_WAKE_LOCK, "wakeLock");
 
         if (!mWakeLock.isHeld())
           mWakeLock.acquire();
-      }
+      }**/
 
       // set ports
       try {

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

@@ -42,7 +42,7 @@ public AboutDialog(Activity activity){
     this.setTitle(activity.getString(R.string.about_csploit_v_) + System.getAppVersionName());
     this.setView(view);
 
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener() {
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int id) {
         dialog.dismiss();
       }

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

@@ -67,7 +67,7 @@ public ChangelogDialog(final Activity activity){
     mLoader.dismiss();
 
     this.setCancelable(false);
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         dialog.dismiss();
       }

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

@@ -42,7 +42,7 @@ public CustomFilterDialog(String title, Activity activity, final CustomFilterDia
     this.setTitle(title);
     this.setView(view);
 
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         assert view != null;
         String f0 = ((EditText) view.findViewById(R.id.fromText0)).getText() + "".trim(),

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

@@ -22,14 +22,16 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 
+import org.csploit.android.R;
+
 public class ErrorDialog extends AlertDialog{
   public ErrorDialog(String title, String message, final Activity activity){
     super(activity);
 
     this.setTitle(title);
     this.setMessage(message);
     this.setCancelable(false);
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         dialog.dismiss();
       }

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

@@ -24,6 +24,7 @@
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
+import org.csploit.android.R;
 
 public class FatalDialog extends AlertDialog{
   public FatalDialog(String title, String message, boolean html, final Activity activity){
@@ -45,7 +46,7 @@ public FatalDialog(String title, String message, boolean html, final Activity ac
     }
 
     this.setCancelable(false);
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         activity.finish();
       }

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

@@ -21,6 +21,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import org.csploit.android.R;
 
 public class FinishDialog extends AlertDialog{
   public FinishDialog(String title, String message, final Activity activity){
@@ -29,7 +30,7 @@ public FinishDialog(String title, String message, final Activity activity){
     this.setTitle(title);
     this.setMessage(message);
     this.setCancelable(false);
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         dialog.dismiss();
         activity.finish();

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

@@ -57,7 +57,7 @@ public InputDialog(String title, String message, String text, boolean editable,
     this.setView(mEditText, 40, 0, 40, 0);
 
     final InputDialogListener listener = inputDialogListener;
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener() {
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int id) {
         if(listener != null)
           listener.onInputEntered(mEditText.getText() + "");

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

@@ -36,7 +36,7 @@ public RedirectionDialog(String title, Activity activity, final RedirectionDialo
     this.setTitle(title);
     this.setView(view);
 
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         assert view != null;
         String address = ((EditText) view.findViewById(R.id.redirAddress)).getText() + "".trim(),

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

@@ -53,7 +53,7 @@ public void onNothingSelected(AdapterView<?> arg0){
     this.setMessage(message);
     this.setView(mSpinner);
 
-    this.setButton(BUTTON_POSITIVE, "Ok", new DialogInterface.OnClickListener(){
+    this.setButton(BUTTON_POSITIVE, activity.getString(R.string.ok), new DialogInterface.OnClickListener(){
       public void onClick(DialogInterface dialog, int id){
         listener.onItemSelected(mSelected);
       }

cSploit/src/main/java/org/csploit/android/plugins/Sessions.java

@@ -146,7 +146,7 @@ public void onCreate(Bundle savedInstanceState) {
     UIThread = this;
 
     if(System.getMsfRpc()==null) {
-      new FinishDialog(getString(R.string.error),"MSF RPC not connected",Sessions.this).show();
+      new FinishDialog(getString(R.string.error),getString(R.string.msfrpc_notconnect_error),Sessions.this).show();
       return;
 		}
 

cSploit/src/main/java/org/csploit/android/plugins/mitm/MITM.java

@@ -482,7 +482,7 @@ public void onClick(View v){
               (
                getString(R.string.mitm_dns_spoofing),
                getString(R.string.mitm_dns_spoofing_desc),
-               R.drawable.action_redirect,
+               R.drawable.action_redirectdns,
                new OnClickListener() {
                @Override
                public void onClick(View v) {

cSploit/src/main/java/org/csploit/android/plugins/mitm/hijacker/Hijacker.java

@@ -520,6 +520,7 @@ private void setStartedState() {
       mSpoof.start(new OnSessionReadyListener() {
         @Override
         public void onSessionReady() {
+		mHijackToggleButton.setText(R.string.start);
           Hijacker.this.runOnUiThread(new Runnable() {
             @Override
             public void run() {

cSploit/src/main/res/layout/plugin_mitm_dns_spoofing.xml

@@ -16,8 +16,8 @@
         android:text="@string/toggle_button"
         android:textAllCaps="true"
         android:textColor="@android:color/white"
-        android:textOff="Start"
-        android:textOn="Stop" />
+        android:textOff="@string/start"
+        android:textOn="@string/stop" />
 
     <ProgressBar
         android:id="@+id/sniffActivity"
@@ -45,7 +45,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentStart="true"
-        android:text="Save" />
+        android:text="@string/save" />
 
     <EditText
         android:id="@+id/textViewDNSList"

cSploit/src/main/res/layout/plugin_mitm_hijacker.xml

@@ -16,8 +16,8 @@
         android:text="@string/toggle_button"
         android:textAllCaps="true"
         android:textColor="@android:color/white"
-        android:textOff="Start"
-        android:textOn="Stop" />
+        android:textOff="@string/start"
+        android:textOn="@string/stop" />
 
     <ProgressBar
         android:id="@+id/hijackActivity"

cSploit/src/main/res/layout/plugin_mitm_password_sniffer.xml

@@ -9,15 +9,15 @@
         android:id="@+id/sniffToggleButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:backgroundTint="@color/app_color"
         android:fontFamily="sans-serif-condensed"
         android:paddingLeft="24dp"
         android:paddingRight="24dp"
         android:text="@string/toggle_button"
         android:textAllCaps="true"
-        android:textOff="Start"
-        android:textOn="Stop"
         android:textColor="@android:color/white"
-        android:backgroundTint="@color/app_color"/>
+        android:textOff="@string/start"
+        android:textOn="@string/stop" />
 
     <ProgressBar
         android:id="@+id/sniffActivity"

cSploit/src/main/res/layout/target_layout.xml

@@ -29,9 +29,10 @@
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"
+        android:layout_centerInParent="true"
         android:padding="6dp"
         android:text="@string/select_target"
         android:textAppearance="?android:attr/textAppearanceSmall"