From 4e097862146cedc251e4acd853fdf48f04cf0598 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 9 Jan 2016 20:57:20 +0100
Subject: [PATCH] Updated gitignore and removed unnecessary strings, made
activity use app name
---
.gitignore | 2 +-
app/src/main/AndroidManifest.xml | 2 +-
.../java/de/kuschku/quasseldroid_ng/MainActivity.java | 8 +++++++-
app/src/main/res/values/strings.xml | 4 +---
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index e7ba6aa0d..f7e5b61f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,5 @@ local.properties
.idea/*
gradle*
gradle.properties
-QuasselDroid/version.properties
+*/version.properties
deploy.sh
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bdd140976..0417563f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
<activity
android:name=".MainActivity"
- android:label="@string/title_activity_main"
+ android:label="@string/app_name"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java
index 77b0613c3..8037ceb43 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java
@@ -243,8 +243,14 @@ public class MainActivity extends AppCompatActivity {
private void switchBuffer(int bufferId) {
this.bufferId = bufferId;
+ Buffer buffer = handler.getClient().getBuffer(this.bufferId);
adapter.setMessageList(handler.getClient().getBacklogManager().get(this.bufferId));
- toolbar.setTitle(handler.getClient().getBuffer(this.bufferId).getName());
+ if (buffer == null) {
+ toolbar.setTitle(R.string.app_name);
+ } else {
+ toolbar.setTitle(buffer.getName());
+ }
+
drawer.setSelection(this.bufferId, false);
drawer.closeDrawer();
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f060e4c12..d999eaf81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
<resources>
- <string name="app_name">QuasselDroid-ng</string>
- <string name="title_activity_main">MainActivity</string>
- <string name="title_activity_main2">Main2Activity</string>
+ <string name="app_name">QuasselDroid</string>
<string name="action_settings">Settings</string>
<string name="default_port">4242</string>
</resources>
--
GitLab