moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

code styling

Browse Source
This commit is contained in:
Dominik Schürmann 2013-12-31 01:41:37 +01:00
parent cdb3e04b47
commit 52c55aaabe
3 changed files with 89 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenPGP-Keychain/res/layout/key_view.xml
View File

@ -96,9 +96,11 @@
android:padding="4dp"
android:text="@string/section_user_ids" />
<ListView android:id="@+id/user_ids"
<ListView
android:id="@+id/user_ids"
android:layout_width="wrap_content"
android:layout_height="wrap_content"></ListView>
android:layout_height="wrap_content" >
</ListView>
<TextView
style="@style/SectionHeader"

35
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyDetailsActivity.java
View File

@ -1,3 +1,21 @@
/*
* Copyright (C) 2013 Bahtiar 'kalkin' Gadimov
* Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui;
import java.util.Date;
@ -38,13 +56,13 @@ public class KeyDetailsActivity extends SherlockActivity {
long key = extras.getLong("key");
KeyRings.buildPublicKeyRingsByMasterKeyIdUri(key + "");
String[] projection = new String[]{""};
String[] projection = new String[] { "" };
this.publicKey = ProviderHelper.getPGPPublicKeyByKeyId(
getApplicationContext(), key);
this.publicKey = ProviderHelper.getPGPPublicKeyByKeyId(getApplicationContext(), key);
TextView fingerprint = (TextView) this.findViewById(R.id.fingerprint);
fingerprint.setText(PgpKeyHelper.shortifyFingerprint(PgpKeyHelper.getFingerPrint(getApplicationContext(), key)));
fingerprint.setText(PgpKeyHelper.shortifyFingerprint(PgpKeyHelper.getFingerPrint(
getApplicationContext(), key)));
String[] mainUserId = splitUserId("");
TextView expiry = (TextView) this.findViewById(R.id.expiry);
@ -52,13 +70,12 @@ public class KeyDetailsActivity extends SherlockActivity {
if (expiryDate == null) {
expiry.setText("");
} else {
expiry.setText(DateFormat.getDateFormat(getApplicationContext())
.format(expiryDate));
expiry.setText(DateFormat.getDateFormat(getApplicationContext()).format(expiryDate));
}
TextView creation = (TextView) this.findViewById(R.id.creation);
creation.setText(DateFormat.getDateFormat(getApplicationContext())
.format(PgpKeyHelper.getCreationDate(publicKey)));
creation.setText(DateFormat.getDateFormat(getApplicationContext()).format(
PgpKeyHelper.getCreationDate(publicKey)));
mAlgorithm = (TextView) this.findViewById(R.id.algorithm);
mAlgorithm.setText(PgpKeyHelper.getAlgorithmInfo(publicKey));
@ -66,7 +83,7 @@ public class KeyDetailsActivity extends SherlockActivity {
private String[] splitUserId(String userId) {
String[] result = new String[]{"", "", ""};
String[] result = new String[] { "", "", "" };
Log.v("UserID", userId);
Pattern withComment = Pattern.compile("^(.*) [(](.*)[)] <(.*)>$");