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

compiles again

Browse Source
This commit is contained in:
Dominik Schürmann
2014-03-30 19:35:35 +02:00
parent 2947ab7e48
commit ccce28acdb
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@@ -313,7 +313,7 @@ public class DecryptActivity extends DrawerActivity implements DecryptSignatureR
if (path != null) { if (path != null) {
mInputFilename = path; mInputFilename = path;
mFilename.setText(mInputFilename); mFilename.setText(mInputFilename);
guessOutputFilename(); // guessOutputFilename();
// mSource.setInAnimation(null); // mSource.setInAnimation(null);
// mSource.setOutAnimation(null); // mSource.setOutAnimation(null);
// while (mSource.getCurrentView().getId() != R.id.sourceFile) { // while (mSource.getCurrentView().getId() != R.id.sourceFile) {
@@ -356,7 +356,7 @@ public class DecryptActivity extends DrawerActivity implements DecryptSignatureR
if (mDecryptTarget == Id.target.file) { if (mDecryptTarget == Id.target.file) {
String currentFilename = mFilename.getText().toString(); String currentFilename = mFilename.getText().toString();
if (mInputFilename == null || !mInputFilename.equals(currentFilename)) { if (mInputFilename == null || !mInputFilename.equals(currentFilename)) {
guessOutputFilename(); // guessOutputFilename();
} }
if (mInputFilename.equals("")) { if (mInputFilename.equals("")) {

12
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
View File

@@ -49,6 +49,8 @@ public class DecryptFileFragment extends Fragment {
private String mInputFilename = null; private String mInputFilename = null;
private String mOutputFilename = null; private String mOutputFilename = null;
private FileDialogFragment mFileDialog;
private static final int RESULT_CODE_FILE = 0x00007003; private static final int RESULT_CODE_FILE = 0x00007003;
@@ -71,15 +73,15 @@ public class DecryptFileFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.decrypt_file_fragment, container, false); View view = inflater.inflate(R.layout.decrypt_file_fragment, container, false);
mFilename = (EditText) findViewById(R.id.filename); mFilename = (EditText) view.findViewById(R.id.filename);
mBrowse = (BootstrapButton) findViewById(R.id.btn_browse); mBrowse = (BootstrapButton) view.findViewById(R.id.btn_browse);
mBrowse.setOnClickListener(new View.OnClickListener() { mBrowse.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
FileHelper.openFile(DecryptActivity.this, mFilename.getText().toString(), "*/*", FileHelper.openFile(getActivity(), mFilename.getText().toString(), "*/*",
RESULT_CODE_FILE); RESULT_CODE_FILE);
} }
}); });
mDeleteAfter = (CheckBox) findViewById(R.id.deleteAfterDecryption); mDeleteAfter = (CheckBox) view.findViewById(R.id.deleteAfterDecryption);
mDecryptButton = (BootstrapButton) view.findViewById(R.id.action_decrypt); mDecryptButton = (BootstrapButton) view.findViewById(R.id.action_decrypt);
mDecryptButton.setOnClickListener(new View.OnClickListener() { mDecryptButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
@@ -152,7 +154,7 @@ public class DecryptFileFragment extends Fragment {
getString(R.string.title_decrypt_to_file), getString(R.string.title_decrypt_to_file),
getString(R.string.specify_file_to_decrypt_to), mOutputFilename, null); getString(R.string.specify_file_to_decrypt_to), mOutputFilename, null);
mFileDialog.show(getSupportFragmentManager(), "fileDialog"); mFileDialog.show(getActivity().getSupportFragmentManager(), "fileDialog");
} }
} }