stop multiple threads to load image

Author: katcom

app/src/main/java/com/katcom/androidFileVault/PreviewManager.java

@@ -50,13 +50,13 @@ public Bitmap getPreview(ProtectedFile file,int sizeX,int sizeY){
                 in = vault.getDecryptedInputStream(file);
                 //in.close();
                 Bitmap preview = BitmapFactory.decodeStream(in,null,options);
-
+                return preview;
                 // If loading with options succeed, return the image
-                if(preview != null) return preview;
+                //if(preview != null) return preview;
 
                 // If failed to load the image with options, drop the options and load it again
-                in = vault.getDecryptedInputStream(file);
-                return BitmapFactory.decodeStream(in);
+                //in = vault.getDecryptedInputStream(file);
+                //return BitmapFactory.decodeStream(in);
 
             } catch (UnrecoverableEntryException | NoSuchAlgorithmException | KeyStoreException | IOException e) {
                 Log.e(TAG,e.toString());

app/src/main/java/com/katcom/androidFileVault/VaultFragment.java

@@ -305,18 +305,18 @@ private void saveTempPictureUri(Uri uri) {
      */
     private void loadPreviewData(){
 
-        Executor executor = getCacheExecutor();
+        //Executor executor = Executors.newFixedThreadPool(30);
 
         for(ProtectedFile file:mFiles){
-            /*Log.v(TAG,"LOADING PREVIEW"+file.getFilename());
+            Log.v(TAG,"LOADING PREVIEW"+file.getFilename());
             Bitmap preview = previewManager.getPreview(file,120,120);
             file.setPreview(preview);
             if(file.getPreview() != null){
                 Log.v(TAG,"Done Loading preview on background for : "+file.getFilename());
             }else{
                 Log.v(TAG,"Failed Loading preview on background for : "+file.getFilename());
-            }**/
-            new FetchSinglePreviewImage().executeOnExecutor(executor,file);
+            }
+            //new FetchSinglePreviewImage().executeOnExecutor(executor,file);
         };
     }
 
@@ -518,7 +518,7 @@ protected ProtectedFile doInBackground(ProtectedFile... protectedFiles) {
             //Bitmap preview = mVault.getPreview(file,120,120);
             Log.v(TAG,"Loading preview on background for : "+file.getFilename());
             Bitmap preview = previewManager.getPreview(file,120,120);
-            
+
             return file;
         }
 

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">图库与隐私</string>
+    <string name="vault_1_button">打开文件库</string>
+    <string name="export_selected_file">导出所选文件</string>
+    <string name="share_file">分享文件</string>
+    <string name="export_all_files">打包导出所有文件</string>
+    <string name="share_all_files">分享所有文件</string>
+    <string name="latest">最近</string>
+    <string name="star">喜爱的</string>
+    <string name="login">登录</string>
+    <string name="password_hint">请输入密码</string>
+    <string name="please_set_password">请输入一个登录密码</string>
+    <string name="next_move_set_password">下一步</string>
+    <string name="previous_move_set_password">上一步</string>
+    <string name="two_password_not_match">两次输入的密码不匹配，请重新输入</string>
+    <string name="two_password_not_match_title">密码不正确</string>
+    <string name="enter_password_again">再次输入</string>
+    <string name="search">搜索</string>
+    <string name="clear_search">清除</string>
+    <string name="string_export">导出</string>
+    <string name="string_share">分享</string>
+    <string name="take_photo">拍照</string>
+
+</resources>