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

spring-cleaning: remove unused resources, rename strings from camelCase to snake_case to follow standard practice

Browse Source
This commit is contained in:
Dominik Schürmann
2013-10-25 21:46:05 +02:00
parent 283037acf5
commit 2f81c2fb0f
147 changed files with 506 additions and 9882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@@ -277,7 +277,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
if (!FileHelper.isStorageMounted(inputFile)
|| !FileHelper.isStorageMounted(outputFile)) {
throw new PgpGeneralException(
getString(R.string.error_externalStorageNotReady));
getString(R.string.error_external_storage_not_ready));
}
inStream = new FileInputStream(inputFile);
@@ -421,7 +421,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
if (!FileHelper.isStorageMounted(inputFile)
|| !FileHelper.isStorageMounted(outputFile)) {
throw new PgpGeneralException(
getString(R.string.error_externalStorageNotReady));
getString(R.string.error_external_storage_not_ready));
}
// InputStream
@@ -616,9 +616,9 @@ public class KeychainIntentService extends IntentService implements ProgressDial
PgpHelper.deleteFileSecurely(this, this, new File(deleteFile));
} catch (FileNotFoundException e) {
throw new PgpGeneralException(
getString(R.string.error_fileNotFound, deleteFile));
getString(R.string.error_file_not_found, deleteFile));
} catch (IOException e) {
throw new PgpGeneralException(getString(R.string.error_fileDeleteFailed,
throw new PgpGeneralException(getString(R.string.error_file_delete_failed,
deleteFile));
}
@@ -694,7 +694,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
// check if storage is ready
if (!FileHelper.isStorageMounted(outputFile)) {
throw new PgpGeneralException(getString(R.string.error_externalStorageNotReady));
throw new PgpGeneralException(getString(R.string.error_external_storage_not_ready));
}
// OutputStream

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
View File

@@ -79,7 +79,7 @@ public class KeychainIntentServiceHandler extends Handler {
// show error from service
if (data.containsKey(DATA_ERROR)) {
Toast.makeText(mActivity,
mActivity.getString(R.string.errorMessage, data.getString(DATA_ERROR)),
mActivity.getString(R.string.error_message, data.getString(DATA_ERROR)),
Toast.LENGTH_SHORT).show();
}

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/AppSettingsFragment.java
View File

@@ -227,7 +227,7 @@ public class AppSettingsFragment extends Fragment {
mKeyUserId.setText(R.string.api_settings_no_key);
mKeyUserIdRest.setText("");
} else {
String uid = getResources().getString(R.string.unknownUserId);
String uid = getResources().getString(R.string.unknown_user_id);
String uidExtra = "";
PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(
getActivity(), secretKeyId);

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
View File

@@ -387,7 +387,7 @@ public class OpenPgpService extends RemoteService {
}
secretKeyId = PgpHelper.getDecryptionKeyId(this, inputStream2);
if (secretKeyId == Id.key.none) {
throw new PgpGeneralException(getString(R.string.error_noSecretKeyFound));
throw new PgpGeneralException(getString(R.string.error_no_secret_key_found));
}
} catch (NoAsymmetricEncryptionException e) {
if (inputStream2.markSupported()) {
@@ -396,7 +396,7 @@ public class OpenPgpService extends RemoteService {
secretKeyId = Id.key.symmetric;
if (!PgpOperation.hasSymmetricEncryption(this, inputStream2)) {
throw new PgpGeneralException(
getString(R.string.error_noKnownEncryptionFound));
getString(R.string.error_no_known_encryption_found));
}
// we do not support symmetric decryption from the API!
throw new Exception("Symmetric decryption is not supported!");

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/RemoteServiceActivity.java
View File

@@ -225,7 +225,7 @@ public class RemoteServiceActivity extends SherlockFragmentActivity {
finishHandled = true;
finish();
}
}, R.string.btn_doNotSave, new View.OnClickListener() {
}, R.string.btn_do_not_save, new View.OnClickListener() {
@Override
public void onClick(View v) {
// cancel