Remove unused strings, fix some lint errors, fix some language confusions

8 files changed, 12 insertions, 10 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 6499814fb..aafc2eb34 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -227,7 +227,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
             @Override
             public void onCreate(SQLiteDatabase db) {
                 // should never happen
-                assert false;
+                throw new AssertionError();
             }
             @Override
             public void onDowngrade(SQLiteDatabase db, int old, int nu) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
index c875818e3..088f593d4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
@@ -78,7 +78,7 @@ public class DrawerActivity extends ActionBarActivity {
         }
 
         NavItem mItemIconTexts[] = new NavItem[]{
-                new NavItem("fa-user", getString(R.string.nav_contacts)),
+                new NavItem("fa-user", getString(R.string.nav_keys)),
                 new NavItem("fa-lock", getString(R.string.nav_encrypt)),
                 new NavItem("fa-unlock", getString(R.string.nav_decrypt)),
                 new NavItem("fa-android", getString(R.string.nav_apps))};
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
index 2566d1647..8aee6e4b0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
@@ -335,7 +335,7 @@ public class EncryptFileFragment extends Fragment {
                         sendFileIntent.setType("*/*");
                         sendFileIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(mOutputFilename));
                         startActivity(Intent.createChooser(sendFileIntent,
-                                getString(R.string.title_send_file)));
+                                getString(R.string.title_share_file)));
                     }
                 }
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
index b68df81df..4a3a4a43c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
@@ -240,7 +240,7 @@ public class EncryptMessageFragment extends Fragment {
 
                         sendIntent.putExtra(Intent.EXTRA_TEXT, output);
                         startActivity(Intent.createChooser(sendIntent,
-                                getString(R.string.title_send_email)));
+                                getString(R.string.title_share_with)));
                     }
                 }
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index ebc21a926..82f65a962 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -612,7 +612,7 @@ public class KeyListFragment extends Fragment
             if (mCursor.getInt(KeyListFragment.INDEX_HAS_ANY_SECRET) != 0) {
                 { // set contact count
                     int num = mCursor.getCount();
-                    String contactsTotal = getResources().getQuantityString(R.plurals.n_contacts, num, num);
+                    String contactsTotal = getResources().getQuantityString(R.plurals.n_keys, num, num);
                     holder.mCount.setText(contactsTotal);
                     holder.mCount.setVisibility(View.VISIBLE);
                 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index 6a9403cc2..448d29156 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
@@ -67,7 +67,7 @@ public class PreferencesActivity extends PreferenceActivity {
 
             mKeyServerPreference = (PreferenceScreen) findPreference(Constants.Pref.KEY_SERVERS);
             String servers[] = sPreferences.getKeyServers();
-            mKeyServerPreference.setSummary(getResources().getQuantityString(R.plurals.n_key_servers,
+            mKeyServerPreference.setSummary(getResources().getQuantityString(R.plurals.n_keyservers,
                     servers.length, servers.length));
             mKeyServerPreference
                     .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -138,7 +138,7 @@ public class PreferencesActivity extends PreferenceActivity {
                         .getStringArrayExtra(PreferencesKeyServerActivity.EXTRA_KEY_SERVERS);
                 sPreferences.setKeyServers(servers);
                 mKeyServerPreference.setSummary(getResources().getQuantityString(
-                        R.plurals.n_key_servers, servers.length, servers.length));
+                        R.plurals.n_keyservers, servers.length, servers.length));
                 break;
             }
 
@@ -175,7 +175,7 @@ public class PreferencesActivity extends PreferenceActivity {
 
             mKeyServerPreference = (PreferenceScreen) findPreference(Constants.Pref.KEY_SERVERS);
             String servers[] = sPreferences.getKeyServers();
-            mKeyServerPreference.setSummary(getResources().getQuantityString(R.plurals.n_key_servers,
+            mKeyServerPreference.setSummary(getResources().getQuantityString(R.plurals.n_keyservers,
                     servers.length, servers.length));
             mKeyServerPreference
                     .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -201,7 +201,7 @@ public class PreferencesActivity extends PreferenceActivity {
                             .getStringArrayExtra(PreferencesKeyServerActivity.EXTRA_KEY_SERVERS);
                     sPreferences.setKeyServers(servers);
                     mKeyServerPreference.setSummary(getResources().getQuantityString(
-                            R.plurals.n_key_servers, servers.length, servers.length));
+                            R.plurals.n_keyservers, servers.length, servers.length));
                     break;
                 }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
index ff5f081ae..0de675bab 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
@@ -74,7 +74,7 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O
         mTitle = (TextView) findViewById(R.id.title);
         mSummary = (TextView) findViewById(R.id.summary);
 
-        mTitle.setText(R.string.label_key_servers);
+        mTitle.setText(R.string.label_keyservers);
 
         mEditors = (ViewGroup) findViewById(R.id.editors);
         mAdd = findViewById(R.id.add);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
index 36fa1edb4..c71bc160a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
@@ -17,6 +17,7 @@
 
 package org.sufficientlysecure.keychain.ui.dialog;
 
+import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -308,6 +309,7 @@ public class CreateKeyDialogFragment extends DialogFragment {
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private void replaceArrayAdapterContent(ArrayAdapter<CharSequence> arrayAdapter, int stringArrayResourceId) {
         final String[] spinnerValuesStringArray = getResources().getStringArray(stringArrayResourceId);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {