moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

Lint changes after testing

This commit is contained in:
Bhargav Golla 2014-03-10 14:59:15 -04:00
parent da83c8ff60
commit b90e680ff9
12 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -31,3 +31,8 @@ pom.xml.*
#OS Specific
[Tt]humbs.db
#Lint output
OpenPGP-Keychain/lint-report.html
OpenPGP-Keychain/lint-report_files/*

2
OpenPGP-Keychain/build.gradle
View File

@ -57,5 +57,7 @@ android {
// Do not abort build if lint finds errors
lintOptions {
abortOnError false
htmlReport true
htmlOutput file("lint-report.html")
}
}

1
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
View File

@ -120,7 +120,6 @@ public class ProgressDialogFragment extends DialogFragment {
int messageId = getArguments().getInt(ARG_MESSAGE_ID);
int style = getArguments().getInt(ARG_STYLE);
boolean cancelable = getArguments().getBoolean(ARG_CANCELABLE);
dialog.setMessage(getString(messageId));
dialog.setProgressStyle(style);

2
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
View File

@ -30,6 +30,7 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
import org.sufficientlysecure.keychain.util.Choice;
import android.annotation.TargetApi;
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.content.Context;
@ -110,6 +111,7 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
setExpiryDate(null);
mExpiryDateButton.setOnClickListener(new OnClickListener() {
@TargetApi(11)
public void onClick(View v) {
GregorianCalendar date = mExpiryDate;
if (date == null) {

11
OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml
View File

@ -5,16 +5,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
android:fillViewport="true"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@ -73,7 +68,6 @@
android:layout_gravity="left"
android:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_alignTop="@+id/linearLayout"
android:layout_toRightOf="@+id/relativeLayout" />
<TextView
@ -206,7 +200,6 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
<include layout="@layout/drawer_list" />

3
OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml
View File

@ -71,7 +71,8 @@
android:id="@+id/comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
android:inputType="text"/>
</TableRow>
</TableLayout>

2
OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml
View File

@ -13,7 +13,7 @@
<EditText
android:id="@+id/server"
android:layout_width="match_parent"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:inputType="textUri" />

2
OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
View File

@ -14,7 +14,7 @@
android:orientation="horizontal" >
<RelativeLayout
android:layout_width="wrap_content"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="6sp"
android:layout_marginLeft="16sp"

2
OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
View File

@ -4,7 +4,7 @@
<item
android:id="@+id/menu_key_list_secret_create"
app:showAsAction="always|withText"
app:showAsAction="ifRoom|withText"
android:title="@string/menu_create_key" />
<item
android:id="@+id/menu_key_list_secret_create_expert"

2
OpenPGP-Keychain/src/main/res/menu/key_view.xml
View File

@ -5,7 +5,7 @@
<item
android:id="@+id/menu_key_view_share"
android:icon="@drawable/ic_action_share"
app:showAsAction="always"
app:showAsAction="ifRoom"
android:title="@string/menu_share">
<menu>
<item

2
OpenPGP-Keychain/src/main/res/values-de/strings.xml
View File

@ -356,7 +356,7 @@
<string name="api_select_pub_keys_missing_text">Für diese Benutzer-IDs wurden keine öffentlichen Schlüssel gefunden:</string>
<string name="api_select_pub_keys_dublicates_text">Für diese Benutzer-IDs existieren mehrere öffentliche Schlüssel:</string>
<string name="api_select_pub_keys_text">Bitte die Liste der Empfänger überprüfen!</string>
<string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese App von einer anderen Quelle installiert? Wenn Sie eine Attacke ausschliessen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die App erneut registrieren.</string>
<string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese App von einer anderen Quelle installiert? Wenn Sie eine Attacke ausschließen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die App erneut registrieren.</string>
<!--Share-->
<string name="share_qr_code_dialog_title">Über QR Code teilen</string>
<string name="share_qr_code_dialog_start">Mit \'Weiter\' durch alle QR-Codes gehen und diese nacheinander scannen.</string>

6
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@ -310,8 +310,8 @@
</plurals>
<!-- progress dialogs, usually ending in '…' -->
<string name="progress_done">done.</string>
<string name="progress_cancel">cancel</string>
<string name="progress_done">Done.</string>
<string name="progress_cancel">Cancel</string>
<string name="progress_saving">saving…</string>
<string name="progress_importing">importing…</string>
<string name="progress_exporting">exporting…</string>
@ -326,7 +326,7 @@
<item quantity="one">exporting key…</item>
<item quantity="other">exporting keys…</item>
</plurals>
<string name="progress_generating">generating keys, this can take up to 3 minutes…</string>
<plurals name="progress_generating">
<item quantity="one">generating key, this can take up to 3 minutes…</item>
<item quantity="other">generating keys, this can take up to 3 minutes…</item>