Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 41dd7a82..bd17e545 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -24,7 +24,7 @@ import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
+import de.thedevstack.conversationsplus.utils.Logging;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
@@ -615,12 +615,12 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		switch (intent.getAction()) {
 			case Intent.ACTION_SENDTO:
 			case Intent.ACTION_VIEW:
-				Log.d(Config.LOGTAG, "received uri=" + intent.getData());
+				Logging.d(Config.LOGTAG, "received uri=" + intent.getData());
 				return new Invite(intent.getData()).invite();
 			case NfcAdapter.ACTION_NDEF_DISCOVERED:
 				for (Parcelable message : getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES)) {
 					if (message instanceof NdefMessage) {
-						Log.d(Config.LOGTAG, "received message=" + message);
+						Logging.d(Config.LOGTAG, "received message=" + message);
 						for (NdefRecord record : ((NdefMessage) message).getRecords()) {
 							switch (record.getTnf()) {
 								case NdefRecord.TNF_WELL_KNOWN:
@@ -652,7 +652,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 			Contact contact = contacts.get(0);
 			if (invite.getFingerprint() != null) {
 				if (contact.addOtrFingerprint(invite.getFingerprint())) {
-					Log.d(Config.LOGTAG,"added new fingerprint");
+					Logging.d(Config.LOGTAG,"added new fingerprint");
 					xmppConnectionService.syncRosterToDisk(contact.getAccount());
 				}
 			}