Updated gitignore and removed unnecessary strings, made activity use app name

.gitignore

@@ -8,5 +8,5 @@ local.properties
 .idea/*
 gradle*
 gradle.properties
-QuasselDroid/version.properties
+*/version.properties
 deploy.sh

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" />

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();
     }

app/src/main/res/values/strings.xml

 <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>