Skip to content

Commit a46b2ef

Browse files
tux-mindtux-mind
committed
Merge pull request #279 from fat-tire/develop
A few more commits on-deck (build.gradle stuff, dark theme, etc.)
2 parents 244ebdf + 57b1fd8 commit a46b2ef

15 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎cSploit/build.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:1.3.1'
7+
classpath 'com.android.tools.build:gradle:1.4.0-beta3'
88
}
99
}
1010

@@ -24,12 +24,8 @@ dependencies {
2424
compile 'com.android.support:support-v4:23.0.1'
2525
compile 'com.android.support:appcompat-v7:23.0.1'
2626
compile 'org.apache.commons:commons-compress:1.10'
27-
compile 'org.apache.commons:commons-compress:1.10:sources'
2827
compile 'commons-net:commons-net:3.3'
29-
compile 'junit:junit:4.12'
30-
compile 'joda-time:joda-time:2.8.2'
3128
compile 'com.github.zafarkhaja:java-semver:0.9.0'
32-
compile 'com.sksamuel.diff:diff:1.1.11'
3329
compile 'org.unbescape:unbescape:1.1.1.RELEASE'
3430
compile 'org.msgpack:msgpack:0.6.12'
3531
compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'

‎cSploit/res/layout/actions_list_item.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
android:orientation="horizontal"
77
android:background="@drawable/card_background"
88
android:showDividers="none"
9-
android:layout_marginBottom="8dp">
9+
android:layout_marginBottom="8dp"
10+
android:translationZ="8dp">
1011

1112
<LinearLayout
1213
android:layout_height="wrap_content"
@@ -20,9 +21,10 @@
2021
<LinearLayout
2122
android:layout_width="0dp"
2223
android:layout_weight="10"
23-
android:layout_marginRight="8dp"
2424
android:layout_height="match_parent"
25-
android:orientation="vertical">
25+
android:orientation="vertical"
26+
android:layout_margin="8dp"
27+
android:gravity="center">
2628

2729
<ImageView
2830
android:id="@+id/actionIcon"

‎cSploit/res/layout/target_list_item.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
android:layout_width="fill_parent"
44
android:layout_height="wrap_content"
55
android:orientation="horizontal"
6-
android:padding="8dp">
6+
android:padding="8dp"
7+
android:translationZ="8dp">
78

89
<ImageView
910
android:id="@+id/itemIcon"
1011
android:layout_width="wrap_content"
1112
android:layout_height="fill_parent"
1213
android:layout_alignParentBottom="true"
1314
android:layout_alignParentLeft="true"
14-
android:layout_centerVertical="true"
15-
android:layout_marginRight="16dp" />
15+
android:layout_centerInParent="true"
16+
android:layout_margin="8dp" />
1617

1718
<TextView
1819
android:id="@+id/itemTitle"

‎cSploit/res/values/style.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@
1515

1616
<!-- this dark theme needs a lot of help and support in the app overall -->
1717

18-
<style name="DarkTheme" parent="Theme.AppCompat.Light">
18+
<style name="DarkTheme" parent="Theme.AppCompat">
1919
<item name="actionBarStyle">@style/Theme.DSploitActionBarDarkStyle</item>
2020
<item name="actionModeBackground">@color/app_color_dark</item>
21-
<item name="colorPrimary">@color/app_color_dark</item>
21+
<item name="colorPrimary">@color/selectable_blue_dark</item>
2222
<!-- darker variant of colorPrimary (for status bar, contextual app bars) -->
23-
<item name="colorPrimaryDark">@color/holo_blue_dark</item>
23+
<item name="colorPrimaryDark">@color/selectable_blue_dark</item>
2424
<!-- theme UI controls like checkboxes and text fields -->
2525
<item name="colorAccent">@color/selectable_blue_dark</item>
2626
<item name="colorControlHighlight">@color/selectable_blue_dark</item>
2727
<item name="android:windowBackground">@color/background_window_dark</item>
28+
<item name="android:colorBackground">@color/material_blue_grey_950</item>
2829
</style>
2930

3031

‎cSploit/src/org/csploit/android/ActionActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import android.content.Intent;
2424
import android.content.SharedPreferences;
2525
import android.os.Bundle;
26-
import android.support.v7.app.ActionBarActivity;
26+
import android.support.v7.app.AppCompatActivity;
2727
import android.view.LayoutInflater;
2828
import android.view.MenuItem;
2929
import android.view.View;
@@ -41,20 +41,20 @@
4141

4242
import java.util.ArrayList;
4343

44-
public class ActionActivity extends ActionBarActivity {
44+
public class ActionActivity extends AppCompatActivity {
4545
private ArrayList<Plugin> mAvailable = null;
4646
private ListView theList;
4747

4848
@Override
4949
public void onCreate(Bundle savedInstanceState) {
50-
super.onCreate(savedInstanceState);
5150
SharedPreferences themePrefs = getSharedPreferences("THEME", 0);
5251
Boolean isDark = themePrefs.getBoolean("isDark", false);
5352

5453
if (isDark)
5554
setTheme(R.style.DarkTheme);
5655
else
5756
setTheme(R.style.AppTheme);
57+
super.onCreate(savedInstanceState);
5858

5959
if (System.getTargets() != null && System.getTargets().size() > 0 && System.getCurrentTarget() != null) {
6060
setTitle("cSploit > " + System.getCurrentTarget());

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import android.net.Uri;
2828
import android.os.Build;
2929
import android.os.Bundle;
30-
import android.support.v7.app.ActionBarActivity;
30+
import android.support.v7.app.AppCompatActivity;
3131
import android.support.v7.view.ActionMode;
3232
import android.text.Html;
3333
import android.view.Gravity;
@@ -55,8 +55,6 @@
5555
import org.csploit.android.core.MultiAttackService;
5656
import org.csploit.android.core.Plugin;
5757
import org.csploit.android.core.System;
58-
import org.csploit.android.services.UpdateChecker;
59-
import org.csploit.android.services.UpdateService;
6058
import org.csploit.android.events.Event;
6159
import org.csploit.android.gui.dialogs.AboutDialog;
6260
import org.csploit.android.gui.dialogs.ConfirmDialog;
@@ -69,7 +67,6 @@
6967
import org.csploit.android.gui.dialogs.SpinnerDialog;
7068
import org.csploit.android.gui.dialogs.SpinnerDialog.SpinnerDialogListener;
7169
import org.csploit.android.net.Network;
72-
import org.csploit.android.services.NetworkRadar;
7370
import org.csploit.android.net.Target;
7471
import org.csploit.android.plugins.ExploitFinder;
7572
import org.csploit.android.plugins.Inspector;
@@ -81,6 +78,9 @@
8178
import org.csploit.android.plugins.Traceroute;
8279
import org.csploit.android.plugins.mitm.MITM;
8380
import org.csploit.android.services.MsfRpcdService;
81+
import org.csploit.android.services.NetworkRadar;
82+
import org.csploit.android.services.UpdateChecker;
83+
import org.csploit.android.services.UpdateService;
8484
import org.csploit.android.services.receivers.MsfRpcdServiceReceiver;
8585
import org.csploit.android.services.receivers.NetworkRadarReceiver;
8686
import org.csploit.android.update.CoreUpdate;
@@ -97,7 +97,7 @@
9797
import static org.csploit.android.services.UpdateChecker.UPDATE_NOT_AVAILABLE;
9898

9999
@SuppressLint("NewApi")
100-
public class MainActivity extends ActionBarActivity {
100+
public class MainActivity extends AppCompatActivity {
101101
private String UPDATE_MESSAGE;
102102
private static final int WIFI_CONNECTION_REQUEST = 1012;
103103
private boolean isWifiAvailable = false;
@@ -290,7 +290,6 @@ public void run() {
290290

291291
@Override
292292
public void onCreate(Bundle savedInstanceState) {
293-
super.onCreate(savedInstanceState);
294293
SharedPreferences themePrefs = getSharedPreferences("THEME", 0);
295294
Boolean isDark = themePrefs.getBoolean("isDark", false);
296295
boolean connectivityAvailable;
@@ -299,7 +298,7 @@ public void onCreate(Bundle savedInstanceState) {
299298
setTheme(R.style.DarkTheme);
300299
else
301300
setTheme(R.style.AppTheme);
302-
301+
super.onCreate(savedInstanceState);
303302
setContentView(R.layout.target_layout);
304303

305304
lv = (ListView) findViewById(R.id.android_list);
@@ -831,7 +830,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
831830
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
832831
row = inflater
833832
.inflate(R.layout.target_list_item, parent, false);
834-
833+
if (getSharedPreferences("THEME", 0).getBoolean("isDark", false))
834+
row.setBackground(getResources().getDrawable(R.drawable.card_background_dark));
835835
holder = new TargetHolder();
836836
holder.itemImage = (ImageView) (row != null ? row
837837
.findViewById(R.id.itemIcon) : null);
@@ -857,8 +857,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
857857

858858
holder.itemTitle.setTextColor(getResources().getColor((target.isConnected() ? R.color.app_color : R.color.gray_text)));
859859

860-
if (row != null)
861-
row.setBackgroundColor(getResources().getColor((target.isSelected() ? R.color.background_material_dark : android.R.color.transparent)));
860+
if (row != null && (getSharedPreferences("THEME", 0).getBoolean("isDark", false)))
861+
row.setBackground(getResources().getDrawable(R.drawable.card_background_dark));
862862

863863
holder.itemTitle.setTypeface(null, Typeface.NORMAL);
864864
holder.itemImage.setImageResource(target.getDrawableResourceId());

‎cSploit/src/org/csploit/android/core/Plugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import android.content.Context;
2222
import android.os.Bundle;
23-
import android.support.v7.app.ActionBarActivity;
23+
import android.support.v7.app.AppCompatActivity;
2424
import android.view.MenuItem;
2525

2626
import org.csploit.android.R;
@@ -29,7 +29,7 @@
2929
import org.csploit.android.net.Target.Port;
3030
import org.csploit.android.net.metasploit.RPCClient;
3131

32-
public abstract class Plugin extends ActionBarActivity {
32+
public abstract class Plugin extends AppCompatActivity {
3333
public static final int NO_LAYOUT = -1;
3434

3535
private int mNameStringId = -1;

‎cSploit/src/org/csploit/android/gui/Console.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.os.Build;
55
import android.os.Bundle;
6-
import android.support.v7.app.ActionBarActivity;
6+
import android.support.v7.app.AppCompatActivity;
77
import android.text.method.ScrollingMovementMethod;
88
import android.view.KeyEvent;
99
import android.view.Menu;
@@ -24,7 +24,7 @@
2424
/**
2525
* this Activity allow user to run commands on pwned shells
2626
*/
27-
public class Console extends ActionBarActivity {
27+
public class Console extends AppCompatActivity {
2828

2929
private EditText mInput;
3030
private EditText mOutput;

‎cSploit/src/org/csploit/android/gui/FileEdit.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.csploit.android.gui;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.ActionBarActivity;
4+
import android.support.v7.app.AppCompatActivity;
55
import android.view.View;
66
import android.widget.Button;
77
import android.widget.EditText;
@@ -14,7 +14,7 @@
1414
import java.io.FileOutputStream;
1515
import java.io.FileReader;
1616

17-
public class FileEdit extends ActionBarActivity {
17+
public class FileEdit extends AppCompatActivity {
1818
private Button mCmdSave = null;
1919
private EditText mFileEditText = null;
2020
public final static String KEY_FILEPATH = "FilePath";

‎cSploit/src/org/csploit/android/plugins/mitm/DNSSpoofing.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import android.content.SharedPreferences;
2222
import android.os.Bundle;
23-
import android.support.v7.app.ActionBarActivity;
23+
import android.support.v7.app.AppCompatActivity;
2424
import android.view.MenuItem;
2525
import android.view.View;
2626
import android.widget.Button;
@@ -44,7 +44,7 @@
4444
import java.io.FileWriter;
4545
import java.io.IOException;
4646

47-
public class DNSSpoofing extends ActionBarActivity {
47+
public class DNSSpoofing extends AppCompatActivity {
4848
private ToggleButton mSniffToggleButton = null;
4949
private ProgressBar mSniffProgress = null;
5050
private TextView mTextDnsList = null;

0 commit comments

Comments
 (0)