Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i18n permissions.

Browse Source
This commit is contained in:
Peter Serwylo 2013-04-28 18:52:26 +10:00
parent 688142c83e
commit 7849182f98
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/appinfo.xml
View File

@ -35,9 +35,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold"
android:text="@string/permissions" /> android:text="@string/permissions" />
<TextView <TextView
android:id="@+id/permissions_list" android:id="@+id/permissions_list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

26
src/org/fdroid/fdroid/AppDetails.java
View File

@ -22,8 +22,10 @@ package org.fdroid.fdroid;
import java.io.File; import java.io.File;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import android.content.pm.PermissionInfo;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import org.fdroid.fdroid.compat.MenuManager; import org.fdroid.fdroid.compat.MenuManager;
import org.fdroid.fdroid.DB.CommaSeparatedList; import org.fdroid.fdroid.DB.CommaSeparatedList;
@ -223,7 +225,7 @@ public class AppDetails extends ListActivity {
.getDefaultSharedPreferences(getBaseContext()); .getDefaultSharedPreferences(getBaseContext());
pref_cacheDownloaded = prefs.getBoolean("cacheDownloaded", false); pref_cacheDownloaded = prefs.getBoolean("cacheDownloaded", false);
pref_expert = prefs.getBoolean("expert", false); pref_expert = prefs.getBoolean("expert", false);
pref_permissions = prefs.getBoolean("showPermissions", true); pref_permissions = prefs.getBoolean("showPermissions", false);
AppDetails old = (AppDetails) getLastNonConfigurationInstance(); AppDetails old = (AppDetails) getLastNonConfigurationInstance();
if (old != null) { if (old != null) {
copyState(old); copyState(old);
@ -440,10 +442,24 @@ public class AppDetails extends ListActivity {
tv = (TextView) infoView.findViewById(R.id.permissions_list); tv = (TextView) infoView.findViewById(R.id.permissions_list);
if (pref_permissions) { if (pref_permissions) {
CommaSeparatedList permissions = app.apks.get(0).detail_permissions; Iterator<String> permissions = app.apks.get(0).detail_permissions.iterator();
if (null != permissions) if (null != permissions && permissions.hasNext()) {
tv.setText(permissions.toString()); StringBuilder sb = new StringBuilder();
else { 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"); tv.setText("NONE");
} }
} else { } else {