Compilation errors and merge mixups fixed

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index e42d3e61..f6426ff2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -511,7 +511,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			account = mConversation.getAccount().getJid().toBareJid().toString();
 		}
 		mAccountJid.setText(getString(R.string.using_account, account));
-		mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(48)));
+		mYourPhoto.setImageBitmap(AvatarService.getInstance().get(mConversation.getAccount(), getPixel(48)));
 		setTitle(mConversation.getName());
 		mFullJid.setText(mConversation.getJid().toBareJid().toString());
 		mYourNick.setText(mucOptions.getActualNick());
@@ -601,7 +601,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 			}
 			ImageView iv = (ImageView) view.findViewById(R.id.contact_photo);
-			iv.setImageBitmap(avatarService().get(user, getPixel(48), false));
+			iv.setImageBitmap(AvatarService.getInstance().get(user, getPixel(48), false));
 			membersView.addView(view);
 			if (mConversation.getMucOptions().canInvite()) {
 				mInviteButton.setVisibility(View.VISIBLE);