cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dominik Schürmann
2014-04-18 20:41:39 +02:00
parent 4a21428e07
commit 19d3fcec7a
23 changed files with 29 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
View File

@@ -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) {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java
View File

@@ -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))};

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
View File

@@ -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)));
}
}
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
View File

@@ -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)));
}
}
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -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);
}

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
View File

@@ -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;
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
View File

@@ -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);

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java
View File

@@ -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) {