From 62008e85c6ce5b36cd6fdf4e8c3d9d39017c8047 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 21 Jan 2014 19:21:34 -0500
Subject: [PATCH] show repo name in ActionBar in "Repo Details"

Before, "Repo Details" always had a title of "Repositories". Now
it shows the name of the repo as the title.  This also enables the
ActionBar back button (aka "display home as up") to return to
"Manage Repos".
---
 AndroidManifest.xml                              |  3 ++-
 .../fdroid/fdroid/views/RepoDetailsActivity.java | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2a7bffbba..57f95bb7f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -114,7 +114,8 @@
 
         <activity
             android:name=".views.RepoDetailsActivity"
-            android:label="@string/menu_manage" />
+            android:label="@string/menu_manage"
+            android:parentActivityName=".ManageRepo" />
  
         <activity
             android:name=".AppDetails"
diff --git a/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 4165cf33f..087e753c5 100644
--- a/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -3,7 +3,9 @@ package org.fdroid.fdroid.views;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
+
 import org.fdroid.fdroid.DB;
+import org.fdroid.fdroid.DB.Repo;
 import org.fdroid.fdroid.compat.ActionBarCompat;
 import org.fdroid.fdroid.views.fragments.RepoDetailsFragment;
 
@@ -16,6 +18,8 @@ public class RepoDetailsActivity extends FragmentActivity implements RepoDetails
 
     public static final String DATA_REPO_ID     = "repoId";
 
+    private int repoId;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,13 +34,21 @@ public class RepoDetailsActivity extends FragmentActivity implements RepoDetails
                 .commit();
         }
 
-        ActionBarCompat.create(this).setDisplayHomeAsUpEnabled(true);
+        repoId = getIntent().getIntExtra(RepoDetailsFragment.ARG_REPO_ID, -1);
+
+        DB db = DB.getDB();
+        Repo repo = db.getRepo(repoId);
+        DB.releaseDB();
+
+        ActionBarCompat abCompat = ActionBarCompat.create(this);
+        abCompat.setDisplayHomeAsUpEnabled(true);
+        abCompat.setTitle(repo.getName());
     }
 
     private void finishWithAction(String actionName) {
         Intent data = new Intent();
         data.putExtra(actionName, true);
-        data.putExtra(DATA_REPO_ID, getIntent().getIntExtra(RepoDetailsFragment.ARG_REPO_ID, -1));
+        data.putExtra(DATA_REPO_ID, repoId);
         setResult(RESULT_OK, data);
         finish();
     }