Skip to content

Commit a61b547

Browse files
gainangainan
committed
Put the floating button above all the rest of the widgets.
Fixed exploit finder button logic. Should close #452, #455.
1 parent 10c62ec commit a61b547

4 files changed

Lines changed: 39 additions & 38 deletions

File tree

‎cSploit/src/main/java/org/csploit/android/plugins/ExploitFinder.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ private void setStartedState() {
266266
mSearchProgress.setVisibility(View.VISIBLE);
267267

268268
final Target target = System.getCurrentTarget();
269+
mSearchFloatingActionButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_stop_24dp));
270+
buttonPlayed = true;
269271

270272
job = Search.searchExploitForServices(target,
271273
new Search.Receiver<Exploit>() {
@@ -299,8 +301,8 @@ public void onEnd() {
299301
@Override
300302
public void run() {
301303
mSearchProgress.setVisibility(View.GONE);
302-
mSearchFloatingActionButton.setImageDrawable(ContextCompat.getDrawable(getBaseContext(), R.drawable.ic_stop_24dp));
303-
buttonPlayed = true;
304+
mSearchFloatingActionButton.setImageDrawable(ContextCompat.getDrawable(getBaseContext(), R.drawable.ic_play_arrow_24dp));
305+
buttonPlayed = false;
304306
if (System.getCurrentExploits().size() == 0) {
305307
new FinishDialog(getString(R.string.warning), getString(R.string.no_exploits_found), ExploitFinder.this).show();
306308
} else if (!somethingFound) {

‎cSploit/src/main/res/layout/plugin_exploit_finder.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@
44
android:layout_height="fill_parent"
55
android:orientation="vertical">
66

7-
<android.support.design.widget.FloatingActionButton
8-
android:id="@+id/searchToggleButton"
9-
android:layout_width="wrap_content"
10-
android:layout_height="wrap_content"
11-
android:padding="20dp"
12-
android:src="@drawable/ic_play_arrow_24dp"
13-
android:checked="false"
14-
android:translationZ="8dp"
15-
android:layout_alignParentBottom="true"
16-
android:layout_alignParentRight="true"
17-
android:layout_margin="20dp" />
18-
197
<ProgressBar
208
android:id="@+id/searchActivity"
219
android:layout_width="wrap_content"
@@ -34,4 +22,16 @@
3422
android:layout_marginLeft="16dp"
3523
android:layout_marginRight="16dp" />
3624

25+
<android.support.design.widget.FloatingActionButton
26+
android:id="@+id/searchToggleButton"
27+
android:layout_width="wrap_content"
28+
android:layout_height="wrap_content"
29+
android:padding="20dp"
30+
android:src="@drawable/ic_play_arrow_24dp"
31+
android:checked="false"
32+
android:translationZ="8dp"
33+
android:layout_alignParentBottom="true"
34+
android:layout_alignParentRight="true"
35+
android:layout_margin="20dp" />
36+
3737
</RelativeLayout>

‎cSploit/src/main/res/layout/plugin_portscanner.xml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@
44
android:layout_height="fill_parent"
55
android:orientation="vertical">
66

7-
<android.support.design.widget.FloatingActionButton
8-
android:id="@+id/scanToggleButton"
9-
android:layout_width="wrap_content"
10-
android:layout_height="wrap_content"
11-
android:layout_alignParentBottom="true"
12-
android:layout_alignParentRight="true"
13-
android:layout_margin="16dp"
14-
android:checked="false"
15-
android:src="@drawable/ic_play_arrow_24dp"
16-
android:translationZ="8dp" />
17-
18-
197
<ListView
208
android:id="@+id/scanListView"
219
android:layout_width="match_parent"
@@ -70,4 +58,15 @@
7058
android:textAppearance="?android:attr/textAppearanceSmall"
7159
android:visibility="gone" />
7260

61+
<android.support.design.widget.FloatingActionButton
62+
android:id="@+id/scanToggleButton"
63+
android:layout_width="wrap_content"
64+
android:layout_height="wrap_content"
65+
android:layout_alignParentBottom="true"
66+
android:layout_alignParentRight="true"
67+
android:layout_margin="16dp"
68+
android:checked="false"
69+
android:src="@drawable/ic_play_arrow_24dp"
70+
android:translationZ="8dp" />
71+
7372
</RelativeLayout>

‎cSploit/src/main/res/layout/plugin_traceroute.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
android:orientation="vertical"
66
android:padding="8dp">
77

8-
<android.support.design.widget.FloatingActionButton
9-
android:id="@+id/traceToggleButton"
10-
android:layout_width="wrap_content"
11-
android:layout_height="wrap_content"
12-
android:padding="20dp"
13-
android:src="@drawable/ic_play_arrow_24dp"
14-
android:checked="false"
15-
android:translationZ="8dp"
16-
android:layout_alignParentBottom="true"
17-
android:layout_alignParentRight="true"
18-
android:layout_margin="20dp" />
19-
208
<ListView
219
android:id="@+id/traceListView"
2210
android:layout_width="match_parent"
@@ -32,4 +20,16 @@
3220
android:layout_alignRight="@+id/traceListView"
3321
android:visibility="invisible" />
3422

23+
<android.support.design.widget.FloatingActionButton
24+
android:id="@+id/traceToggleButton"
25+
android:layout_width="wrap_content"
26+
android:layout_height="wrap_content"
27+
android:padding="20dp"
28+
android:src="@drawable/ic_play_arrow_24dp"
29+
android:checked="false"
30+
android:translationZ="8dp"
31+
android:layout_alignParentBottom="true"
32+
android:layout_alignParentRight="true"
33+
android:layout_margin="20dp" />
34+
3535
</RelativeLayout>

0 commit comments

Comments
 (0)