diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-28 18:50:20 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-28 18:50:20 +0200 |
commit | c630fe651f0fe7e4bf0cc8155ede6bd4f26df157 (patch) | |
tree | a30a3bc6556be10a6661777c7b62b817cf9bff54 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | 0e613aff2e617ca12c1b2e1032b21334c2ca674a (diff) | |
download | open-keychain-c630fe651f0fe7e4bf0cc8155ede6bd4f26df157.tar.gz open-keychain-c630fe651f0fe7e4bf0cc8155ede6bd4f26df157.tar.bz2 open-keychain-c630fe651f0fe7e4bf0cc8155ede6bd4f26df157.zip |
use annotations for android sdk constraints
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
3 files changed, 10 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index a0650f8b1..32f7c5bd5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import android.annotation.TargetApi; import android.app.Activity; import android.content.ClipDescription; import android.content.Context; @@ -36,6 +37,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Parcelable; import android.support.v7.widget.DefaultItemAnimator; @@ -249,6 +251,7 @@ public class DecryptListFragment } } + @TargetApi(VERSION_CODES.KITKAT) private void saveFileDialog(InputDataResult result, int index) { Activity activity = getActivity(); @@ -265,8 +268,8 @@ public class DecryptListFragment filename = "decrypted" + (ext != null ? "."+ext : ""); } - FileHelper.saveDocument(this, filename, metadata.getMimeType(), - REQUEST_CODE_OUTPUT); + // requires >=kitkat + FileHelper.saveDocument(this, filename, metadata.getMimeType(), REQUEST_CODE_OUTPUT); } private void saveFile(Uri saveUri) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index 0e357cfcd..dab451537 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import android.annotation.TargetApi; import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; @@ -35,6 +36,7 @@ import android.graphics.Bitmap; import android.graphics.Point; import android.net.Uri; import android.os.Build; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.support.v4.app.FragmentActivity; import android.support.v7.widget.DefaultItemAnimator; @@ -217,6 +219,7 @@ public class EncryptFilesFragment mSelectedFiles.requestFocus(); } + @TargetApi(VERSION_CODES.KITKAT) private void showOutputFileDialog() { if (mFilesAdapter.getModelCount() != 1) { throw new IllegalStateException(); @@ -225,8 +228,7 @@ public class EncryptFilesFragment String targetName = (mEncryptFilenames ? "1" : FileHelper.getFilename(getActivity(), model.inputUri)) + (mUseArmor ? Constants.FILE_EXTENSION_ASC : Constants.FILE_EXTENSION_PGP_MAIN); - FileHelper.saveDocument(this, targetName, - REQUEST_CODE_OUTPUT); + FileHelper.saveDocument(this, targetName, REQUEST_CODE_OUTPUT); } public void addFile(Intent data) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java index 44323543f..a320ea3b2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java @@ -133,10 +133,7 @@ public class LinkedIdCreateHttpsStep2Fragment extends LinkedIdCreateFinalFragmen String targetName = "pgpkey.txt"; // TODO: not supported on Android < 4.4 - FileHelper.saveDocument(this, - targetName, - "text/plain", - REQUEST_CODE_OUTPUT); + FileHelper.saveDocument(this, targetName, "text/plain", REQUEST_CODE_OUTPUT); } private void saveFile(Uri uri) { |