From 7849182f9871c81ce77d2c463fe478c7a99862d0 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@ivt.com.au>
Date: Sun, 28 Apr 2013 18:52:26 +1000
Subject: [PATCH] i18n permissions.

---
 res/layout/appinfo.xml                |  3 ++-
 src/org/fdroid/fdroid/AppDetails.java | 26 +++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/res/layout/appinfo.xml b/res/layout/appinfo.xml
index 90bf38fcc..b14d133e3 100644
--- a/res/layout/appinfo.xml
+++ b/res/layout/appinfo.xml
@@ -35,9 +35,10 @@
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:textSize="14sp"
+        android:textStyle="bold"
         android:text="@string/permissions" />
     
-        <TextView
+    <TextView
         android:id="@+id/permissions_list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index a1701bddc..f9548a6c2 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -22,8 +22,10 @@ package org.fdroid.fdroid;
 import java.io.File;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
+import android.content.pm.PermissionInfo;
 import android.support.v4.view.MenuItemCompat;
 import org.fdroid.fdroid.compat.MenuManager;
 import org.fdroid.fdroid.DB.CommaSeparatedList;
@@ -223,7 +225,7 @@ public class AppDetails extends ListActivity {
                 .getDefaultSharedPreferences(getBaseContext());
         pref_cacheDownloaded = prefs.getBoolean("cacheDownloaded", false);
         pref_expert = prefs.getBoolean("expert", false);
-        pref_permissions = prefs.getBoolean("showPermissions", true);
+        pref_permissions = prefs.getBoolean("showPermissions", false);
         AppDetails old = (AppDetails) getLastNonConfigurationInstance();
         if (old != null) {
             copyState(old);
@@ -440,10 +442,24 @@ public class AppDetails extends ListActivity {
 
         tv = (TextView) infoView.findViewById(R.id.permissions_list);
         if (pref_permissions) {
-            CommaSeparatedList permissions = app.apks.get(0).detail_permissions;
-            if (null != permissions)
-                tv.setText(permissions.toString());
-            else {
+            Iterator<String> permissions = app.apks.get(0).detail_permissions.iterator();
+            if (null != permissions && permissions.hasNext()) {
+                StringBuilder sb = new StringBuilder();
+                while(permissions.hasNext()) {
+                    String permissionName = permissions.next();
+                    try {
+                        Permission permission = new Permission(this, permissionName);
+                        sb.append(permission.getName());
+                        if (permissions.hasNext()) {
+                            sb.append('\n');
+                        }
+                    } catch (NameNotFoundException e) {
+                        Log.d( "FDroid",
+                                "Can't find permsission '" + permissionName + "'");
+                    }
+                }
+                tv.setText(sb.toString());
+            } else {
                 tv.setText("NONE");
             }
         } else {