From 95e534e1f5c8494d745b6fec016b21b754fa108e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Feb 2015 17:19:27 +0100
Subject: UI experiments for app settings

---
 .../keychain/remote/ui/AppSettingsActivity.java    | 31 ++++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java')

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 8f822a338..38e971f2b 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,6 +17,7 @@
 
 package org.sufficientlysecure.keychain.remote.ui;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -59,9 +60,10 @@ public class AppSettingsActivity extends BaseActivity {
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        finish();
+                        cancel();
                     }
                 });
+        setTitle(null);
 
         mSettingsFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById(
                 R.id.api_app_settings_fragment);
@@ -80,6 +82,13 @@ public class AppSettingsActivity extends BaseActivity {
 
     private void save() {
         mAllowedKeysFragment.saveAllowedKeys();
+        setResult(Activity.RESULT_OK);
+        finish();
+    }
+
+    private void cancel() {
+        setResult(Activity.RESULT_CANCELED);
+        finish();
     }
 
     @Override
@@ -127,16 +136,16 @@ public class AppSettingsActivity extends BaseActivity {
         mAppSettings = new ProviderHelper(this).getApiAppSettings(appUri);
         mSettingsFragment.setAppSettings(mAppSettings);
 
-        String appName;
-        PackageManager pm = getPackageManager();
-        try {
-            ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0);
-            appName = (String) pm.getApplicationLabel(ai);
-        } catch (PackageManager.NameNotFoundException e) {
-            // fallback
-            appName = mAppSettings.getPackageName();
-        }
-        setTitle(appName);
+//        String appName;
+//        PackageManager pm = getPackageManager();
+//        try {
+//            ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0);
+//            appName = (String) pm.getApplicationLabel(ai);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // fallback
+//            appName = mAppSettings.getPackageName();
+//        }
+//        setTitle(appName);
 
         Uri accountsUri = appUri.buildUpon().appendPath(KeychainContract.PATH_ACCOUNTS).build();
         Log.d(Constants.TAG, "accountsUri: " + accountsUri);
-- 
cgit v1.2.3