diff options
Diffstat (limited to 'OpenKeychain/src/main')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java) | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java index 7bfd940e6..36ca13247 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java @@ -24,7 +24,7 @@ import android.support.v4.app.DialogFragment; import org.sufficientlysecure.keychain.ui.util.InstallDialogFragmentHelper; -public class InstallDialogFragment extends DialogFragment { +public class SupportInstallDialogFragment extends DialogFragment { public static final int MESSAGE_MIDDLE_CLICKED = 1; @@ -39,10 +39,10 @@ public class InstallDialogFragment extends DialogFragment { * @param middleButton if not null, adds a third button to the app with a call back * @return The dialog to display */ - public static InstallDialogFragment newInstance(Messenger messenger, int title, int message, + public static SupportInstallDialogFragment newInstance(Messenger messenger, int title, int message, String packageToInstall, int middleButton, boolean useMiddleButton) { - InstallDialogFragment frag = new InstallDialogFragment(); + SupportInstallDialogFragment frag = new SupportInstallDialogFragment(); Bundle args = new Bundle(); InstallDialogFragmentHelper.wrapIntoArgs(messenger, title, message, packageToInstall, middleButton, @@ -61,7 +61,7 @@ public class InstallDialogFragment extends DialogFragment { * @param packageToInstall * @return */ - public static InstallDialogFragment newInstance(int title, int message, + public static SupportInstallDialogFragment newInstance(int title, int message, String packageToInstall) { return newInstance(null, title, message, packageToInstall, -1, false); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java index b5cd0806b..d371ec5cd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/orbot/OrbotHelper.java @@ -59,7 +59,7 @@ import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentActivity; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.dialog.InstallDialogFragment; +import org.sufficientlysecure.keychain.ui.dialog.SupportInstallDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.OrbotStartDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.PreferenceInstallDialogFragment; import org.sufficientlysecure.keychain.util.Preferences; @@ -108,12 +108,12 @@ public class OrbotHelper { } public static DialogFragment getInstallDialogFragment() { - return InstallDialogFragment.newInstance(R.string.orbot_install_dialog_title, + return SupportInstallDialogFragment.newInstance(R.string.orbot_install_dialog_title, R.string.orbot_install_dialog_content, ORBOT_PACKAGE_NAME); } public static DialogFragment getInstallDialogFragmentWithThirdButton(Messenger messenger, int middleButton) { - return InstallDialogFragment.newInstance(messenger, R.string.orbot_install_dialog_title, + return SupportInstallDialogFragment.newInstance(messenger, R.string.orbot_install_dialog_title, R.string.orbot_install_dialog_content, ORBOT_PACKAGE_NAME, middleButton, true); } |