diff options
8 files changed, 44 insertions, 51 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index 4dbe23863..1efcfde27 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -77,7 +77,6 @@ public class ImportKeysListFragment extends ListFragment implements public ArrayList<ParcelableKeyRing> getSelectedData() { ArrayList<ParcelableKeyRing> result = new ArrayList<ParcelableKeyRing>(); for (ImportKeysListEntry entry : getSelectedEntries()) { - Log.d(Constants.TAG, "code" + Integer.toString(entry.hashCode())); result.add(mCachedKeyData.get(entry.hashCode())); } return result; @@ -149,8 +148,6 @@ public class ImportKeysListFragment extends ListFragment implements if (dataUri != null || bytes != null) { mLoaderState = new BytesLoaderState(bytes, dataUri); } else if (query != null) { - // TODO: this is used when updating a key. - // Currently it simply uses keyserver nr 0 Preferences prefs = Preferences.getPreferences(getActivity()); mLoaderState = new CloudLoaderState(query, prefs.getCloudSearchPrefs()); } @@ -165,6 +162,8 @@ public class ImportKeysListFragment extends ListFragment implements } }); + getListView().setFastScrollEnabled(true); + restartLoaders(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java index 24c15046a..f06531b01 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -120,7 +120,7 @@ public class KeyListActivity extends DrawerActivity { try { KeychainDatabase.debugBackup(this, false); Notify.showNotify(this, "Backup to debug_backup.db completed", Notify.Style.INFO); - } catch(IOException e) { + } catch (IOException e) { Log.e(Constants.TAG, "IO Error", e); Notify.showNotify(this, "IO Error: " + e.getMessage(), Notify.Style.ERROR); } diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index 6ff827894..394ef10f4 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -26,40 +26,40 @@ android:orientation="vertical"> <LinearLayout - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" - android:id="@+id/decrypt_file_browse" - android:clickable="true" - style="@style/SelectableItem"> + android:id="@+id/decrypt_file_browse" + android:clickable="true" + style="@style/SelectableItem"> <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_file_colon" - android:gravity="center_vertical"/> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_file_colon" + android:gravity="center_vertical" /> <TextView - android:id="@+id/decrypt_file_filename" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:hint="@string/filemanager_title_open" - android:drawableRight="@drawable/ic_action_collection" - android:drawablePadding="8dp" - android:gravity="center_vertical"/> + android:id="@+id/decrypt_file_filename" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:hint="@string/filemanager_title_open" + android:drawableRight="@drawable/ic_action_collection" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> </LinearLayout> <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_marginBottom="8dp"/> + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp" /> <CheckBox android:id="@+id/decrypt_file_delete_after_decryption" @@ -87,8 +87,7 @@ android:gravity="center_vertical" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_marginBottom="8dp" /> + android:layout_alignParentStart="true" /> <View android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 5e9189fd3..f6cc892d7 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -48,8 +48,7 @@ android:layout_height="wrap_content" android:clickable="true" style="@style/SelectableItem" - android:orientation="horizontal" - android:layout_marginBottom="8dp"> + android:orientation="horizontal"> <TextView android:paddingLeft="8dp" diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml index ec91f748c..b44a2bc4d 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content_frame" - android:layout_marginLeft="@dimen/drawer_content_padding" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> - <include layout="@layout/notify_area"/> + <include layout="@layout/notify_area" /> <FrameLayout - android:id="@+id/encrypt_pager_mode" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> + android:id="@+id/encrypt_pager_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> <fragment android:id="@+id/encrypt_file_fragment" diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index f64f04b20..f4c479ee9 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -34,7 +34,6 @@ android:paddingLeft="8dp" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:layout_marginBottom="8dp" android:clickable="true" style="@style/SelectableItem" android:orientation="horizontal"> diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml index f724604c2..83e2cf9ee 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml @@ -32,8 +32,7 @@ android:layout_height="wrap_content" android:clickable="true" style="@style/SelectableItem" - android:orientation="horizontal" - android:layout_marginBottom="8dp"> + android:orientation="horizontal"> <TextView android:paddingLeft="8dp" diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 81aa6d792..2d7f1026a 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <include layout="@layout/notify_area"/> + <include layout="@layout/notify_area" /> <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/import_sliding_tab_layout" @@ -57,7 +57,6 @@ android:id="@+id/import_import" android:paddingLeft="8dp" android:paddingRight="8dp" - android:layout_marginBottom="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="match_parent" |