From 12a1cf8f8bd622751a389c36d542eaa6c86b5b59 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 1 Nov 2018 17:24:22 +0000
Subject: [PATCH] Reuse Observer interface.

---
 .../briarproject/briar/android/util/Runnable.java   | 13 -------------
 .../briarproject/briar/android/util/UiUtils.java    | 11 +++++------
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 briar-android/src/main/java/org/briarproject/briar/android/util/Runnable.java

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/Runnable.java b/briar-android/src/main/java/org/briarproject/briar/android/util/Runnable.java
deleted file mode 100644
index c019e631e..000000000
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/Runnable.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.briarproject.briar.android.util;
-
-import android.support.annotation.Nullable;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-
-@NotNullByDefault
-public interface Runnable<T> {
-
-	void run(@Nullable T t);
-
-}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
index 3af664ffa..6c82b8e03 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
@@ -319,18 +319,17 @@ public class UiUtils {
 	}
 
 	/**
-	 * Observes the given {@link LiveData<T>} until the first change.
-	 * If the LiveData's value is available,
-	 * the {@link Runnable<T>} will be executed right away.
+	 * Observes the given {@link LiveData} until the first change.
+	 * If the LiveData's value is available, the {@link Observer} will be
+	 * called right away.
 	 */
 	@MainThread
 	public static <T> void observeOnce(LiveData<T> liveData,
-			LifecycleOwner owner,
-			Runnable<T> function) {
+			LifecycleOwner owner, Observer<T> observer) {
 		liveData.observe(owner, new Observer<T>() {
 			@Override
 			public void onChanged(@Nullable T t) {
-				function.run(t);
+				observer.onChanged(t);
 				liveData.removeObserver(this);
 			}
 		});