diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper')
2 files changed, 6 insertions, 14 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java index fee120273..b55075e6c 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java @@ -22,15 +22,14 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.util.Log; import android.app.Activity; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.View.OnClickListener; import android.widget.TextView; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockFragmentActivity; - public class ActionBarHelper { /** @@ -38,7 +37,7 @@ public class ActionBarHelper { * * @param activity */ - public static void setBackButton(SherlockFragmentActivity activity) { + public static void setBackButton(ActionBarActivity activity) { // set actionbar without home button if called from another app final ActionBar actionBar = activity.getSupportActionBar(); Log.d(Constants.TAG, "calling package (only set when using startActivityForResult)=" diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java index 9b817cb50..21676a2a7 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java @@ -34,17 +34,16 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.Messenger; +import android.support.v7.app.ActionBarActivity; import android.widget.Toast; -import com.actionbarsherlock.app.SherlockFragmentActivity; - public class ExportHelper { protected FileDialogFragment mFileDialog; protected String mExportFilename; - SherlockFragmentActivity activity; + ActionBarActivity activity; - public ExportHelper(SherlockFragmentActivity activity) { + public ExportHelper(ActionBarActivity activity) { super(); this.activity = activity; } @@ -63,9 +62,6 @@ public class ExportHelper { /** * Show dialog where to export keys - * - * @param keyRingMasterKeyId - * if -1 export all keys */ public void showExportKeysDialog(final Uri dataUri, final int keyType, final String exportFilename) { @@ -115,9 +111,6 @@ public class ExportHelper { /** * Export keys - * - * @param keyRingMasterKeyId - * if -1 export all keys */ public void exportKeys(Uri dataUri, int keyType) { Log.d(Constants.TAG, "exportKeys started"); |