remove NFC + light refactoring of XmppActivity

src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <uses-permission

src/main/java/eu/siacs/conversations/ui/XmppActivity.java

@@ -7,7 +7,6 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
-import android.app.Dialog;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
@@ -15,7 +14,6 @@ import android.content.ClipboardManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
 import android.content.ServiceConnection;
@@ -31,10 +29,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcEvent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -88,13 +82,11 @@ import eu.siacs.conversations.xmpp.jid.Jid;
 
 public abstract class XmppActivity extends Activity {
 
+	public static final String EXTRA_ACCOUNT = "account";
 	protected static final int REQUEST_ANNOUNCE_PGP = 0x0101;
 	protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102;
 	protected static final int REQUEST_CHOOSE_PGP_ID = 0x0103;
 	protected static final int REQUEST_BATTERY_OP = 0x13849ff;
-
-	public static final String EXTRA_ACCOUNT = "account";
-
 	public XmppConnectionService xmppConnectionService;
 	public boolean xmppConnectionServiceBound = false;
 	protected boolean registeredListeners = false;
@@ -110,71 +102,11 @@ public abstract class XmppActivity extends Activity {
 	protected int mPrimaryColor;
 
 	protected boolean mUseSubject = true;
-
-	private DisplayMetrics metrics;
 	protected int mTheme;
 	protected boolean mUsingEnterKey = false;
-
 	protected Toast mToast;
-
+	protected Runnable onOpenPGPKeyPublished = () -> Toast.makeText(XmppActivity.this, R.string.openpgp_has_been_published, Toast.LENGTH_SHORT).show();
-	protected void hideToast() {
-		if (mToast != null) {
-			mToast.cancel();
-		}
-	}
-
-	protected void replaceToast(String msg) {
-		replaceToast(msg, true);
-	}
-
-	protected void replaceToast(String msg, boolean showlong) {
-		hideToast();
-		mToast = Toast.makeText(this, msg ,showlong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
-		mToast.show();
-	}
-
-	protected Runnable onOpenPGPKeyPublished = new Runnable() {
-		@Override
-		public void run() {
-			Toast.makeText(XmppActivity.this,R.string.openpgp_has_been_published, Toast.LENGTH_SHORT).show();
-		}
-	};
-
-	private long mLastUiRefresh = 0;
-	private Handler mRefreshUiHandler = new Handler();
-	private Runnable mRefreshUiRunnable = new Runnable() {
-		@Override
-		public void run() {
-			mLastUiRefresh = SystemClock.elapsedRealtime();
-			refreshUiReal();
-		}
-	};
-
 	protected ConferenceInvite mPendingConferenceInvite = null;
-
-
-	protected final void refreshUi() {
-		final long diff = SystemClock.elapsedRealtime() - mLastUiRefresh;
-		if (diff > Config.REFRESH_UI_INTERVAL) {
-			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
-			runOnUiThread(mRefreshUiRunnable);
-		} else {
-			final long next = Config.REFRESH_UI_INTERVAL - diff;
-			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
-			mRefreshUiHandler.postDelayed(mRefreshUiRunnable,next);
-		}
-	}
-
-	abstract protected void refreshUiReal();
-
-	protected interface OnValueEdited {
-		String onValueEdited(String value);
-	}
-
-	public interface OnPresenceSelected {
-		void onPresenceSelected();
-	}
-
 	protected ServiceConnection mConnection = new ServiceConnection() {
 
 		@Override
@@ -194,6 +126,87 @@ public abstract class XmppActivity extends Activity {
 			xmppConnectionServiceBound = false;
 		}
 	};
+	private DisplayMetrics metrics;
+	private long mLastUiRefresh = 0;
+	private Handler mRefreshUiHandler = new Handler();
+	private Runnable mRefreshUiRunnable = () -> {
+		mLastUiRefresh = SystemClock.elapsedRealtime();
+		refreshUiReal();
+	};
+	private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
+		@Override
+		public void success(final Conversation conversation) {
+			runOnUiThread(() -> {
+				switchToConversation(conversation);
+				hideToast();
+			});
+		}
+
+		@Override
+		public void error(final int errorCode, Conversation object) {
+			runOnUiThread(() -> replaceToast(getString(errorCode)));
+		}
+
+		@Override
+		public void userInputRequried(PendingIntent pi, Conversation object) {
+
+		}
+	};
+
+	public static boolean cancelPotentialWork(Message message, ImageView imageView) {
+		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
+
+		if (bitmapWorkerTask != null) {
+			final Message oldMessage = bitmapWorkerTask.message;
+			if (oldMessage == null || message != oldMessage) {
+				bitmapWorkerTask.cancel(true);
+			} else {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
+		if (imageView != null) {
+			final Drawable drawable = imageView.getDrawable();
+			if (drawable instanceof AsyncDrawable) {
+				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
+				return asyncDrawable.getBitmapWorkerTask();
+			}
+		}
+		return null;
+	}
+
+	protected void hideToast() {
+		if (mToast != null) {
+			mToast.cancel();
+		}
+	}
+
+	protected void replaceToast(String msg) {
+		replaceToast(msg, true);
+	}
+
+	protected void replaceToast(String msg, boolean showlong) {
+		hideToast();
+		mToast = Toast.makeText(this, msg, showlong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
+		mToast.show();
+	}
+
+	protected final void refreshUi() {
+		final long diff = SystemClock.elapsedRealtime() - mLastUiRefresh;
+		if (diff > Config.REFRESH_UI_INTERVAL) {
+			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
+			runOnUiThread(mRefreshUiRunnable);
+		} else {
+			final long next = Config.REFRESH_UI_INTERVAL - diff;
+			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
+			mRefreshUiHandler.postDelayed(mRefreshUiRunnable, next);
+		}
+	}
+
+	abstract protected void refreshUiReal();
 
 	@Override
 	protected void onStart() {
@@ -239,14 +252,10 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void hideKeyboard() {
-		InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+		final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
 		View focus = getCurrentFocus();
-
+		if (focus != null && inputManager != null) {
-		if (focus != null) {
+			inputManager.hideSoftInputFromWindow(focus.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-
-			inputManager.hideSoftInputFromWindow(focus.getWindowToken(),
-					InputMethodManager.HIDE_NOT_ALWAYS);
 		}
 	}
 
@@ -261,10 +270,7 @@ public abstract class XmppActivity extends Activity {
 		builder.setMessage(getText(R.string.openkeychain_required_long));
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setNeutralButton(getString(R.string.restart),
-				new OnClickListener() {
+				(dialog, which) -> {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
 					if (xmppConnectionServiceBound) {
 						unbindService(mConnection);
 						xmppConnectionServiceBound = false;
@@ -272,13 +278,9 @@ public abstract class XmppActivity extends Activity {
 					stopService(new Intent(XmppActivity.this,
 							XmppConnectionService.class));
 					finish();
-					}
 				});
 		builder.setPositiveButton(getString(R.string.install),
-				new OnClickListener() {
+				(dialog, which) -> {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
 					Uri uri = Uri
 							.parse("market://details?id=org.sufficientlysecure.keychain");
 					Intent marketIntent = new Intent(Intent.ACTION_VIEW,
@@ -296,7 +298,6 @@ public abstract class XmppActivity extends Activity {
 						startActivity(browserIntent);
 					}
 					finish();
-					}
 				});
 		builder.create().show();
 	}
@@ -427,7 +428,7 @@ public abstract class XmppActivity extends Activity {
 	protected boolean isOptimizingBattery() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			final PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
-			return pm == null
+			return pm != null
 					&& !pm.isIgnoringBatteryOptimizations(getPackageName());
 		} else {
 			return false;
@@ -642,18 +643,13 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void displayErrorDialog(final int errorCode) {
-		runOnUiThread(new Runnable() {
+		runOnUiThread(() -> {
-
+			Builder builder = new Builder(XmppActivity.this);
-			@Override
-			public void run() {
-				AlertDialog.Builder builder = new AlertDialog.Builder(
-						XmppActivity.this);
 			builder.setIconAttribute(android.R.attr.alertDialogIcon);
 			builder.setTitle(getString(R.string.error));
 			builder.setMessage(errorCode);
 			builder.setNeutralButton(R.string.accept, null);
 			builder.create().show();
-			}
 		});
 
 	}
@@ -668,15 +664,11 @@ public abstract class XmppActivity extends Activity {
 		builder.setMessage(getString(R.string.not_in_roster));
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.add_contact),
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
 					final Jid jid = contact.getJid();
 					Account account = contact.getAccount();
-						Contact contact = account.getRoster().getContact(jid);
+					Contact contact1 = account.getRoster().getContact(jid);
-						xmppConnectionService.createContact(contact);
+					xmppConnectionService.createContact(contact1);
-					}
 				});
 		builder.create().show();
 	}
@@ -687,17 +679,13 @@ public abstract class XmppActivity extends Activity {
 		builder.setMessage(R.string.request_presence_updates);
 		builder.setNegativeButton(R.string.cancel, null);
 		builder.setPositiveButton(R.string.request_now,
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
 					if (xmppConnectionServiceBound) {
 						xmppConnectionService.sendPresencePacket(contact
 								.getAccount(), xmppConnectionService
 								.getPresenceGenerator()
 								.requestPresenceUpdatesFrom(contact));
 					}
-					}
 				});
 		builder.create().show();
 	}
@@ -708,15 +696,11 @@ public abstract class XmppActivity extends Activity {
 		builder.setTitle(conversation.getContact().getJid().toString());
 		builder.setMessage(R.string.without_mutual_presence_updates);
 		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.ignore, new OnClickListener() {
+		builder.setPositiveButton(R.string.ignore, (dialog, which) -> {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
 			conversation.setNextCounterpart(null);
 			if (listener != null) {
 				listener.onPresenceSelected();
 			}
-			}
 		});
 		builder.create().show();
 	}
@@ -756,10 +740,7 @@ public abstract class XmppActivity extends Activity {
 		builder.setNegativeButton(R.string.cancel, null);
 		final AlertDialog dialog = builder.create();
 		dialog.show();
-		View.OnClickListener clickListener = new View.OnClickListener() {
+		View.OnClickListener clickListener = v -> {
-
-			@Override
-			public void onClick(View v) {
 			String value = editor.getText().toString();
 			if (!value.equals(previousValue) && value.trim().length() > 0) {
 				String error = callback.onValueEdited(value);
@@ -769,7 +750,6 @@ public abstract class XmppActivity extends Activity {
 				}
 			}
 			dialog.dismiss();
-			}
 		};
 		dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(clickListener);
 	}
@@ -866,18 +846,9 @@ public abstract class XmppActivity extends Activity {
 		}
 		builder.setSingleChoiceItems(readableIdentities,
 				selectedResource.get(),
-				new DialogInterface.OnClickListener() {
+				(dialog, which) -> selectedResource.set(which));
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						selectedResource.set(which);
-					}
-				});
 		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.ok, new OnClickListener() {
+		builder.setPositiveButton(R.string.ok, (dialog, which) -> {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
 			try {
 				Jid next = Jid.fromParts(contact.getJid().getLocalpart(), contact.getJid().getDomainpart(), resourceArray[selectedResource.get()]);
 				conversation.setNextCounterpart(next);
@@ -885,7 +856,6 @@ public abstract class XmppActivity extends Activity {
 				conversation.setNextCounterpart(null);
 			}
 			listener.onPresenceSelected();
-			}
 		});
 		builder.create().show();
 	}
@@ -904,35 +874,6 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
-
-	private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
-		@Override
-		public void success(final Conversation conversation) {
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					switchToConversation(conversation);
-					hideToast();
-				}
-			});
-		}
-
-		@Override
-		public void error(final int errorCode, Conversation object) {
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					replaceToast(getString(errorCode));
-				}
-			});
-		}
-
-		@Override
-		public void userInputRequried(PendingIntent pi, Conversation object) {
-
-		}
-	};
-
 	public int getTertiaryTextColor() {
 		return this.mTertiaryTextColor;
 	}
@@ -977,21 +918,6 @@ public abstract class XmppActivity extends Activity {
 		return false;
 	}
 
-	protected void registerNdefPushMessageCallback() {
-		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
-		if (nfcAdapter != null && nfcAdapter.isEnabled()) {
-			nfcAdapter.setNdefPushMessageCallback(new NfcAdapter.CreateNdefMessageCallback() {
-				@Override
-				public NdefMessage createNdefMessage(NfcEvent nfcEvent) {
-					return new NdefMessage(new NdefRecord[]{
-							NdefRecord.createUri(getShareableUri()),
-							NdefRecord.createApplicationRecord("eu.siacs.conversations")
-					});
-				}
-			}, this);
-		}
-	}
-
 	protected boolean neverCompressPictures() {
 		return getPreferences().getString("picture_compression", getResources().getString(R.string.picture_compression)).equals("never");
 	}
@@ -1000,13 +926,6 @@ public abstract class XmppActivity extends Activity {
 		return getPreferences().getBoolean(SettingsActivity.MANUALLY_CHANGE_PRESENCE, getResources().getBoolean(R.bool.manually_change_presence));
 	}
 
-	protected void unregisterNdefPushMessageCallback() {
-		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
-		if (nfcAdapter != null && nfcAdapter.isEnabled()) {
-			nfcAdapter.setNdefPushMessageCallback(null,this);
-		}
-	}
-
 	protected String getShareableUri() {
 		return getShareableUri(false);
 	}
@@ -1044,9 +963,6 @@ public abstract class XmppActivity extends Activity {
 	@Override
 	public void onResume() {
 		super.onResume();
-		if (this.getShareableUri() != null) {
-			this.registerNdefPushMessageCallback();
-		}
 	}
 
 	protected int findTheme() {
@@ -1069,7 +985,6 @@ public abstract class XmppActivity extends Activity {
 	@Override
 	public void onPause() {
 		super.onPause();
-		this.unregisterNdefPushMessageCallback();
 	}
 
 	protected void showQrCode() {
@@ -1098,6 +1013,46 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
+	public AvatarService avatarService() {
+		return xmppConnectionService.getAvatarService();
+	}
+
+	public void loadBitmap(Message message, ImageView imageView) {
+		Bitmap bm;
+		try {
+			bm = xmppConnectionService.getFileBackend().getThumbnail(message, (int) (metrics.density * 288), true);
+		} catch (FileNotFoundException e) {
+			bm = null;
+		}
+		if (bm != null) {
+			cancelPotentialWork(message, imageView);
+			imageView.setImageBitmap(bm);
+			imageView.setBackgroundColor(0x00000000);
+		} else {
+			if (cancelPotentialWork(message, imageView)) {
+				imageView.setBackgroundColor(0xff333333);
+				imageView.setImageDrawable(null);
+				final BitmapWorkerTask task = new BitmapWorkerTask(this, imageView);
+				final AsyncDrawable asyncDrawable = new AsyncDrawable(
+						getResources(), null, task);
+				imageView.setImageDrawable(asyncDrawable);
+				try {
+					task.execute(message);
+				} catch (final RejectedExecutionException ignored) {
+					ignored.printStackTrace();
+				}
+			}
+		}
+	}
+
+	protected interface OnValueEdited {
+		String onValueEdited(String value);
+	}
+
+	public interface OnPresenceSelected {
+		void onPresenceSelected();
+	}
+
 	public static class ConferenceInvite {
 		private String uuid;
 		private List<Jid> jids = new ArrayList<>();
@@ -1141,16 +1096,14 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
-	public AvatarService avatarService() {
+	static class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
-		return xmppConnectionService.getAvatarService();
-	}
-
-	class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
 		private final WeakReference<ImageView> imageViewReference;
+		private final WeakReference<XmppActivity> activity;
 		private Message message = null;
 
-		public BitmapWorkerTask(ImageView imageView) {
+		private BitmapWorkerTask(XmppActivity activity, ImageView imageView) {
-			imageViewReference = new WeakReference<>(imageView);
+			this.activity = new WeakReference<>(activity);
+			this.imageViewReference = new WeakReference<>(imageView);
 		}
 
 		@Override
@@ -1160,8 +1113,12 @@ public abstract class XmppActivity extends Activity {
 			}
 			message = params[0];
 			try {
-				return xmppConnectionService.getFileBackend().getThumbnail(
+				XmppActivity activity = this.activity.get();
-						message, (int) (metrics.density * 288), false);
+				if (activity != null && activity.xmppConnectionService != null) {
+					return activity.xmppConnectionService.getFileBackend().getThumbnail(message, (int) (activity.metrics.density * 288), false);
+				} else {
+					return null;
+				}
 			} catch (FileNotFoundException e) {
 				return null;
 			}
@@ -1179,71 +1136,15 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
-	public void loadBitmap(Message message, ImageView imageView) {
+	private static class AsyncDrawable extends BitmapDrawable {
-		Bitmap bm;
-		try {
-			bm = xmppConnectionService.getFileBackend().getThumbnail(message,
-					(int) (metrics.density * 288), true);
-		} catch (FileNotFoundException e) {
-			bm = null;
-		}
-		if (bm != null) {
-			cancelPotentialWork(message, imageView);
-			imageView.setImageBitmap(bm);
-			imageView.setBackgroundColor(0x00000000);
-		} else {
-			if (cancelPotentialWork(message, imageView)) {
-				imageView.setBackgroundColor(0xff333333);
-				imageView.setImageDrawable(null);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-				final AsyncDrawable asyncDrawable = new AsyncDrawable(
-						getResources(), null, task);
-				imageView.setImageDrawable(asyncDrawable);
-				try {
-					task.execute(message);
-				} catch (final RejectedExecutionException ignored) {
-					ignored.printStackTrace();
-				}
-			}
-		}
-	}
-
-	public static boolean cancelPotentialWork(Message message, ImageView imageView) {
-		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-		if (bitmapWorkerTask != null) {
-			final Message oldMessage = bitmapWorkerTask.message;
-			if (oldMessage == null || message != oldMessage) {
-				bitmapWorkerTask.cancel(true);
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-		if (imageView != null) {
-			final Drawable drawable = imageView.getDrawable();
-			if (drawable instanceof AsyncDrawable) {
-				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-				return asyncDrawable.getBitmapWorkerTask();
-			}
-		}
-		return null;
-	}
-
-	static class AsyncDrawable extends BitmapDrawable {
 		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
 
-		public AsyncDrawable(Resources res, Bitmap bitmap,
+		private AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
-				BitmapWorkerTask bitmapWorkerTask) {
 			super(res, bitmap);
-			bitmapWorkerTaskReference = new WeakReference<>(
+			bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
-					bitmapWorkerTask);
 		}
 
-		public BitmapWorkerTask getBitmapWorkerTask() {
+		private BitmapWorkerTask getBitmapWorkerTask() {
 			return bitmapWorkerTaskReference.get();
 		}
 	}