1 files changed, 21 insertions, 26 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
index 5a6151d88..a6db02708 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java
@@ -55,20 +55,7 @@ public class AppSettingsFragment extends Fragment {
 
     public void setAppSettings(AppSettings appSettings) {
         this.mAppSettings = appSettings;
-        setPackage(appSettings.getPackageName());
-        mPackageName.setText(appSettings.getPackageName());
-
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-256");
-            md.update(appSettings.getPackageSignature());
-            byte[] digest = md.digest();
-            String signature = new String(Hex.encode(digest));
-
-            mPackageSignature.setText(signature);
-        } catch (NoSuchAlgorithmException e) {
-            Log.e(Constants.TAG, "Should not happen!", e);
-        }
-
+        updateView(appSettings);
     }
 
     /**
@@ -77,36 +64,44 @@ public class AppSettingsFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.api_app_settings_fragment, container, false);
-        initView(view);
-        return view;
-    }
-
-
-    private void initView(View view) {
         mAppNameView = (TextView) view.findViewById(R.id.api_app_settings_app_name);
         mAppIconView = (ImageView) view.findViewById(R.id.api_app_settings_app_icon);
-
         mPackageName = (TextView) view.findViewById(R.id.api_app_settings_package_name);
         mPackageSignature = (TextView) view.findViewById(R.id.api_app_settings_package_signature);
+        return view;
     }
 
-    private void setPackage(String packageName) {
-        PackageManager pm = getActivity().getApplicationContext().getPackageManager();
-
+    private void updateView(AppSettings appSettings) {
         // get application name and icon from package manager
         String appName;
         Drawable appIcon = null;
+        PackageManager pm = getActivity().getApplicationContext().getPackageManager();
         try {
-            ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+            ApplicationInfo ai = pm.getApplicationInfo(appSettings.getPackageName(), 0);
 
             appName = (String) pm.getApplicationLabel(ai);
             appIcon = pm.getApplicationIcon(ai);
         } catch (NameNotFoundException e) {
             // fallback
-            appName = packageName;
+            appName = appSettings.getPackageName();
         }
         mAppNameView.setText(appName);
         mAppIconView.setImageDrawable(appIcon);
+
+        // advanced info: package name
+        mPackageName.setText(appSettings.getPackageName());
+
+        // advanced info: package signature SHA-256
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            md.update(appSettings.getPackageSignature());
+            byte[] digest = md.digest();
+            String signature = new String(Hex.encode(digest));
+
+            mPackageSignature.setText(signature);
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(Constants.TAG, "Should not happen!", e);
+        }
     }