From 3acd6ad1703fbefd6c29e5541c13fc7d79bb9a25 Mon Sep 17 00:00:00 2001
From: goapunk <goapunk@riseup.net>
Date: Mon, 2 Jul 2018 14:54:00 +0200
Subject: [PATCH] fix repeateractivity fixup
---
.../briarproject/briar/android/repeater/RepeaterActivity.java | 3 ++-
.../mailbox/{fragment => overview}/OverviewFragment.java | 0
2 files changed, 2 insertions(+), 1 deletion(-)
rename mailbox-android/src/main/java/org/briarproject/mailbox/{fragment => overview}/OverviewFragment.java (100%)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
index 20960ee25..1f878c880 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
@@ -85,7 +85,8 @@ public class RepeaterActivity extends BriarActivity {
runOnUiThreadUnlessDestroyed(() -> {
// TODO: Repeater Image
toolbarAvatar.setImageResource(R.mipmap.ic_launcher_round);
- toolbarTitle.setText(repeater.getAuthor().getName());
+ if (repeater != null)
+ toolbarTitle.setText(repeater.getAuthor().getName());
});
}
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/fragment/OverviewFragment.java b/mailbox-android/src/main/java/org/briarproject/mailbox/overview/OverviewFragment.java
similarity index 100%
rename from mailbox-android/src/main/java/org/briarproject/mailbox/fragment/OverviewFragment.java
rename to mailbox-android/src/main/java/org/briarproject/mailbox/overview/OverviewFragment.java
--
GitLab