Fix write permission checks on SD card, pass correct path to exec_payload to dialog with manual.

Author: BOOtak

app/src/main/java/org/leyfer/thesis/touchlogger_dirty/activity/MainActivity.java

@@ -14,6 +14,7 @@
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -81,7 +82,12 @@ public void run() {
                                 mHandler.post(new Runnable() {
                                     @Override
                                     public void run() {
-                                        notifyManualInstallationRequired();
+                                        File externalStorageDirectory =
+                                                Environment.getExternalStorageDirectory();
+                                        File targetFile = new File(externalStorageDirectory,
+                                                EXEC_PAYLOAD_NAME);
+                                        notifyManualInstallationRequired(
+                                                targetFile.getAbsolutePath());
                                     }
                                 });
                             } catch (final ManualInstallationException e) {
@@ -109,9 +115,16 @@ private String getStackTraceString(Exception e) {
         return result.toString();
     }
 
-    private void notifyManualInstallationRequired() {
+    private void notifyManualInstallationRequired(String fileExternalStorageDirLocation) {
+        LayoutInflater inflater = LayoutInflater.from(this);
+        View manualInstallationView = inflater.inflate
+                (R.layout.dialog_manual_payload_installation, null);
+        TextView copyCommandTextView = manualInstallationView.findViewById(R.id.copy_command);
+        copyCommandTextView.setText(
+                getString(R.string.copy_command_text, fileExternalStorageDirLocation));
+
         new AlertDialog.Builder(this)
-                .setView(R.layout.dialog_manual_payload_installation)
+                .setView(manualInstallationView)
                 .setTitle(R.string.alert_title)
                 .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
@@ -125,12 +138,13 @@ public void onClick(DialogInterface dialogInterface, int i) {
     private void prepareManualInstallation() throws ManualInstallationException {
         File execPayloadFile = new File(getFilesDir(), EXEC_PAYLOAD_NAME);
         if (execPayloadFile.exists()) {
-            File targetFile = new File(Environment.getExternalStorageDirectory().getPath(),
-                    EXEC_PAYLOAD_NAME);
-            if (!targetFile.canWrite()) {
+            File externalStorageDirectory = Environment.getExternalStorageDirectory();
+            if (!externalStorageDirectory.canWrite()) {
                 throw new ManualInstallationException(
                         "Unable to create file on SD card, check SD card permissions!");
             }
+
+            File targetFile = new File(externalStorageDirectory, EXEC_PAYLOAD_NAME);
             try {
                 FileUtils.copyFile(execPayloadFile, targetFile);
             } catch (IOException e) {

app/src/main/res/layout/dialog_manual_payload_installation.xml

@@ -25,12 +25,13 @@
         android:text="@string/manual_3"/>
 
     <TextView
+        android:id="@+id/copy_command"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="32dp"
         android:layout_marginStart="32dp"
         android:layout_marginTop="8dp"
-        android:text="@string/manual_3_1"
+        android:text="@string/copy_command_text"
         app:fontFamily="monospace"/>
 
     <TextView

app/src/main/res/values/strings.xml

@@ -25,9 +25,9 @@
     <string name="payload_install_error">Touchlogger was unable to complete payload installation!</string>
     <string name="manual_1">To install touchlogger payload manually, please follow these steps:</string>
     <string name="manual_2">1. Connect to your device using ADB shell</string>
-    <string name="manual_3">2. Copy /sdcard/exec_payload to /data/local/tmp/exec_payload:</string>
+    <string name="manual_3">2. Copy exec_payload from SD card to /data/local/tmp/exec_payload:</string>
     <string name="manual_4">3. Set exec_payload to executable:</string>
-    <string name="manual_3_1">cp /sdcard/exec_payload /data/local/tmp/exec_payload</string>
+    <string name="copy_command_text">cp %1$s /data/local/tmp/exec_payload</string>
     <string name="manual_5">cd /data/local/tmp</string>
     <string name="manual_5_1">chmod 755 exec_payload</string>
     <string name="manual_6">4. Start exec_payload:</string>