Merge pull request #79 from git03-Nguyen/dev

git03-Nguyen · web-flow · commit 8712f2bddd02 · 2023-12-19T18:54:48.000+07:00
Dev
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -37,6 +37,8 @@ dependencies {
     implementation("com.google.android.material:material:1.10.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("com.android.car.ui:car-ui-lib:2.5.1")
+    implementation("androidx.security:security-crypto:1.1.0-alpha05")
+
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
diff --git a/app/src/main/java/edu/team08/infinitegallery/singlephoto/ViewPagerAdapter.java b/app/src/main/java/edu/team08/infinitegallery/singlephoto/ViewPagerAdapter.java
@@ -25,10 +25,12 @@
 import java.util.Objects;
 
 import edu.team08.infinitegallery.R;
+import edu.team08.infinitegallery.trashbin.SingleTrashActivity;
+import edu.team08.infinitegallery.trashbin.TrashBinManager;
 
 public class ViewPagerAdapter extends PagerAdapter {
     static final int MAX_CACHE_SIZE = 16;
-    Context context;
+    static Context context;
     File[] photoFiles;
     LayoutInflater inflater;
     PhotoView zoomViewImage;
@@ -42,7 +44,11 @@ public ViewPagerAdapter(Context context, File[] photoFiles){
 
     static private Drawable getDrawable(String key){
         if(!cache.containsKey(key)){
-            cache.put(key, Drawable.createFromPath(key));
+            if (context instanceof SingleTrashActivity) {
+                cache.put(key, new BitmapDrawable(context.getResources(), new TrashBinManager(context).decryptPhoto(new File(key))));
+            } else {
+                cache.put(key, Drawable.createFromPath(key));
+            }
         }
 
         if(cache.size() >= MAX_CACHE_SIZE){
diff --git a/app/src/main/java/edu/team08/infinitegallery/trashbin/TrashAdapter.java b/app/src/main/java/edu/team08/infinitegallery/trashbin/TrashAdapter.java
@@ -78,7 +78,7 @@ public void onBindViewHolder(@NonNull TrashAdapter.ViewHolder holder, @SuppressL
         // Set item to the ImageView using Glide library
         // holder.imageItem.setImageDrawable(Drawable.createFromPath(picturePath));
         Glide.with(context)
-                .load(trash)
+                .load(trashBinManager.decryptPhoto(trash))
                 .placeholder(R.drawable.img_image_placeholder)
                 .into(holder.imageItem);
         holder.imageItem.setOnClickListener(new View.OnClickListener() {
@@ -121,11 +121,6 @@ public void onClick(View v) {
         }
     }
 
-    private void addRemainingTime() {
-        RelativeLayout customLayout = new RelativeLayout(context);
-
-    }
-
     @Override
     public int getItemCount() {
         return trashPhotos.size();
diff --git a/app/src/main/java/edu/team08/infinitegallery/trashbin/TrashBinActivity.java b/app/src/main/java/edu/team08/infinitegallery/trashbin/TrashBinActivity.java
@@ -24,6 +24,7 @@
 public class TrashBinActivity extends AppCompatActivity {
     private int spanCount = 4;
     File[] trashFiles;
+    File[] trashPhotos;
     private TrashBinManager trashBinManager;
     TrashAdapter trashAdapter;
     RecyclerView photosRecView;
@@ -38,15 +39,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         trashBinManager = new TrashBinManager(this);
         trashFiles = null;
+        trashPhotos = null;
         photosRecView = findViewById(R.id.recViewTrash);
         viewSwitcher = findViewById(R.id.viewSwitcher);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        trashBinManager.checkAndCleanTrashBin();
-        trashFiles = trashBinManager.getTrashFiles();
+        trashFiles = trashBinManager.checkAndCleanTrashBin().toArray(new File[0]);
         if (trashFiles.length > 0) {
             if (photosRecView.getId() == viewSwitcher.getNextView().getId()) {
                 viewSwitcher.showNext();
diff --git a/app/src/main/java/edu/team08/infinitegallery/trashbin/TrashBinManager.java b/app/src/main/java/edu/team08/infinitegallery/trashbin/TrashBinManager.java
@@ -5,12 +5,21 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 
+import androidx.security.crypto.EncryptedFile;
+import androidx.security.crypto.MasterKey;
+
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.channels.FileChannel;
+import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -65,6 +74,70 @@ public void moveFile(File src, File dst) throws IOException {
         src.delete();
     }
 
+    private void encrypt(File src, File dst) throws GeneralSecurityException, IOException {
+        if (!dst.getParentFile().exists()) {
+            dst.getParentFile().mkdirs();
+        }
+
+        if (dst.exists()) {
+            // If the destination file already exists, rename it with a postfix
+            dst = getUniqueDestination(dst);
+        }
+
+        MasterKey mainKey = new MasterKey.Builder(context)
+                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                .build();
+
+        EncryptedFile encryptedFile = new EncryptedFile.Builder(context,
+                dst,
+                mainKey,
+                EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB
+        ).build();
+
+        InputStream inputStream = new FileInputStream(src);
+        OutputStream outputStream = encryptedFile.openFileOutput();
+        // Write data from source file to encrypted output stream
+        byte[] buffer = new byte[4096];
+        int bytesRead;
+        while ((bytesRead = inputStream.read(buffer)) != -1) {
+            outputStream.write(buffer, 0, bytesRead);
+        }
+
+        inputStream.close();
+        outputStream.flush();
+        outputStream.close();
+
+    }
+
+    private void decrypt(final File src, File dst) throws GeneralSecurityException, IOException {
+        dst = getUniqueDestination(dst);
+
+        MasterKey mainKey = new MasterKey.Builder(context)
+                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                .build();
+
+        EncryptedFile encryptedFile = new EncryptedFile.Builder(context,
+                src,
+                mainKey,
+                EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB
+        ).build();
+
+        InputStream inputStream = encryptedFile.openFileInput();
+        OutputStream outputStream = new FileOutputStream(dst);
+
+        // Write data from encrypted source file to output stream
+        byte[] buffer = new byte[4096];
+        int bytesRead;
+        while ((bytesRead = inputStream.read(buffer)) != -1) {
+            outputStream.write(buffer, 0, bytesRead);
+        }
+
+        inputStream.close();
+        outputStream.flush();
+        outputStream.close();
+
+    }
+
     public void copyFile(File src, File dst) throws IOException {
         if (!dst.getParentFile().exists()) {
             dst.getParentFile().mkdirs();
@@ -146,7 +219,14 @@ public void moveToTrash(File photo) throws IOException {
         values.put("DELETE_DATE", System.currentTimeMillis());
         db.insert(TRASH_BIN_TABLE_NAME, null, values);
 
-        moveFile(photo, trash);
+        //moveFile(photo, trash);
+        try {
+            encrypt(photo, trash);
+            photo.delete();
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        }
+
     }
 
     public void permanentDelete(File trash) {
@@ -185,7 +265,12 @@ public String restorePhoto(File trash) throws IOException {
 
         if (originalPath != null) {
             File original = new File(originalPath);
-            moveFile(trash, original);
+            try {
+                decrypt(trash, original);
+                trash.delete();
+            } catch (GeneralSecurityException e) {
+                throw new RuntimeException(e);
+            }
         } else {}
 
         return originalPath;
@@ -238,17 +323,52 @@ public int[] getDaysRemain(File[] trashFiles) {
     }
 
 
-    public void checkAndCleanTrashBin() {
+    public List<File> checkAndCleanTrashBin() {
         File[] trashFiles = getTrashFiles();
 
         int[] daysRemain = getDaysRemain(trashFiles);
+        ArrayList returnList = new ArrayList<File>();
 
         for (int i = 0; i < daysRemain.length; i++) {
-            if (daysRemain[i] < 0) {
+            if (daysRemain[i] < 0 || !trashFiles[i].exists()) {
                 permanentDelete(trashFiles[i]);
                 trashFiles[i] = null;
+            } else {
+                returnList.add(trashFiles[i]);
             }
         }
+        return returnList;
+
+    }
+
+    public Bitmap decryptPhoto(File src) {
+
+        Bitmap myBitmap = null;
+        MasterKey mainKey = null;
+        try {
+            mainKey = new MasterKey.Builder(context)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build();
+
+            EncryptedFile encryptedFile = new EncryptedFile.Builder(context,
+                    src,
+                    mainKey,
+                    EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB
+            ).build();
+
+            InputStream inputStream = encryptedFile.openFileInput();
+            // Convert InputStream to Bitmap
+            myBitmap = BitmapFactory.decodeStream(inputStream);
+
+        } catch (GeneralSecurityException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
 
+
+        return myBitmap;
     }
+
 }
