More experimental work on api accounts

4 files changed, 23 insertions, 5 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml
index ff560b657..3284b5b0a 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -46,8 +46,8 @@
     <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
-        custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
+        custom:foldedLabel="@string/api_settings_show_advanced"
+        custom:unFoldedLabel="@string/api_settings_hide_advanced"
         custom:foldedIcon="fa-chevron-right"
         custom:unFoldedIcon="fa-chevron-down">
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
index d83c8e87d..d38567497 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
@@ -12,10 +12,24 @@
 
         <fragment
             android:id="@+id/api_app_settings_fragment"
-            android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment"
+            android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:layout="@layout/api_app_settings_fragment" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/api_settings_accounts"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <FrameLayout
+            android:id="@+id/api_accounts_list_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp" />
+
     </LinearLayout>
 </ScrollView>
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
index b91025474..96271d418 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml
@@ -39,8 +39,8 @@
     <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
-        custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
+        custom:foldedLabel="@string/api_settings_show_info"
+        custom:unFoldedLabel="@string/api_settings_hide_info"
         custom:foldedIcon="fa-chevron-right"
         custom:unFoldedIcon="fa-chevron-down">
 
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 11e3028f3..5bf7ca8ca 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -412,6 +412,8 @@
 
     <!-- Remote API -->
     <string name="api_no_apps">No registered applications!\n\nThird-party applications can request access to OpenKeychain. After granting access, they will be listed here.</string>
+    <string name="api_settings_show_info">Show advanced information</string>
+    <string name="api_settings_hide_info">Hide advanced information</string>
     <string name="api_settings_show_advanced">Show advanced settings</string>
     <string name="api_settings_hide_advanced">Hide advanced settings</string>
     <string name="api_settings_no_key">No key selected</string>
@@ -421,6 +423,8 @@
     <string name="api_settings_revoke">Revoke access</string>
     <string name="api_settings_package_name">Package Name</string>
     <string name="api_settings_package_signature">SHA-256 of Package Signature</string>
+    <string name="api_settings_accounts">Accounts</string>
+    <string name="api_settings_accounts_empty">No accounts attached to this application.</string>
     <string name="api_register_text">The displayed application requests access to OpenKeychain.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Registered Applications\' screen.</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>