cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup FileHelper

Browse Source
This commit is contained in:
Dominik Schürmann
2015-09-24 23:15:19 +02:00
parent 63f1b84914
commit 756ee28fb0
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@@ -265,8 +265,8 @@ public class DecryptListFragment
filename = "decrypted" + (ext != null ? "."+ext : ""); filename = "decrypted" + (ext != null ? "."+ext : "");
} }
FileHelper.saveDocument(this, filename, null, metadata.getMimeType(), FileHelper.saveDocument(this, filename, metadata.getMimeType(),
R.string.title_decrypt_to_file, R.string.specify_file_to_decrypt_to, REQUEST_CODE_OUTPUT); REQUEST_CODE_OUTPUT);
} }
private void saveFile(Uri saveUri) { private void saveFile(Uri saveUri) {

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@@ -224,9 +224,8 @@ public class EncryptFilesFragment
String targetName = String targetName =
(mEncryptFilenames ? "1" : FileHelper.getFilename(getActivity(), model.inputUri)) (mEncryptFilenames ? "1" : FileHelper.getFilename(getActivity(), model.inputUri))
+ (mUseArmor ? Constants.FILE_EXTENSION_ASC : Constants.FILE_EXTENSION_PGP_MAIN); + (mUseArmor ? Constants.FILE_EXTENSION_ASC : Constants.FILE_EXTENSION_PGP_MAIN);
Uri inputUri = model.inputUri; FileHelper.saveDocument(this, targetName,
FileHelper.saveDocument(this, targetName, inputUri, REQUEST_CODE_OUTPUT);
R.string.title_encrypt_to_file, R.string.specify_file_to_encrypt_to, REQUEST_CODE_OUTPUT);
} }
public void addFile(Intent data) { public void addFile(Intent data) {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
View File

@@ -27,7 +27,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.linked.resources.GenericHttpsResource; import org.sufficientlysecure.keychain.linked.resources.GenericHttpsResource;
@@ -35,7 +34,6 @@ import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.ui.util.Notify.Style;
import org.sufficientlysecure.keychain.util.FileHelper; import org.sufficientlysecure.keychain.util.FileHelper;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.URI; import java.net.URI;
@@ -136,8 +134,8 @@ public class LinkedIdCreateHttpsStep2Fragment extends LinkedIdCreateFinalFragmen
// TODO: not supported on Android < 4.4 // TODO: not supported on Android < 4.4
FileHelper.saveDocument(this, FileHelper.saveDocument(this,
targetName, Uri.fromFile(new File(Constants.Path.APP_DIR, targetName)), targetName,
"text/plain", R.string.title_decrypt_to_file, R.string.specify_file_to_decrypt_to, "text/plain",
REQUEST_CODE_OUTPUT); REQUEST_CODE_OUTPUT);
} }

21
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
View File

@@ -74,24 +74,23 @@ import java.text.DecimalFormat;
public class FileHelper { public class FileHelper {
public static void openDocument(Fragment fragment, Uri last, String mimeType, boolean multiple, int requestCode) { public static void openDocument(Fragment fragment, Uri last, String mimeType, boolean multiple, int requestCode) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
openDocumentPreKitKat(fragment, last, mimeType, multiple, requestCode);
} else {
openDocumentKitKat(fragment, mimeType, multiple, requestCode); openDocumentKitKat(fragment, mimeType, multiple, requestCode);
} else {
openDocumentPreKitKat(fragment, last, mimeType, multiple, requestCode);
} }
} }
public static void saveDocument(Fragment fragment, String targetName, Uri inputUri, public static void saveDocument(Fragment fragment, String targetName, int requestCode) {
@StringRes int title, @StringRes int message, int requestCode) { saveDocument(fragment, targetName, "*/*", requestCode);
saveDocument(fragment, targetName, inputUri, "*/*", title, message, requestCode);
} }
public static void saveDocument(Fragment fragment, String targetName, Uri inputUri, String mimeType, public static void saveDocument(Fragment fragment, String targetName, String mimeType,
@StringRes int title, @StringRes int message, int requestCode) { int requestCode) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
throw new RuntimeException("saveDocument does not support Android < 4.4!");
} else {
saveDocumentKitKat(fragment, mimeType, targetName, requestCode); saveDocumentKitKat(fragment, mimeType, targetName, requestCode);
} else {
throw new RuntimeException("saveDocument does not support Android < 4.4!");
} }
} }