Skip to content

Commit 54069c7

Browse files
fat-tirefat-tire
authored
Merge pull request #968 from fat-tire/refresh2
Bring cSploit code up to date (Android Pie/AS 3.3 current) + AndroidX + other fixes
2 parents 6686cf1 + 09cc75e commit 54069c7

62 files changed

Lines changed: 176 additions & 157 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ buildscript {
33
repositories {
44
google()
55
jcenter()
6-
mavenCentral()
76
}
87
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.0-alpha04'
8+
classpath 'com.android.tools.build:gradle:3.3.0-alpha07'
109
}
1110
}
1211

1312
allprojects {
1413
repositories {
1514
google()
1615
jcenter()
17-
mavenCentral()
1816
}
1917
}

‎cSploit/build.gradle‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,41 @@ buildscript {
22
repositories {
33
google()
44
jcenter()
5-
mavenCentral()
65
}
76
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.0-alpha04'
7+
classpath 'com.android.tools.build:gradle:3.3.0-alpha07'
98
}
109
}
1110

1211
allprojects {
1312
repositories {
1413
google()
1514
jcenter()
16-
mavenCentral()
1715
}
1816
}
1917
apply plugin: 'com.android.application'
2018

2119
dependencies {
22-
implementation 'com.android.support:support-v4:27.0.2'
23-
implementation 'com.android.support:appcompat-v7:27.0.2'
24-
implementation 'com.android.support:design:27.0.2'
25-
implementation 'com.android.support:preference-v7:27.0.2'
26-
implementation 'org.apache.commons:commons-compress:1.16.1'
20+
implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc01'
21+
implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
22+
implementation 'androidx.preference:preference:1.0.0-rc01'
23+
implementation 'androidx.multidex:multidex:2.0.0'
24+
implementation 'com.google.android.material:material:1.0.0-rc01'
25+
implementation 'org.apache.commons:commons-compress:1.18'
2726
implementation 'commons-net:commons-net:3.6'
2827
implementation 'com.github.zafarkhaja:java-semver:0.9.0'
29-
implementation 'org.unbescape:unbescape:1.1.5.RELEASE'
28+
implementation 'org.unbescape:unbescape:1.1.6.RELEASE'
3029
implementation 'org.msgpack:msgpack:0.6.12'
3130
implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
3231
implementation 'org.tukaani:xz:1.8'
33-
implementation 'ch.acra:acra-http:5.1.1'
34-
implementation 'ch.acra:acra-notification:5.1.1'
32+
implementation 'ch.acra:acra-http:5.1.3'
33+
implementation 'ch.acra:acra-notification:5.1.3'
3534
testImplementation 'junit:junit:4.12'
3635
}
3736

3837
android {
39-
compileSdkVersion 27
40-
buildToolsVersion '27.0.3'
38+
compileSdkVersion 28
39+
buildToolsVersion '28.0.2'
4140

4241
compileOptions {
4342
sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,7 +50,7 @@ android {
5150

5251
defaultConfig {
5352
minSdkVersion 14
54-
targetSdkVersion 27
53+
targetSdkVersion 28
5554
versionCode 4
5655
versionName "1.7.0-unstable"
5756
if(System.getenv("NIGHTLY_BUILD")) {

‎cSploit/src/main/AndroidManifest.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="org.csploit.android">
45

56
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
67
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
78
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
89
<uses-permission android:name="android.permission.INTERNET" />
910
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
10-
<uses-permission android:name="android.permission.WAKE_LOCK" />
1111
<uses-permission android:name="android.permission.VIBRATE" />
1212
<uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
1313
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
1414
<uses-permission
1515
android:name="android.permission.READ_EXTERNAL_STORAGE"
1616
android:maxSdkVersion="18" />
17+
<uses-permission android:name="android.permission.WAKE_LOCK" tools:node="replace"/>
18+
1719

1820
<application
1921
android:name=".CSploitApplication"
@@ -37,6 +39,11 @@
3739

3840
<category android:name="android.intent.category.LAUNCHER" />
3941
</intent-filter>
42+
<meta-data android:name="WindowManagerPreference:SuppressWindowControlNavigationButton" android:value="true" />
43+
<layout
44+
android:gravity="center"
45+
android:minHeight="320dp"
46+
android:minWidth="480dp" />
4047
</activity>
4148

4249
<!-- suppress AndroidDomInspection -->

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

Lines changed: 1 addition & 1 deletion
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.AppCompatActivity;
23+
import androidx.appcompat.app.AppCompatActivity;
2424

2525
public class ActionActivity extends AppCompatActivity {
2626

‎cSploit/src/main/java/org/csploit/android/ActionFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import android.content.Intent;
66
import android.content.SharedPreferences;
77
import android.os.Bundle;
8-
import android.support.annotation.Nullable;
9-
import android.support.v4.app.Fragment;
10-
import android.support.v4.content.ContextCompat;
11-
import android.support.v7.app.AppCompatActivity;
8+
import androidx.annotation.Nullable;
9+
import androidx.fragment.app.Fragment;
10+
import androidx.core.content.ContextCompat;
11+
import androidx.appcompat.app.AppCompatActivity;
1212
import android.view.LayoutInflater;
1313
import android.view.MenuItem;
1414
import android.view.View;

‎cSploit/src/main/java/org/csploit/android/CSploitApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.app.Application;
2222
import android.content.Context;
2323
import android.content.SharedPreferences;
24-
import android.support.multidex.MultiDex;
24+
import androidx.multidex.MultiDex;
2525

2626
import org.acra.ACRA;
2727
import org.acra.annotation.AcraCore;

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import android.content.SharedPreferences;
2727
import android.content.pm.PackageManager;
2828
import android.os.Bundle;
29-
import android.support.v4.app.ActivityCompat;
30-
import android.support.v4.content.ContextCompat;
31-
import android.support.v7.app.AppCompatActivity;
29+
import androidx.core.app.ActivityCompat;
30+
import androidx.core.content.ContextCompat;
31+
import androidx.appcompat.app.AppCompatActivity;
3232
import android.widget.Toast;
3333

3434
public class MainActivity extends AppCompatActivity {
@@ -70,9 +70,13 @@ public void verifyPerms() {
7070
Manifest.permission.WRITE_EXTERNAL_STORAGE)
7171
!= PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(this,
7272
Manifest.permission.READ_PHONE_STATE)
73-
!= PackageManager.PERMISSION_GRANTED) {
73+
!= PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(this,
74+
Manifest.permission.WAKE_LOCK)
75+
!= PackageManager.PERMISSION_GRANTED)
76+
{
7477
ActivityCompat.requestPermissions(this,
75-
new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE},
78+
new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE,
79+
Manifest.permission.WAKE_LOCK},
7680
MY_PERMISSIONS_WANTED);
7781
}
7882
}

‎cSploit/src/main/java/org/csploit/android/MainFragment.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import android.net.Uri;
2929
import android.os.Build;
3030
import android.os.Bundle;
31-
import android.support.annotation.Nullable;
32-
import android.support.v4.app.Fragment;
33-
import android.support.v4.content.ContextCompat;
34-
import android.support.v7.app.AppCompatActivity;
35-
import android.support.v7.view.ActionMode;
31+
import androidx.annotation.Nullable;
32+
import androidx.fragment.app.Fragment;
33+
import androidx.core.content.ContextCompat;
34+
import androidx.appcompat.app.AppCompatActivity;
35+
import androidx.appcompat.view.ActionMode;
3636
import android.text.Html;
3737
import android.view.LayoutInflater;
3838
import android.view.Menu;

‎cSploit/src/main/java/org/csploit/android/SettingsActivity.java‎

Lines changed: 1 addition & 1 deletion
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.AppCompatActivity;
23+
import androidx.appcompat.app.AppCompatActivity;
2424

2525
public class SettingsActivity extends AppCompatActivity {
2626

‎cSploit/src/main/java/org/csploit/android/SettingsFragment.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@
2424
import android.content.IntentFilter;
2525
import android.content.SharedPreferences;
2626
import android.os.Bundle;
27-
import android.support.v4.app.Fragment;
28-
import android.support.v4.content.ContextCompat;
29-
import android.support.v7.app.AppCompatActivity;
30-
import android.support.v7.preference.EditTextPreference;
31-
import android.support.v7.preference.ListPreference;
32-
import android.support.v7.preference.Preference;
33-
import android.support.v7.preference.PreferenceFragmentCompat;
34-
import android.support.v7.preference.TwoStatePreference;
3527
import android.view.MenuItem;
3628
import android.view.View;
3729
import android.widget.Toast;
@@ -51,6 +43,15 @@
5143
import java.io.File;
5244
import java.io.IOException;
5345

46+
import androidx.appcompat.app.AppCompatActivity;
47+
import androidx.core.content.ContextCompat;
48+
import androidx.fragment.app.Fragment;
49+
import androidx.preference.EditTextPreference;
50+
import androidx.preference.ListPreference;
51+
import androidx.preference.Preference;
52+
import androidx.preference.PreferenceFragmentCompat;
53+
import androidx.preference.TwoStatePreference;
54+
5455
public class SettingsFragment extends Fragment {
5556

5657

0 commit comments

Comments
 (0)