# HG changeset patch # User Da Risk # Date 1434394701 -7200 # Node ID 401b33f78a4da6ef9c7d7ad30cb7124be31e3c1e # Parent 0af23b43e3ad68cb4acdf701428cf5849ab8468e Fix a lot of indentation issues with checkstyle diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/providers/AvatarProvider.java --- a/app/src/main/java/com/beem/project/beem/providers/AvatarProvider.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/providers/AvatarProvider.java Mon Jun 15 20:58:21 2015 +0200 @@ -66,7 +66,7 @@ /** The content uri of this provider. */ public static final Uri CONTENT_URI = - Uri.parse("content://com.beem.project.beem.providers.avatarprovider"); + Uri.parse("content://com.beem.project.beem.providers.avatarprovider"); /** The MIME type of a CONTENT_URI directory of Beem avatars. */ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.com.beem.project.beem.avatar"; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/service/BeemAvatarManager.java --- a/app/src/main/java/com/beem/project/beem/service/BeemAvatarManager.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/service/BeemAvatarManager.java Mon Jun 15 20:58:21 2015 +0200 @@ -80,7 +80,7 @@ * @param autoDownload tre to enable auto download of avatars */ public BeemAvatarManager(final Context ctx, final Connection con, final PepSubManager pepMgr, - final AvatarCache cache, final boolean autoDownload) { + final AvatarCache cache, final boolean autoDownload) { super(con, pepMgr, cache, autoDownload); mContext = ctx; } diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/service/BeemChatManager.java --- a/app/src/main/java/com/beem/project/beem/service/BeemChatManager.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/service/BeemChatManager.java Mon Jun 15 20:58:21 2015 +0200 @@ -96,7 +96,7 @@ private final Map mChats = new HashMap(); private final ChatListener mChatListener = new ChatListener(); private final RemoteCallbackList mRemoteChatCreationListeners = - new RemoteCallbackList(); + new RemoteCallbackList(); private final BeemService mService; private final Roster mRoster; private final ChatRosterListener mChatRosterListn = new ChatRosterListener(); @@ -283,15 +283,16 @@ */ private PendingIntent makeChatIntent(IChat chat) { Intent chatIntent = new Intent(mService, com.beem.project.beem.ui.Chat.class); - chatIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP - | Intent.FLAG_ACTIVITY_NEW_TASK); + chatIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT + | Intent.FLAG_ACTIVITY_SINGLE_TOP + | Intent.FLAG_ACTIVITY_NEW_TASK); try { chatIntent.setData(chat.getParticipant().toUri()); } catch (RemoteException e) { Log.e(TAG, e.getMessage()); } PendingIntent contentIntent = PendingIntent.getActivity(mService, 0, chatIntent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT); return contentIntent; } diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/service/ChatAdapter.java --- a/app/src/main/java/com/beem/project/beem/service/ChatAdapter.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/service/ChatAdapter.java Mon Jun 15 20:58:21 2015 +0200 @@ -256,7 +256,7 @@ try { FileWriter file = new FileWriter(filepath, true); String log = msg.getTimestamp() + " " + contactName + " " + msg.getBody() - + System.getProperty("line.separator"); + + System.getProperty("line.separator"); file.write(log); file.close(); } catch (IOException e) { @@ -332,13 +332,12 @@ if (mOtrSessionId != null && unencrypted != null && unencrypted.getBody() != null) { try { - String[] bodies = BeemOtrManager.getInstance().getOtrManager() .transformSending(mOtrSessionId, unencrypted.getBody()); - StringBuilder concatBody = new StringBuilder(); - for(String body: bodies) { - concatBody.append(body); - } + StringBuilder concatBody = new StringBuilder(); + for (String body: bodies) { + concatBody.append(body); + } Message result = new Message(unencrypted.getTo(), unencrypted.getType()); result.setBody(concatBody.toString()); return result; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/service/RosterAdapter.java --- a/app/src/main/java/com/beem/project/beem/service/RosterAdapter.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/service/RosterAdapter.java Mon Jun 15 20:58:21 2015 +0200 @@ -79,7 +79,7 @@ private static final String TAG = "RosterAdapter"; private final Roster mAdaptee; private final RemoteCallbackList mRemoteRosListeners = - new RemoteCallbackList(); + new RemoteCallbackList(); private final Map mDefaultStatusMessages; private final RosterListenerAdapter mRosterListener = new RosterListenerAdapter(); private Map mAvatarIdmap = new HashMap(); diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/service/XmppConnectionAdapter.java --- a/app/src/main/java/com/beem/project/beem/service/XmppConnectionAdapter.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/service/XmppConnectionAdapter.java Mon Jun 15 20:58:21 2015 +0200 @@ -121,7 +121,7 @@ private PepSubManager mPepManager; private SharedPreferences mPref; private final RemoteCallbackList mRemoteConnListeners = - new RemoteCallbackList(); + new RemoteCallbackList(); private final SubscribePacketListener mSubscribePacketListener = new SubscribePacketListener(); private final PingListener mPingListener = new PingListener(); @@ -137,8 +137,9 @@ * @param password password to use on connect * @param service the background service associated with the connection. */ - public XmppConnectionAdapter(final ConnectionConfiguration config, final String login, final String password, - final BeemService service) { + public XmppConnectionAdapter(final ConnectionConfiguration config, + final String login, final String password, + final BeemService service) { this(new XMPPConnection(config), login, password, service); } @@ -149,8 +150,9 @@ * @param password password to use on connect * @param service the background service associated with the connection. */ - public XmppConnectionAdapter(final String serviceName, final String login, final String password, - final BeemService service) { + public XmppConnectionAdapter(final String serviceName, + final String login, final String password, + final BeemService service) { this(new XMPPConnection(serviceName), login, password, service); } @@ -161,8 +163,9 @@ * @param password The password to use * @param service the background service associated with the connection. */ - public XmppConnectionAdapter(final XMPPConnection con, final String login, final String password, - final BeemService service) { + public XmppConnectionAdapter(final XMPPConnection con, + final String login, final String password, + final BeemService service) { mAdaptee = con; PrivacyListManager.getInstanceFor(mAdaptee); mLogin = login; @@ -204,8 +207,8 @@ try { //TODO NIKITA DOES SOME SHIT !!! Fix this monstruosity String str = mService.getResources().getString( - mService.getResources().getIdentifier(e.getXMPPError().getCondition().replace("-", "_"), - "string", "com.beem.project.beem")); + mService.getResources().getIdentifier(e.getXMPPError().getCondition().replace("-", "_"), + "string", "com.beem.project.beem")); mErrorMsg = str; } catch (NullPointerException e2) { if (!"".equals(e.getMessage())) diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/service/auth/PreferenceAuthenticator.java --- a/app/src/main/java/com/beem/project/beem/service/auth/PreferenceAuthenticator.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/service/auth/PreferenceAuthenticator.java Mon Jun 15 20:58:21 2015 +0200 @@ -67,7 +67,8 @@ if (callbacks[i] instanceof NameCallback) { String authenticationId = StringUtils.parseName(tmpJid); if (settings.getBoolean(BeemApplication.FULL_JID_LOGIN_KEY, false) - || "gmail.com".equals(service) || "googlemail.com".equals(service)) { + || "gmail.com".equals(service) + || "googlemail.com".equals(service)) { authenticationId = tmpJid; } NameCallback ncb = (NameCallback) callbacks[i]; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/smack/avatar/AvatarManager.java --- a/app/src/main/java/com/beem/project/beem/smack/avatar/AvatarManager.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/smack/avatar/AvatarManager.java Mon Jun 15 20:58:21 2015 +0200 @@ -87,7 +87,7 @@ * @param autoDownload true to enable auto download of avatars */ public AvatarManager(final Connection con, final PepSubManager pepMgr, - final AvatarCache cache, final boolean autoDownload) { + final AvatarCache cache, final boolean autoDownload) { mCon = con; mPep = pepMgr; mAutoDownload = autoDownload; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/smack/sasl/SASLGoogleOAuth2Mechanism.java --- a/app/src/main/java/com/beem/project/beem/smack/sasl/SASLGoogleOAuth2Mechanism.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/smack/sasl/SASLGoogleOAuth2Mechanism.java Mon Jun 15 20:58:21 2015 +0200 @@ -128,10 +128,10 @@ StringBuilder stanza = new StringBuilder(); stanza.append(""); + + "auth:service=\"oauth2\" " + + "xmlns:auth=\"http://www.google.com/talk/protocol/auth\">"); if (authenticationText != null - && authenticationText.trim().length() > 0) { + && authenticationText.trim().length() > 0) { stanza.append(authenticationText); } stanza.append(""); diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/ChangeStatus.java --- a/app/src/main/java/com/beem/project/beem/ui/ChangeStatus.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/ChangeStatus.java Mon Jun 15 20:58:21 2015 +0200 @@ -387,7 +387,7 @@ android.R.style.Theme_Light); final ListAdapter adapter = ArrayAdapter.createFromResource(dialogContext, - R.array.pick_photo_items, + R.array.pick_photo_items, android.R.layout.simple_list_item_1); final AlertDialog.Builder builder = new AlertDialog.Builder(dialogContext); @@ -395,7 +395,7 @@ builder.setSingleChoiceItems(adapter, -1, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - switch(which) { + switch (which) { case 0: doTakePhoto(); break; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/Chat.java --- a/app/src/main/java/com/beem/project/beem/ui/Chat.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/Chat.java Mon Jun 15 20:58:21 2015 +0200 @@ -592,17 +592,17 @@ */ private void prepareIconsStatus() { mStatusIconsMap.put(Status.CONTACT_STATUS_AVAILABLE, - BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_online)); + BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_online)); mStatusIconsMap.put(Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT, - BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_online)); + BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_online)); mStatusIconsMap.put(Status.CONTACT_STATUS_AWAY, - BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_away)); + BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_away)); mStatusIconsMap.put(Status.CONTACT_STATUS_BUSY, - BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_busy)); + BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_busy)); mStatusIconsMap.put(Status.CONTACT_STATUS_DISCONNECT, - BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_offline)); + BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_offline)); mStatusIconsMap.put(Status.CONTACT_STATUS_UNAVAILABLE, - BitmapFactory.decodeResource(getResources(), R.drawable.status_requested)); + BitmapFactory.decodeResource(getResources(), R.drawable.status_requested)); } /** @@ -737,8 +737,8 @@ @Override public void run() { if (msg.getType() == Message.MSG_TYPE_ERROR) { - mListMessages.add(new MessageText(fromBareJid, mContact.getName(), msg.getBody(), true, msg - .getTimestamp())); + mListMessages.add(new MessageText(fromBareJid, mContact.getName(), + msg.getBody(), true, msg.getTimestamp())); mMessagesListAdapter.notifyDataSetChanged(); } else if (msg.getBody() != null) { MessageText lastMessage = null; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/ContactListAdapter.java --- a/app/src/main/java/com/beem/project/beem/ui/ContactListAdapter.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/ContactListAdapter.java Mon Jun 15 20:58:21 2015 +0200 @@ -63,7 +63,7 @@ public class ContactListAdapter extends BaseAdapter implements Filterable { private static final String TAG = ContactListAdapter.class.getSimpleName(); private final ComparatorContactListByStatusAndName mComparator = - new ComparatorContactListByStatusAndName(); + new ComparatorContactListByStatusAndName(); private List mCurrentList; private final List allContacts = new SortedList(new LinkedList(), mComparator); private final List onlineContacts = new SortedList(new LinkedList(), mComparator); diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/LoginAnim.java --- a/app/src/main/java/com/beem/project/beem/ui/LoginAnim.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/LoginAnim.java Mon Jun 15 20:58:21 2015 +0200 @@ -136,7 +136,7 @@ if (!mBinded) mBinded = bindService(LoginAnim.SERVICE_INTENT, mServConn, BIND_AUTO_CREATE); IntentFilter filter = new IntentFilter(MemorizingTrustManager.INTERCEPT_DECISION_INTENT - + "/" + getPackageName()); + + "/" + getPackageName()); filter.setPriority(RECEIVER_PRIORITY); registerReceiver(mSslReceiver, filter); diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/Settings.java --- a/app/src/main/java/com/beem/project/beem/ui/Settings.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/Settings.java Mon Jun 15 20:58:21 2015 +0200 @@ -83,7 +83,7 @@ protected void onStart() { super.onStart(); String accountName = getPreferenceManager().getDefaultSharedPreferences(this) - .getString(BeemApplication.ACCOUNT_USERNAME_KEY, ""); + .getString(BeemApplication.ACCOUNT_USERNAME_KEY, ""); Preference account = findPreference(BeemApplication.ACCOUNT_USERNAME_KEY); account.setSummary(accountName); } diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/dialogs/builders/Alias.java --- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/Alias.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/Alias.java Mon Jun 15 20:58:21 2015 +0200 @@ -57,7 +57,6 @@ import com.beem.project.beem.R; import com.beem.project.beem.service.Contact; import com.beem.project.beem.service.aidl.IRoster; -import com.google.android.apps.iosched.util.LogUtils; /** * Create dialog alias. diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DisplayOtrFingerprint.java --- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DisplayOtrFingerprint.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DisplayOtrFingerprint.java Mon Jun 15 20:58:21 2015 +0200 @@ -71,7 +71,7 @@ mChat = chat; try { setMessage(context.getString(R.string.chat_otr_verify_key, chat.getLocalOtrFingerprint(), - chat.getRemoteOtrFingerprint())); + chat.getRemoteOtrFingerprint())); } catch (RemoteException e) { e.printStackTrace(); } diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java --- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java Mon Jun 15 20:58:21 2015 +0200 @@ -45,7 +45,6 @@ import static com.google.android.apps.iosched.util.LogUtils.makeLogTag; -import com.google.android.apps.iosched.util.LogUtils; import org.jivesoftware.smack.packet.Presence; import android.app.AlertDialog; diff -r 0af23b43e3ad -r 401b33f78a4d app/src/main/java/com/beem/project/beem/utils/BeemConnectivity.java --- a/app/src/main/java/com/beem/project/beem/utils/BeemConnectivity.java Mon Jun 15 20:16:04 2015 +0200 +++ b/app/src/main/java/com/beem/project/beem/utils/BeemConnectivity.java Mon Jun 15 20:58:21 2015 +0200 @@ -84,9 +84,9 @@ WifiInfo wi = wm.getConnectionInfo(); if (wi != null && (WifiInfo.getDetailedStateOf(wi.getSupplicantState()) - == DetailedState.OBTAINING_IPADDR - || WifiInfo.getDetailedStateOf(wi.getSupplicantState()) - == DetailedState.CONNECTED)) { + == DetailedState.OBTAINING_IPADDR + || WifiInfo.getDetailedStateOf(wi.getSupplicantState()) + == DetailedState.CONNECTED)) { return false; } return false;