aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-16 14:36:18 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-03 20:46:15 +0530
commit2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8 (patch)
tree3b6e9eb10f21be97e94582616e309c230ae5f327 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
parentf6d0f88ac973328b3b7a9d426214beb76efefb3f (diff)
downloadopen-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.tar.gz
open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.tar.bz2
open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.zip
ensuring code style is preserved
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java3
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java11
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java1
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PreferenceInstallDialogFragment.java14
4 files changed, 16 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
index 056d82fd3..e5ab3a228 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddEditKeyserverDialogFragment.java
@@ -59,14 +59,13 @@ import org.sufficientlysecure.keychain.util.TlsHelper;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
+import java.net.Proxy;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import javax.net.ssl.HttpsURLConnection;
import java.io.IOException;
-import java.net.*;
-import javax.net.ssl.HttpsURLConnection;
public class AddEditKeyserverDialogFragment extends DialogFragment implements OnEditorActionListener {
private static final String ARG_MESSENGER = "arg_messenger";
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
index 01ff4715d..7b3f9ad28 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/InstallDialogFragment.java
@@ -48,15 +48,16 @@ public class InstallDialogFragment extends DialogFragment {
* 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 messenger required only for callback from middle button if it has been set
* @param title
- * @param message content of dialog
+ * @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
+ * @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) {
+ String packageToInstall, int middleButton, boolean
+ useMiddleButton) {
InstallDialogFragment frag = new InstallDialogFragment();
Bundle args = new Bundle();
args.putParcelable(ARG_MESSENGER, messenger);
@@ -125,7 +126,7 @@ public class InstallDialogFragment extends DialogFragment {
@Override
public void onClick(DialogInterface dialog, int which) {
Message msg = new Message();
- msg.what=MESSAGE_MIDDLE_CLICKED;
+ msg.what = MESSAGE_MIDDLE_CLICKED;
try {
messenger.send(msg);
} catch (RemoteException e) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java
index e9092b14a..4736eddca 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/OrbotStartDialogFragment.java
@@ -25,6 +25,7 @@ import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
import android.support.v4.app.DialogFragment;
+
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.util.Log;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PreferenceInstallDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PreferenceInstallDialogFragment.java
index 8236ff9d7..b9b4da83a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PreferenceInstallDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PreferenceInstallDialogFragment.java
@@ -27,6 +27,7 @@ import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
import android.app.DialogFragment;
+
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.util.Log;
@@ -47,15 +48,16 @@ public class PreferenceInstallDialogFragment extends DialogFragment {
* 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 messenger required only for callback from middle button if it has been set
* @param title
- * @param message content of dialog
+ * @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
+ * @param middleButton if not null, adds a third button to the app with a call back
* @return The dialog to display
*/
public static PreferenceInstallDialogFragment newInstance(Messenger messenger, int title, int message,
- String packageToInstall, int middleButton, boolean useMiddleButton) {
+ String packageToInstall, int middleButton, boolean
+ useMiddleButton) {
PreferenceInstallDialogFragment frag = new PreferenceInstallDialogFragment();
Bundle args = new Bundle();
args.putParcelable(ARG_MESSENGER, messenger);
@@ -80,7 +82,7 @@ public class PreferenceInstallDialogFragment extends DialogFragment {
* @return
*/
public static PreferenceInstallDialogFragment newInstance(int title, int message,
- String packageToInstall) {
+ String packageToInstall) {
return newInstance(null, title, message, packageToInstall, -1, false);
}
@@ -125,7 +127,7 @@ public class PreferenceInstallDialogFragment extends DialogFragment {
@Override
public void onClick(DialogInterface dialog, int which) {
Message msg = new Message();
- msg.what=MESSAGE_MIDDLE_CLICKED;
+ msg.what = MESSAGE_MIDDLE_CLICKED;
try {
messenger.send(msg);
} catch (RemoteException e) {