From 9c1c8ef14fd90aaa1ba43c230e7dff28d95f589c Mon Sep 17 00:00:00 2001
From: Mariano Sciacco <34033090+Maxelweb@users.noreply.github.com>
Date: Mon, 8 Mar 2021 16:51:04 +0100
Subject: [PATCH] Other edits ex2

---
 mobiotsec2filehasher/.idea/gradle.xml         |  1 +
 .../app/src/main/AndroidManifest.xml          | 12 +++---
 .../maliciousapp/HashfileActivity.java        | 43 +++++++------------
 .../example/maliciousapp/MainActivity.java    |  3 ++
 .../filehasher/filehasher_logs.txt            |  2 -
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/mobiotsec2filehasher/.idea/gradle.xml b/mobiotsec2filehasher/.idea/gradle.xml
index 18de3ac..23a89bb 100644
--- a/mobiotsec2filehasher/.idea/gradle.xml
+++ b/mobiotsec2filehasher/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/mobiotsec2filehasher/app/src/main/AndroidManifest.xml b/mobiotsec2filehasher/app/src/main/AndroidManifest.xml
index e48a600..8463bfe 100644
--- a/mobiotsec2filehasher/app/src/main/AndroidManifest.xml
+++ b/mobiotsec2filehasher/app/src/main/AndroidManifest.xml
@@ -10,17 +10,19 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Mobiotsec2filehasher">
         <activity android:name=".HashfileActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="com.mobiotsec.intent.action.HASHFILE" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+
         </activity>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.mobiotsec.intent.action.HASHFILE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+                <data android:scheme="file" />
+            </intent-filter>
         </activity>
     </application>
 </manifest>
\ No newline at end of file
diff --git a/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java b/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java
index de53e28..eca4154 100644
--- a/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java
+++ b/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/HashfileActivity.java
@@ -20,41 +20,30 @@ public class HashfileActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_hashfile);
 
-        Log.d("MOBIOTSEC", "PROVA 0");
-
         Intent intent = getIntent();
+        String filePath = intent.getData().getPath();
 
-        Log.d("MOBIOTSEC", "PROVA 1");
-        Log.d("MOBIOTSEC", intent.getAction());
+        // calculate hash
+        String hash = calcHash(filePath);
 
-        if(intent.getAction() == "com.mobiotsec.intent.action.HASHFILE") {
+        // return the hash in a "result" intent
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra("hash", hash);
+        setResult(Activity.RESULT_OK, resultIntent);
+        finish();
 
-            String filePath = intent.getData().getPath();
-            Log.d("MOBIOTSEC", filePath);
-            // calculate hash
-            String hash = null;
-            try {
 
-                hash = calcHash(filePath);
-
-                // return the hash in a "result" intent
-                Intent resultIntent = new Intent();
-                resultIntent.putExtra("hash", hash);
-                setResult(Activity.RESULT_OK, resultIntent);
-                finish();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        }
     }
 
-    static public String calcHash(String filePath) throws IOException {
+    static public String calcHash(String filePath) {
         File file = new File(filePath);
-        Log.d("MOBIOTSEC", "PROVA 3");
-        byte[] bytes = FileUtils.readFileToByteArray(file);
-        Log.d("MOBIOTSEC", "PROVA 4");
+        byte[] bytes = new byte[0];
+        Log.d("MOBIOTSEC", "HELLOOOOO");
+        try {
+            bytes = FileUtils.readFileToByteArray(file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         return DigestUtils.sha256Hex(bytes);
 
     }
diff --git a/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/MainActivity.java b/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/MainActivity.java
index 37fb538..dd2c101 100644
--- a/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/MainActivity.java
+++ b/mobiotsec2filehasher/app/src/main/java/com/example/maliciousapp/MainActivity.java
@@ -3,6 +3,7 @@ package com.example.maliciousapp;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
+import android.util.Log;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -10,5 +11,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        Log.d("MOBIOTSEC", "123 HELLOOOOO");
     }
 }
\ No newline at end of file
diff --git a/mobiotsec2filehasher/filehasher/filehasher_logs.txt b/mobiotsec2filehasher/filehasher/filehasher_logs.txt
index 0fd25bb..2dd604b 100644
--- a/mobiotsec2filehasher/filehasher/filehasher_logs.txt
+++ b/mobiotsec2filehasher/filehasher/filehasher_logs.txt
@@ -1,5 +1,3 @@
 --------- beginning of main
 --------- beginning of system
 --------- beginning of kernel
-03-04 14:10:11.909 15435 15435 I MOBIOTSEC: /storage/emulated/0/YM3oPnYG.dat
---------- beginning of crash