moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -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

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

@ -95,10 +95,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:padding="4dp"
android:text="@string/section_user_ids" /> 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_width="wrap_content"
android:layout_height="wrap_content"></ListView> android:layout_height="wrap_content" >
</ListView>
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"

20
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
View File

@ -40,16 +40,16 @@ import android.content.Context;
public class PgpKeyHelper { public class PgpKeyHelper {
/** /**
* Returns the last 9 chars of a fingerprint * Returns the last 9 chars of a fingerprint
* *
* @param fingerprint * @param fingerprint
* String containing short or long fingerprint * String containing short or long fingerprint
* @return * @return
*/ */
public static String shortifyFingerprint(String fingerprint) { public static String shortifyFingerprint(String fingerprint) {
return fingerprint.substring(41); return fingerprint.substring(41);
} }
public static Date getCreationDate(PGPPublicKey key) { public static Date getCreationDate(PGPPublicKey key) {
return key.getCreationTime(); return key.getCreationTime();

131
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; package org.sufficientlysecure.keychain.ui;
import java.util.Date; import java.util.Date;
@ -19,72 +37,71 @@ import com.actionbarsherlock.app.SherlockActivity;
public class KeyDetailsActivity extends SherlockActivity { public class KeyDetailsActivity extends SherlockActivity {
private PGPPublicKey publicKey; private PGPPublicKey publicKey;
private TextView mAlgorithm; private TextView mAlgorithm;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Bundle extras = getIntent().getExtras();
setContentView(R.layout.key_view);
if (extras == null) {
return;
}
getSupportActionBar().setDisplayHomeAsUpEnabled(true); Bundle extras = getIntent().getExtras();
getSupportActionBar().setHomeButtonEnabled(true); setContentView(R.layout.key_view);
if (extras == null) {
return;
}
long key = extras.getLong("key"); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
KeyRings.buildPublicKeyRingsByMasterKeyIdUri(key + "");
String[] projection = new String[]{""};
this.publicKey = ProviderHelper.getPGPPublicKeyByKeyId( long key = extras.getLong("key");
getApplicationContext(), key);
TextView fingerprint = (TextView) this.findViewById(R.id.fingerprint); KeyRings.buildPublicKeyRingsByMasterKeyIdUri(key + "");
fingerprint.setText(PgpKeyHelper.shortifyFingerprint(PgpKeyHelper.getFingerPrint(getApplicationContext(), key))); String[] projection = new String[] { "" };
String[] mainUserId = splitUserId("");
TextView expiry = (TextView) this.findViewById(R.id.expiry);
Date expiryDate = PgpKeyHelper.getExpiryDate(publicKey);
if (expiryDate == null) {
expiry.setText("");
} else {
expiry.setText(DateFormat.getDateFormat(getApplicationContext())
.format(expiryDate));
}
TextView creation = (TextView) this.findViewById(R.id.creation); this.publicKey = ProviderHelper.getPGPPublicKeyByKeyId(getApplicationContext(), key);
creation.setText(DateFormat.getDateFormat(getApplicationContext())
.format(PgpKeyHelper.getCreationDate(publicKey)));
mAlgorithm = (TextView) this.findViewById(R.id.algorithm);
mAlgorithm.setText(PgpKeyHelper.getAlgorithmInfo(publicKey));
} TextView fingerprint = (TextView) this.findViewById(R.id.fingerprint);
fingerprint.setText(PgpKeyHelper.shortifyFingerprint(PgpKeyHelper.getFingerPrint(
getApplicationContext(), key)));
String[] mainUserId = splitUserId("");
private String[] splitUserId(String userId) { TextView expiry = (TextView) this.findViewById(R.id.expiry);
Date expiryDate = PgpKeyHelper.getExpiryDate(publicKey);
if (expiryDate == null) {
expiry.setText("");
} else {
expiry.setText(DateFormat.getDateFormat(getApplicationContext()).format(expiryDate));
}
String[] result = new String[]{"", "", ""}; TextView creation = (TextView) this.findViewById(R.id.creation);
Log.v("UserID", userId); creation.setText(DateFormat.getDateFormat(getApplicationContext()).format(
PgpKeyHelper.getCreationDate(publicKey)));
mAlgorithm = (TextView) this.findViewById(R.id.algorithm);
mAlgorithm.setText(PgpKeyHelper.getAlgorithmInfo(publicKey));
Pattern withComment = Pattern.compile("^(.*) [(](.*)[)] <(.*)>$"); }
Matcher matcher = withComment.matcher(userId);
if (matcher.matches()) {
result[0] = matcher.group(1);
result[1] = matcher.group(2);
result[2] = matcher.group(3);
return result;
}
Pattern withoutComment = Pattern.compile("^(.*) <(.*)>$"); private String[] splitUserId(String userId) {
matcher = withoutComment.matcher(userId);
if (matcher.matches()) { String[] result = new String[] { "", "", "" };
result[0] = matcher.group(1); Log.v("UserID", userId);
result[1] = matcher.group(2);
return result; Pattern withComment = Pattern.compile("^(.*) [(](.*)[)] <(.*)>$");
} Matcher matcher = withComment.matcher(userId);
return result; if (matcher.matches()) {
} result[0] = matcher.group(1);
result[1] = matcher.group(2);
result[2] = matcher.group(3);
return result;
}
Pattern withoutComment = Pattern.compile("^(.*) <(.*)>$");
matcher = withoutComment.matcher(userId);
if (matcher.matches()) {
result[0] = matcher.group(1);
result[1] = matcher.group(2);
return result;
}
return result;
}
} }