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

Merge remote-tracking branch 'origin/t/snackbar' into development

Browse Source 
Conflicts:
	OpenKeychain/build.gradle
This commit is contained in:
Dominik Schürmann
2015-01-29 09:55:09 +01:00
parent 81d4d31fd7 198ddfeff7
commit 5564f65a69
11 changed files with 370 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ExportHelper.java
View File

@@ -24,7 +24,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.Messenger;
import android.support.v7.app.ActionBarActivity;
import android.support.v4.app.FragmentActivity;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
@@ -40,9 +40,9 @@ import java.io.File;
public class ExportHelper {
protected File mExportFile;
ActionBarActivity mActivity;
FragmentActivity mActivity;
public ExportHelper(ActionBarActivity activity) {
public ExportHelper(FragmentActivity activity) {
super();
this.mActivity = activity;
}