From c95fa9fdc1d0eefe2b29fc2b1a176fa3a7b3d3b3 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Thu, 18 Jun 2015 16:35:57 +0530 Subject: renamed to clarify necessity for two install dialog fragments --- .../keychain/ui/dialog/InstallDialogFragment.java | 75 ---------------------- .../ui/dialog/SupportInstallDialogFragment.java | 75 ++++++++++++++++++++++ .../keychain/util/orbot/OrbotHelper.java | 6 +- 3 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java deleted file mode 100644 index 7bfd940e6..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2012-2014 Dominik Schürmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.ui.dialog; - -import android.app.Dialog; -import android.os.Bundle; -import android.os.Messenger; -import android.support.v4.app.DialogFragment; - -import org.sufficientlysecure.keychain.ui.util.InstallDialogFragmentHelper; - -public class InstallDialogFragment extends DialogFragment { - - public static final int MESSAGE_MIDDLE_CLICKED = 1; - - /** - * Creates a dialog which prompts the user to install an application. Consists of two default buttons ("Install" - * and "Cancel") and an optional third button. Callbacks are provided only for the middle button, if set. - * - * @param messenger required only for callback from middle button if it has been set - * @param title - * @param message content of dialog - * @param packageToInstall package name of application to install - * @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, - String packageToInstall, int middleButton, boolean - useMiddleButton) { - InstallDialogFragment frag = new InstallDialogFragment(); - Bundle args = new Bundle(); - - InstallDialogFragmentHelper.wrapIntoArgs(messenger, title, message, packageToInstall, middleButton, - useMiddleButton, args); - - frag.setArguments(args); - - return frag; - } - - /** - * To create a DialogFragment with only two buttons - * - * @param title - * @param message - * @param packageToInstall - * @return - */ - public static InstallDialogFragment newInstance(int title, int message, - String packageToInstall) { - return newInstance(null, title, message, packageToInstall, -1, false); - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - - return InstallDialogFragmentHelper.getInstallDialogFromArgs(getArguments(), getActivity(), - MESSAGE_MIDDLE_CLICKED); - } -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java new file mode 100644 index 000000000..36ca13247 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SupportInstallDialogFragment.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2012-2014 Dominik Schürmann + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.ui.dialog; + +import android.app.Dialog; +import android.os.Bundle; +import android.os.Messenger; +import android.support.v4.app.DialogFragment; + +import org.sufficientlysecure.keychain.ui.util.InstallDialogFragmentHelper; + +public class SupportInstallDialogFragment extends DialogFragment { + + public static final int MESSAGE_MIDDLE_CLICKED = 1; + + /** + * Creates a dialog which prompts the user to install an application. Consists of two default buttons ("Install" + * and "Cancel") and an optional third button. Callbacks are provided only for the middle button, if set. + * + * @param messenger required only for callback from middle button if it has been set + * @param title + * @param message content of dialog + * @param packageToInstall package name of application to install + * @param middleButton if not null, adds a third button to the app with a call back + * @return The dialog to display + */ + public static SupportInstallDialogFragment newInstance(Messenger messenger, int title, int message, + String packageToInstall, int middleButton, boolean + useMiddleButton) { + SupportInstallDialogFragment frag = new SupportInstallDialogFragment(); + Bundle args = new Bundle(); + + InstallDialogFragmentHelper.wrapIntoArgs(messenger, title, message, packageToInstall, middleButton, + useMiddleButton, args); + + frag.setArguments(args); + + return frag; + } + + /** + * To create a DialogFragment with only two buttons + * + * @param title + * @param message + * @param packageToInstall + * @return + */ + public static SupportInstallDialogFragment newInstance(int title, int message, + String packageToInstall) { + return newInstance(null, title, message, packageToInstall, -1, false); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + + return InstallDialogFragmentHelper.getInstallDialogFromArgs(getArguments(), getActivity(), + MESSAGE_MIDDLE_CLICKED); + } +} 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); } -- cgit v1.2.3