reformat code

4 files changed, 119 insertions, 116 deletions

diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml
index 780436aaa..dcce3cda3 100644
--- a/src/playstore/AndroidManifest.xml
+++ b/src/playstore/AndroidManifest.xml
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    package="de.pixart.messenger"
+<manifest package="de.pixart.messenger"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <permission android:name="de.pixart.messenger.permission.C2D_MESSAGE"
-                android:protectionLevel="signature"/>
-    <uses-permission android:name="de.pixart.messenger.permission.C2D_MESSAGE"/>
+    <permission
+        android:name="de.pixart.messenger.permission.C2D_MESSAGE"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="de.pixart.messenger.permission.C2D_MESSAGE" />
 
     <application>
 
         <receiver
             android:name="com.google.android.gms.gcm.GcmReceiver"
             android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND" >
+            android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
                 <category android:name="com.example.gcm" />
             </intent-filter>
         </receiver>
+
         <service
             android:name=".services.PushMessageReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </service>
 
-        <service android:name=".services.InstanceIdService" android:exported="false">
+        <service
+            android:name=".services.InstanceIdService"
+            android:exported="false">
             <intent-filter>
-                <action android:name="com.google.android.gms.iid.InstanceID"/>
+                <action android:name="com.google.android.gms.iid.InstanceID" />
             </intent-filter>
         </service>
     </application>
diff --git a/src/playstore/java/de/pixart/messenger/services/InstanceIdService.java b/src/playstore/java/de/pixart/messenger/services/InstanceIdService.java
index c73652ba6..e97d7181a 100644
--- a/src/playstore/java/de/pixart/messenger/services/InstanceIdService.java
+++ b/src/playstore/java/de/pixart/messenger/services/InstanceIdService.java
@@ -6,10 +6,10 @@ import com.google.android.gms.iid.InstanceIDListenerService;
 
 public class InstanceIdService extends InstanceIDListenerService {
 
-	@Override
-	public void onTokenRefresh() {
-		Intent intent = new Intent(this, XmppConnectionService.class);
-		intent.setAction(XmppConnectionService.ACTION_GCM_TOKEN_REFRESH);
-		startService(intent);
-	}
+    @Override
+    public void onTokenRefresh() {
+        Intent intent = new Intent(this, XmppConnectionService.class);
+        intent.setAction(XmppConnectionService.ACTION_GCM_TOKEN_REFRESH);
+        startService(intent);
+    }
 }
diff --git a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
index 0ab9ba5ac..9680a65c2 100644
--- a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
+++ b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
@@ -21,98 +21,98 @@ import de.pixart.messenger.xmpp.stanzas.IqPacket;
 
 public class PushManagementService {
 
-	private static final String APP_SERVER = "push.siacs.eu";
-
-	protected final XmppConnectionService mXmppConnectionService;
-
-	public PushManagementService(XmppConnectionService service) {
-		this.mXmppConnectionService = service;
-	}
-
-	public void registerPushTokenOnServer(final Account account) {
-		Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": has push support");
-		retrieveGcmInstanceToken(new OnGcmInstanceTokenRetrieved() {
-			@Override
-			public void onGcmInstanceTokenRetrieved(String token) {
-				try {
-					final String deviceId = Settings.Secure.getString(mXmppConnectionService.getContentResolver(), Settings.Secure.ANDROID_ID);
-					IqPacket packet = mXmppConnectionService.getIqGenerator().pushTokenToAppServer(Jid.fromString(APP_SERVER), token, deviceId);
-					mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
-						@Override
-						public void onIqPacketReceived(Account account, IqPacket packet) {
-							Element command = packet.findChild("command","http://jabber.org/protocol/commands");
-							if (packet.getType() == IqPacket.TYPE.RESULT && command != null) {
-								Element x = command.findChild("x","jabber:x:data");
-								if (x != null) {
-									Data data = Data.parse(x);
-									try {
-										String node = data.getValue("node");
-										String secret = data.getValue("secret");
-										Jid jid = Jid.fromString(data.getValue("jid"));
-										if (node != null && secret != null) {
-											enablePushOnServer(account, jid, node, secret);
-										}
-									} catch (InvalidJidException e) {
-										e.printStackTrace();
-									}
-								}
-							} else {
-								Log.d(Config.LOGTAG,account.getJid().toBareJid()+": invalid response from app server");
-							}
-						}
-					});
-				} catch (InvalidJidException ignored) {
-
-				}
-			}
-		});
-	}
-
-	private void enablePushOnServer(final Account account, final Jid jid, final String node, final String secret) {
-		IqPacket enable = mXmppConnectionService.getIqGenerator().enablePush(jid, node, secret);
-		mXmppConnectionService.sendIqPacket(account, enable, new OnIqPacketReceived() {
-			@Override
-			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": successfully enabled push on server");
-				} else if (packet.getType() == IqPacket.TYPE.ERROR) {
-					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": enabling push on server failed");
-				}
-			}
-		});
-	}
-
-	private void retrieveGcmInstanceToken(final OnGcmInstanceTokenRetrieved instanceTokenRetrieved) {
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				InstanceID instanceID = InstanceID.getInstance(mXmppConnectionService);
-				try {
-					String token = instanceID.getToken(mXmppConnectionService.getString(R.string.gcm_defaultSenderId), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
-					instanceTokenRetrieved.onGcmInstanceTokenRetrieved(token);
-				} catch (Exception e) {
-					Log.d(Config.LOGTAG,"unable to get push token");
-				}
-			}
-		}).start();
-
-	}
-
-
-	public boolean available(Account account) {
-		final XmppConnection connection = account.getXmppConnection();
-		return connection != null && connection.getFeatures().push() && playServicesAvailable();
-	}
-
-	private boolean playServicesAvailable() {
-		return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS;
-	}
-
-	public boolean isStub() {
-		return false;
-	}
-
-	interface OnGcmInstanceTokenRetrieved {
-		void onGcmInstanceTokenRetrieved(String token);
-	}
+    private static final String APP_SERVER = "push.siacs.eu";
+
+    protected final XmppConnectionService mXmppConnectionService;
+
+    public PushManagementService(XmppConnectionService service) {
+        this.mXmppConnectionService = service;
+    }
+
+    public void registerPushTokenOnServer(final Account account) {
+        Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": has push support");
+        retrieveGcmInstanceToken(new OnGcmInstanceTokenRetrieved() {
+            @Override
+            public void onGcmInstanceTokenRetrieved(String token) {
+                try {
+                    final String deviceId = Settings.Secure.getString(mXmppConnectionService.getContentResolver(), Settings.Secure.ANDROID_ID);
+                    IqPacket packet = mXmppConnectionService.getIqGenerator().pushTokenToAppServer(Jid.fromString(APP_SERVER), token, deviceId);
+                    mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
+                        @Override
+                        public void onIqPacketReceived(Account account, IqPacket packet) {
+                            Element command = packet.findChild("command", "http://jabber.org/protocol/commands");
+                            if (packet.getType() == IqPacket.TYPE.RESULT && command != null) {
+                                Element x = command.findChild("x", "jabber:x:data");
+                                if (x != null) {
+                                    Data data = Data.parse(x);
+                                    try {
+                                        String node = data.getValue("node");
+                                        String secret = data.getValue("secret");
+                                        Jid jid = Jid.fromString(data.getValue("jid"));
+                                        if (node != null && secret != null) {
+                                            enablePushOnServer(account, jid, node, secret);
+                                        }
+                                    } catch (InvalidJidException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            } else {
+                                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": invalid response from app server");
+                            }
+                        }
+                    });
+                } catch (InvalidJidException ignored) {
+
+                }
+            }
+        });
+    }
+
+    private void enablePushOnServer(final Account account, final Jid jid, final String node, final String secret) {
+        IqPacket enable = mXmppConnectionService.getIqGenerator().enablePush(jid, node, secret);
+        mXmppConnectionService.sendIqPacket(account, enable, new OnIqPacketReceived() {
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": successfully enabled push on server");
+                } else if (packet.getType() == IqPacket.TYPE.ERROR) {
+                    Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": enabling push on server failed");
+                }
+            }
+        });
+    }
+
+    private void retrieveGcmInstanceToken(final OnGcmInstanceTokenRetrieved instanceTokenRetrieved) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                InstanceID instanceID = InstanceID.getInstance(mXmppConnectionService);
+                try {
+                    String token = instanceID.getToken(mXmppConnectionService.getString(R.string.gcm_defaultSenderId), GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
+                    instanceTokenRetrieved.onGcmInstanceTokenRetrieved(token);
+                } catch (Exception e) {
+                    Log.d(Config.LOGTAG, "unable to get push token");
+                }
+            }
+        }).start();
+
+    }
+
+
+    public boolean available(Account account) {
+        final XmppConnection connection = account.getXmppConnection();
+        return connection != null && connection.getFeatures().push() && playServicesAvailable();
+    }
+
+    private boolean playServicesAvailable() {
+        return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS;
+    }
+
+    public boolean isStub() {
+        return false;
+    }
+
+    interface OnGcmInstanceTokenRetrieved {
+        void onGcmInstanceTokenRetrieved(String token);
+    }
 }
diff --git a/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java b/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java
index 0b99cfd9f..33c5119e0 100644
--- a/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java
+++ b/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java
@@ -7,11 +7,11 @@ import com.google.android.gms.gcm.GcmListenerService;
 
 public class PushMessageReceiver extends GcmListenerService {
 
-	@Override
-	public void onMessageReceived(String from, Bundle data) {
-		Intent intent = new Intent(this, XmppConnectionService.class);
-		intent.setAction(XmppConnectionService.ACTION_GCM_MESSAGE_RECEIVED);
-		intent.replaceExtras(data);
-		startService(intent);
-	}
+    @Override
+    public void onMessageReceived(String from, Bundle data) {
+        Intent intent = new Intent(this, XmppConnectionService.class);
+        intent.setAction(XmppConnectionService.ACTION_GCM_MESSAGE_RECEIVED);
+        intent.replaceExtras(data);
+        startService(intent);
+    }
 }