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

instrument: adapt to new decrypt file dialog, and some minor fixes

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-23 00:00:19 +02:00
parent 4826e0a8c8
commit 558cc6befc
6 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui;
import java.util.ArrayList;
import android.app.Activity;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
@@ -152,7 +153,10 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager.
final ImportKeyResult result =
returnData.getParcelable(OperationResult.EXTRA_RESULT);
result.createNotify(getActivity()).show();
Activity activity = getActivity();
if (result != null && activity != null) {
result.createNotify(activity).show();
}
getLoaderManager().restartLoader(LOADER_ID_UNIFIED, null, DecryptFragment.this);
}

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

@@ -28,15 +28,10 @@ import android.support.v4.app.Fragment;
import android.view.View;
import android.widget.Toast;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.intents.OpenKeychainIntents;
import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.Notify.Style;
import org.sufficientlysecure.keychain.util.FileHelper;
import org.sufficientlysecure.keychain.util.Log;
public class DisplayTextActivity extends BaseActivity {

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
View File

@@ -19,7 +19,6 @@
package org.sufficientlysecure.keychain.ui;
import java.util.ArrayList;
import java.util.regex.Matcher;
import android.app.Activity;
@@ -152,7 +151,7 @@ public class EncryptDecryptOverviewFragment extends Fragment {
if (resultCode == Activity.RESULT_OK && data != null) {
Uri uri = data.getData();
if (uri == null) {
Notify.create(getActivity(), R.string.no_file_selected, Notify.Style.ERROR).show(this);
Notify.create(getActivity(), R.string.no_file_selected, Notify.Style.ERROR).show();
return;
}