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

Fix a bunch of trivial code warnings

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-01-22 15:43:31 +01:00
parent 583b427336
commit 5c2e4f889f
111 changed files with 453 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
View File

@@ -61,8 +61,8 @@ public class AppSettingsActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mAppNameView = (TextView) findViewById(R.id.api_app_settings_app_name);
mAppIconView = (ImageView) findViewById(R.id.api_app_settings_app_icon);
mAppNameView = findViewById(R.id.api_app_settings_app_name);
mAppIconView = findViewById(R.id.api_app_settings_app_icon);
findViewById(R.id.fab).setOnClickListener(new View.OnClickListener() {
@Override

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

@@ -76,7 +76,7 @@ public class AppSettingsAllowedKeysListFragment extends ListFragmentWorkaround i
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View layout = super.onCreateView(inflater, container, savedInstanceState);
ListView lv = (ListView) layout.findViewById(android.R.id.list);
ListView lv = layout.findViewById(android.R.id.list);
ViewGroup parent = (ViewGroup) lv.getParent();
/*

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

@@ -63,10 +63,10 @@ public class AppSettingsHeaderFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.api_app_settings_fragment, container, false);
mAppNameView = (TextView) view.findViewById(R.id.api_app_settings_app_name);
mAppIconView = (ImageView) view.findViewById(R.id.api_app_settings_app_icon);
mPackageName = (TextView) view.findViewById(R.id.api_app_settings_package_name);
mPackageCertificate = (TextView) view.findViewById(R.id.api_app_settings_package_certificate);
mAppNameView = view.findViewById(R.id.api_app_settings_app_name);
mAppIconView = view.findViewById(R.id.api_app_settings_app_icon);
mPackageName = view.findViewById(R.id.api_app_settings_package_name);
mPackageCertificate = view.findViewById(R.id.api_app_settings_package_certificate);
return view;
}

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java
View File

@@ -321,9 +321,9 @@ public class AppsListFragment extends ListFragment implements
@Override
public void bindView(View view, Context context, Cursor cursor) {
TextView text = (TextView) view.findViewById(R.id.api_apps_adapter_item_name);
ImageView icon = (ImageView) view.findViewById(R.id.api_apps_adapter_item_icon);
ImageView installIcon = (ImageView) view.findViewById(R.id.api_apps_adapter_install_icon);
TextView text = view.findViewById(R.id.api_apps_adapter_item_name);
ImageView icon = view.findViewById(R.id.api_apps_adapter_item_icon);
ImageView installIcon = view.findViewById(R.id.api_apps_adapter_install_icon);
String packageName = cursor.getString(INDEX_PACKAGE_NAME);
Timber.d("packageName: " + packageName);

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

@@ -63,7 +63,7 @@ public class RemoteErrorActivity extends BaseActivity {
);
// set text on view
TextView textView = (TextView) findViewById(R.id.api_app_error_message_text);
TextView textView = findViewById(R.id.api_app_error_message_text);
textView.setText(redErrorMessage);
}

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

@@ -94,8 +94,8 @@ public class RemoteRegisterActivity extends FragmentActivity {
View view = LayoutInflater.from(theme).inflate(R.layout.api_remote_register_app, null, false);
alert.setView(view);
buttonAllow = (Button) view.findViewById(R.id.button_allow);
buttonCancel = (Button) view.findViewById(R.id.button_cancel);
buttonAllow = view.findViewById(R.id.button_allow);
buttonCancel = view.findViewById(R.id.button_cancel);
setupListenersForPresenter();
mvpView = createMvpView(view);
@@ -132,8 +132,8 @@ public class RemoteRegisterActivity extends FragmentActivity {
@NonNull
private RemoteRegisterView createMvpView(View view) {
final TextView titleText = (TextView) view.findViewById(R.id.api_register_text);
final ImageView iconClientApp = (ImageView) view.findViewById(R.id.icon_client_app);
final TextView titleText = view.findViewById(R.id.api_register_text);
final ImageView iconClientApp = view.findViewById(R.id.icon_client_app);
return new RemoteRegisterView() {
@Override

26
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteSecurityProblemDialogActivity.java
View File

@@ -110,12 +110,12 @@ public class RemoteSecurityProblemDialogActivity extends FragmentActivity {
View view = LayoutInflater.from(theme).inflate(R.layout.remote_security_issue_dialog, null, false);
alert.setView(view);
buttonGotIt = (Button) view.findViewById(R.id.button_allow);
buttonViewKey = (Button) view.findViewById(R.id.button_view_key);
buttonOverride = (Button) view.findViewById(R.id.button_override);
buttonOverrideUndo = (Button) view.findViewById(R.id.button_override_undo);
buttonOverrideBack = (Button) view.findViewById(R.id.button_override_back);
buttonOverrideConfirm = (Button) view.findViewById(R.id.button_override_confirm);
buttonGotIt = view.findViewById(R.id.button_allow);
buttonViewKey = view.findViewById(R.id.button_view_key);
buttonOverride = view.findViewById(R.id.button_override);
buttonOverrideUndo = view.findViewById(R.id.button_override_undo);
buttonOverrideBack = view.findViewById(R.id.button_override_back);
buttonOverrideConfirm = view.findViewById(R.id.button_override_confirm);
setupListenersForPresenter();
mvpView = createMvpView(view);
@@ -152,17 +152,17 @@ public class RemoteSecurityProblemDialogActivity extends FragmentActivity {
@NonNull
private RemoteSecurityProblemView createMvpView(View view) {
final LinearLayout insecureWarningLayout = (LinearLayout) view.findViewById(R.id.insecure_warning_layout);
final ImageView iconClientApp = (ImageView) view.findViewById(R.id.icon_client_app);
final TextView explanationText = (TextView) insecureWarningLayout.findViewById(R.id.dialog_insecure_text);
final LinearLayout insecureWarningLayout = view.findViewById(R.id.insecure_warning_layout);
final ImageView iconClientApp = view.findViewById(R.id.icon_client_app);
final TextView explanationText = insecureWarningLayout.findViewById(R.id.dialog_insecure_text);
final TextView recommendText =
(TextView) insecureWarningLayout.findViewById(R.id.dialog_insecure_recommend_text);
insecureWarningLayout.findViewById(R.id.dialog_insecure_recommend_text);
final TextView overrideText =
(TextView) insecureWarningLayout.findViewById(R.id.dialog_insecure_override_text);
insecureWarningLayout.findViewById(R.id.dialog_insecure_override_text);
final ToolableViewAnimator secondaryLayoutAnimator =
(ToolableViewAnimator) insecureWarningLayout.findViewById(R.id.dialog_insecure_secondary_layout);
insecureWarningLayout.findViewById(R.id.dialog_insecure_secondary_layout);
final ToolableViewAnimator buttonBarAnimator =
(ToolableViewAnimator) view.findViewById(R.id.dialog_insecure_button_bar);
view.findViewById(R.id.dialog_insecure_button_bar);
return new RemoteSecurityProblemView() {
private boolean layoutInitialized = false;

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

@@ -120,7 +120,7 @@ public class RemoteSelectPubKeyActivity extends BaseActivity {
});
// set text on view
TextView textView = (TextView) findViewById(R.id.api_select_pub_keys_text);
TextView textView = findViewById(R.id.api_select_pub_keys_text);
textView.setText(ssb, TextView.BufferType.SPANNABLE);
// Load select pub keys fragment

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java
View File

@@ -92,8 +92,8 @@ public class RequestKeyPermissionActivity extends FragmentActivity {
View view = LayoutInflater.from(theme).inflate(R.layout.api_remote_request_key_permission, null, false);
alert.setView(view);
buttonAllow = (Button) view.findViewById(R.id.button_allow);
buttonCancel = (Button) view.findViewById(R.id.button_cancel);
buttonAllow = view.findViewById(R.id.button_allow);
buttonCancel = view.findViewById(R.id.button_cancel);
setupListenersForPresenter();
mvpView = createMvpView(view);
@@ -130,9 +130,9 @@ public class RequestKeyPermissionActivity extends FragmentActivity {
@NonNull
private RequestKeyPermissionMvpView createMvpView(View view) {
final TextView titleText = (TextView) view.findViewById(R.id.select_identity_key_title);
final TextView keyUserIdView = (TextView) view.findViewById(R.id.select_key_item_name);
final ImageView iconClientApp = (ImageView) view.findViewById(R.id.icon_client_app);
final TextView titleText = view.findViewById(R.id.select_identity_key_title);
final TextView keyUserIdView = view.findViewById(R.id.select_key_item_name);
final ImageView iconClientApp = view.findViewById(R.id.icon_client_app);
final View keyUnavailableWarning = view.findViewById(R.id.requested_key_unavailable_warning);
final View keyInfoLayout = view.findViewById(R.id.key_info_layout);

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

@@ -56,7 +56,7 @@ public class SelectSignKeyIdActivity extends BaseActivity {
}
});
TextView noneButton = (TextView) findViewById(R.id.api_select_sign_key_none);
TextView noneButton = findViewById(R.id.api_select_sign_key_none);
noneButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectEncryptKeyAdapter.java
View File

@@ -139,11 +139,11 @@ public class SelectEncryptKeyAdapter extends KeyCursorAdapter<SelectEncryptKeyAd
super(itemView);
itemView.setOnClickListener(this);
mUserIdText = (TextView) itemView.findViewById(R.id.select_key_item_name);
mUserIdRestText = (TextView) itemView.findViewById(R.id.select_key_item_email);
mCreationText = (TextView) itemView.findViewById(R.id.select_key_item_creation);
mStatusIcon = (ImageView) itemView.findViewById(R.id.select_key_item_status_icon);
mChecked = (CheckBox) itemView.findViewById(R.id.selected);
mUserIdText = itemView.findViewById(R.id.select_key_item_name);
mUserIdRestText = itemView.findViewById(R.id.select_key_item_email);
mCreationText = itemView.findViewById(R.id.select_key_item_creation);
mStatusIcon = itemView.findViewById(R.id.select_key_item_status_icon);
mChecked = itemView.findViewById(R.id.selected);
}
public void bind(PublicKeyCursor cursor, String query, boolean selected) {

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java
View File

@@ -129,10 +129,10 @@ public class SelectSignKeyAdapter extends KeyCursorAdapter<CursorAdapter.KeyCurs
itemView.setClickable(true);
itemView.setOnClickListener(this);
mUserIdText = (TextView) itemView.findViewById(R.id.select_key_item_name);
mUserIdRestText = (TextView) itemView.findViewById(R.id.select_key_item_email);
mCreationText = (TextView) itemView.findViewById(R.id.select_key_item_creation);
mStatusIcon = (ImageView) itemView.findViewById(R.id.select_key_item_status_icon);
mUserIdText = itemView.findViewById(R.id.select_key_item_name);
mUserIdRestText = itemView.findViewById(R.id.select_key_item_email);
mCreationText = itemView.findViewById(R.id.select_key_item_creation);
mStatusIcon = itemView.findViewById(R.id.select_key_item_status_icon);
}
public void bind(KeyCursor cursor, String query) {

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteDeduplicateActivity.java
View File

@@ -117,10 +117,10 @@ public class RemoteDeduplicateActivity extends FragmentActivity {
View view = layoutInflater.inflate(R.layout.api_remote_deduplicate, null, false);
alert.setView(view);
buttonSelect = (Button) view.findViewById(R.id.button_select);
buttonCancel = (Button) view.findViewById(R.id.button_cancel);
buttonSelect = view.findViewById(R.id.button_select);
buttonCancel = view.findViewById(R.id.button_cancel);
keyChoiceList = (RecyclerView) view.findViewById(R.id.duplicate_key_list);
keyChoiceList = view.findViewById(R.id.duplicate_key_list);
keyChoiceList.setLayoutManager(new LinearLayoutManager(activity));
keyChoiceList.addItemDecoration(
new DividerItemDecoration(activity, DividerItemDecoration.VERTICAL_LIST, true));
@@ -160,9 +160,9 @@ public class RemoteDeduplicateActivity extends FragmentActivity {
@NonNull
private RemoteDeduplicateView createMvpView(View view, LayoutInflater layoutInflater) {
final ImageView iconClientApp = (ImageView) view.findViewById(R.id.icon_client_app);
final ImageView iconClientApp = view.findViewById(R.id.icon_client_app);
final KeyChoiceAdapter keyChoiceAdapter = new KeyChoiceAdapter(layoutInflater, getResources());
final TextView addressText = (TextView) view.findViewById(R.id.select_key_item_name);
final TextView addressText = view.findViewById(R.id.select_key_item_name);
keyChoiceList.setAdapter(keyChoiceAdapter);
return new RemoteDeduplicateView() {
@@ -314,9 +314,9 @@ public class RemoteDeduplicateActivity extends FragmentActivity {
KeyChoiceViewHolder(View itemView) {
super(itemView);
vName = (TextView) itemView.findViewById(R.id.key_list_item_name);
vCreation = (TextView) itemView.findViewById(R.id.key_list_item_creation);
vIcon = (ImageView) itemView.findViewById(R.id.key_list_item_icon);
vName = itemView.findViewById(R.id.key_list_item_name);
vCreation = itemView.findViewById(R.id.key_list_item_creation);
vIcon = itemView.findViewById(R.id.key_list_item_icon);
}
void bind(KeyInfo keyInfo, Drawable selectionIcon) {

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/dialog/RemoteSelectAuthenticationKeyActivity.java
View File

@@ -140,10 +140,10 @@ public class RemoteSelectAuthenticationKeyActivity extends FragmentActivity {
View view = layoutInflater.inflate(R.layout.api_remote_select_authentication_key, null, false);
alert.setView(view);
buttonSelect = (Button) view.findViewById(R.id.button_select);
buttonCancel = (Button) view.findViewById(R.id.button_cancel);
buttonSelect = view.findViewById(R.id.button_select);
buttonCancel = view.findViewById(R.id.button_cancel);
keyChoiceList = (RecyclerView) view.findViewById(R.id.authentication_key_list);
keyChoiceList = view.findViewById(R.id.authentication_key_list);
keyChoiceList.setLayoutManager(new LinearLayoutManager(activity));
keyChoiceList.addItemDecoration(
new DividerItemDecoration(activity, DividerItemDecoration.VERTICAL_LIST, true));
@@ -183,7 +183,7 @@ public class RemoteSelectAuthenticationKeyActivity extends FragmentActivity {
@NonNull
private RemoteSelectAuthenticationKeyView createMvpView(View view, LayoutInflater layoutInflater) {
final ImageView iconClientApp = (ImageView) view.findViewById(R.id.icon_client_app);
final ImageView iconClientApp = view.findViewById(R.id.icon_client_app);
final KeyChoiceAdapter keyChoiceAdapter = new KeyChoiceAdapter(layoutInflater, getResources());
keyChoiceList.setAdapter(keyChoiceAdapter);
@@ -328,9 +328,9 @@ public class RemoteSelectAuthenticationKeyActivity extends FragmentActivity {
KeyChoiceViewHolder(View itemView) {
super(itemView);
vName = (TextView) itemView.findViewById(R.id.key_list_item_name);
vCreation = (TextView) itemView.findViewById(R.id.key_list_item_creation);
vIcon = (ImageView) itemView.findViewById(R.id.key_list_item_icon);
vName = itemView.findViewById(R.id.key_list_item_name);
vCreation = itemView.findViewById(R.id.key_list_item_creation);
vIcon = itemView.findViewById(R.id.key_list_item_icon);
}
void bind(KeyInfo keyInfo, Drawable selectionIcon) {