1 files changed, 116 insertions, 24 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
index 56e3b22e2..407480c98 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
@@ -17,29 +17,54 @@
 
 package org.sufficientlysecure.keychain.remote.ui;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 
+import com.getbase.floatingactionbutton.FloatingActionButton;
+
+import org.spongycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.remote.AppSettings;
-import org.sufficientlysecure.keychain.operations.results.OperationResult;
+import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
+import org.sufficientlysecure.keychain.ui.BaseActivity;
+import org.sufficientlysecure.keychain.ui.dialog.AddSubkeyDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.AdvancedAppSettingsDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
-public class AppSettingsActivity extends ActionBarActivity {
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class AppSettingsActivity extends BaseActivity {
     private Uri mAppUri;
 
-    private AppSettingsFragment mSettingsFragment;
+    private AppSettingsAllowedKeysListFragment mAllowedKeysFragment;
+
+    private TextView mAppNameView;
+    private ImageView mAppIconView;
+    private TextView mPackageName;
+    private TextView mPackageSignature;
+
+    private FloatingActionButton mStartFab;
+
+    // deprecated API
     private AccountsListFragment mAccountsListFragment;
+    private TextView mAccountsLabel;
+
 
     // model
     AppSettings mAppSettings;
@@ -48,16 +73,27 @@ public class AppSettingsActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // let the actionbar look like Android's contact app
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setIcon(android.R.color.transparent);
-        actionBar.setHomeButtonEnabled(true);
+        mAccountsLabel = (TextView) findViewById(R.id.api_accounts_label);
+        mAppNameView = (TextView) findViewById(R.id.api_app_settings_app_name);
+        mAppIconView = (ImageView) findViewById(R.id.api_app_settings_app_icon);
+        mPackageName = (TextView) findViewById(R.id.api_app_settings_package_name);
+        mPackageSignature = (TextView) findViewById(R.id.api_app_settings_package_signature);
+        mStartFab = (FloatingActionButton) findViewById(R.id.fab);
 
-        setContentView(R.layout.api_app_settings_activity);
+        mStartFab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startApp();
+            }
+        });
 
-        mSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
-                R.id.api_app_settings_fragment);
+        setFullScreenDialogClose(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                cancel();
+            }
+        });
+        setTitle(null);
 
         Intent intent = getIntent();
         mAppUri = intent.getData();
@@ -71,6 +107,22 @@ public class AppSettingsActivity extends ActionBarActivity {
         }
     }
 
+    private void save() {
+        mAllowedKeysFragment.saveAllowedKeys();
+        setResult(Activity.RESULT_OK);
+        finish();
+    }
+
+    private void cancel() {
+        setResult(Activity.RESULT_CANCELED);
+        finish();
+    }
+
+    @Override
+    protected void initLayout() {
+        setContentView(R.layout.api_app_settings_activity);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
@@ -81,16 +133,40 @@ public class AppSettingsActivity extends ActionBarActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.menu_api_settings_revoke:
+            case R.id.menu_api_save: {
+                save();
+                return true;
+            }
+            case R.id.menu_api_settings_revoke: {
                 revokeAccess();
                 return true;
-            case R.id.menu_api_settings_start:
-                startApp();
+            }
+            case R.id.menu_api_settings_advanced: {
+                showAdvancedInfo();
                 return true;
+            }
         }
         return super.onOptionsItemSelected(item);
     }
 
+    private void showAdvancedInfo() {
+        String signature = null;
+        // advanced info: package signature SHA-256
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            md.update(mAppSettings.getPackageSignature());
+            byte[] digest = md.digest();
+            signature = new String(Hex.encode(digest));
+        } catch (NoSuchAlgorithmException e) {
+            Log.e(Constants.TAG, "Should not happen!", e);
+        }
+
+        AdvancedAppSettingsDialogFragment dialogFragment =
+                AdvancedAppSettingsDialogFragment.newInstance(mAppSettings.getPackageName(), signature);
+
+        dialogFragment.show(getSupportFragmentManager(), "advancedDialog");
+    }
+
     private void startApp() {
         Intent i;
         PackageManager manager = getPackageManager();
@@ -109,25 +185,31 @@ public class AppSettingsActivity extends ActionBarActivity {
 
     private void loadData(Bundle savedInstanceState, Uri appUri) {
         mAppSettings = new ProviderHelper(this).getApiAppSettings(appUri);
-        mSettingsFragment.setAppSettings(mAppSettings);
 
+        // get application name and icon from package manager
         String appName;
-        PackageManager pm = getPackageManager();
+        Drawable appIcon = null;
+        PackageManager pm = getApplicationContext().getPackageManager();
         try {
             ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0);
+
             appName = (String) pm.getApplicationLabel(ai);
+            appIcon = pm.getApplicationIcon(ai);
         } catch (PackageManager.NameNotFoundException e) {
             // fallback
             appName = mAppSettings.getPackageName();
         }
-        setTitle(appName);
+        mAppNameView.setText(appName);
+        mAppIconView.setImageDrawable(appIcon);
 
         Uri accountsUri = appUri.buildUpon().appendPath(KeychainContract.PATH_ACCOUNTS).build();
         Log.d(Constants.TAG, "accountsUri: " + accountsUri);
-        startListFragment(savedInstanceState, accountsUri);
+        Uri allowedKeysUri = appUri.buildUpon().appendPath(KeychainContract.PATH_ALLOWED_KEYS).build();
+        Log.d(Constants.TAG, "allowedKeysUri: " + allowedKeysUri);
+        startListFragments(savedInstanceState, accountsUri, allowedKeysUri);
     }
 
-    private void startListFragment(Bundle savedInstanceState, Uri dataUri) {
+    private void startListFragments(Bundle savedInstanceState, Uri accountsUri, Uri allowedKeysUri) {
         // However, if we're being restored from a previous state,
         // then we don't need to do anything and should return or else
         // we could end up with overlapping fragments.
@@ -135,13 +217,23 @@ public class AppSettingsActivity extends ActionBarActivity {
             return;
         }
 
-        // Create an instance of the fragment
-        mAccountsListFragment = AccountsListFragment.newInstance(dataUri);
+        // show accounts only if available (deprecated API)
+        Cursor cursor = getContentResolver().query(accountsUri, null, null, null, null);
+        if (cursor.moveToFirst()) {
+            mAccountsLabel.setVisibility(View.VISIBLE);
+            mAccountsListFragment = AccountsListFragment.newInstance(accountsUri);
+            // Create an instance of the fragments
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.api_accounts_list_fragment, mAccountsListFragment)
+                    .commitAllowingStateLoss();
+        }
 
+        // Create an instance of the fragments
+        mAllowedKeysFragment = AppSettingsAllowedKeysListFragment.newInstance(allowedKeysUri);
         // Add the fragment to the 'fragment_container' FrameLayout
         // NOTE: We use commitAllowingStateLoss() to prevent weird crashes!
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.api_accounts_list_fragment, mAccountsListFragment)
+                .replace(R.id.api_allowed_keys_list_fragment, mAllowedKeysFragment)
                 .commitAllowingStateLoss();
         // do it immediately!
         getSupportFragmentManager().executePendingTransactions();