Merge pull request #291 from fat-tire/develop

some dSploit->cSploit changes.  Affects not much.

Author: tux-mind

.gitignore

@@ -47,6 +47,7 @@ proguard/
 .loadpath
 actionbarsherlock/build/
 dSploit/build/
+cSploit/build/
 # External tool builders
 .externalToolBuilders/
 

cSploit/build.gradle

@@ -23,6 +23,7 @@ apply plugin:  'com.android.application'
 dependencies {
     compile 'com.android.support:support-v4:23.0.1'
     compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:design:23.0.1'
     compile 'org.apache.commons:commons-compress:1.10'
     compile 'commons-net:commons-net:3.3'
     compile 'com.github.zafarkhaja:java-semver:0.9.0'

cSploit/res/values/style.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="actionBarStyle">@style/Theme.DSploitActionBarStyle</item>
+        <item name="actionBarStyle">@style/Theme.CSploitActionBarStyle</item>
         <item name="android:windowBackground">@color/background_window</item>
         <item name="colorPrimary">@color/app_color</item>
         <!-- darker variant of colorPrimary (for status bar, contextual app bars) -->
@@ -16,7 +16,7 @@
     <!-- this dark theme needs a lot of help and support in the app overall -->
 
     <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="actionBarStyle">@style/Theme.DSploitActionBarDarkStyle</item>
+        <item name="actionBarStyle">@style/Theme.CSploitActionBarDarkStyle</item>
         <item name="actionModeBackground">@color/app_color_dark</item>
         <item name="colorPrimary">@color/selectable_blue_dark</item>
         <!-- darker variant of colorPrimary (for status bar, contextual app bars) -->
@@ -29,14 +29,14 @@
     </style>
 
 
-    <style name="Theme.DSploitActionBarStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
+    <style name="Theme.CSploitActionBarStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:windowBackground">@color/background_window</item>
     </style>
 
-    <style name="Theme.DSploitActionBarDarkStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
+    <style name="Theme.CSploitActionBarDarkStyle" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:windowBackground">@color/background_window_dark</item>
     </style>
 
     <style name="Theme.Dialog" parent="@android:style/Theme.Dialog" />
 
-</resources>
+</resources>

cSploit/res/xml-v14/preferences.xml

@@ -123,7 +123,7 @@
             android:title="@string/pref_http_max_buffer_size" />
 
         <EditTextPreference
-            android:defaultValue="dsploit-password-sniff.log"
+            android:defaultValue="csploit-password-sniff.log"
             android:key="PREF_PASSWORD_FILENAME"
             android:summary="@string/pref_password_filename_desc"
             android:title="@string/pref_password_filename" />
@@ -228,4 +228,4 @@
             android:summary="@string/pref_msf_delete_desc"/>
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>

cSploit/res/xml/preferences.xml

@@ -123,7 +123,7 @@
             android:title="@string/pref_http_max_buffer_size" />
 
         <EditTextPreference
-            android:defaultValue="dsploit-password-sniff.log"
+            android:defaultValue="csploit-password-sniff.log"
             android:key="PREF_PASSWORD_FILENAME"
             android:summary="@string/pref_password_filename_desc"
             android:title="@string/pref_password_filename" />
@@ -228,4 +228,4 @@
             android:summary="@string/pref_msf_delete_desc"/>
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>

cSploit/src/org/csploit/android/services/receivers/MsfRpcdServiceReceiver.java

@@ -6,9 +6,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.ContextCompat;
-import android.widget.Toast;
 
 import org.csploit.android.R;
 import org.csploit.android.core.ManagedReceiver;
@@ -62,7 +62,9 @@ public void run() {
   }
 
   private void showToastForStatus(Context context, MsfRpcdService.Status status) {
-    Toast.makeText(context, status.getText(), (status.isError() ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT)).show();
+    Snackbar
+            .make(((Activity) context).findViewById(android.R.id.content), status.getText(), status.isError() ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT)
+    .show();
   }
 
   private void updateNotificationForStatus(Context context, MsfRpcdService.Status status) {