From 644a6d89fe78e3766e02c727390eaaa635c3b148 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Tue, 12 Dec 2017 02:21:13 +0100 Subject: [PATCH] Remove redundant casts Android SDK 26 changed the signature of findViewById --- .../main/java/me/impy/aegis/AddProfileActivity.java | 12 ++++++------ app/src/main/java/me/impy/aegis/AuthActivity.java | 10 +++++----- .../java/me/impy/aegis/CustomAuthenticatedSlide.java | 10 +++++----- .../me/impy/aegis/CustomAuthenticationSlide.java | 6 +++--- .../main/java/me/impy/aegis/KeyProfileAdapter.java | 10 +++++----- app/src/main/java/me/impy/aegis/MainActivity.java | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/me/impy/aegis/AddProfileActivity.java b/app/src/main/java/me/impy/aegis/AddProfileActivity.java index 2521f1ba..28770c96 100644 --- a/app/src/main/java/me/impy/aegis/AddProfileActivity.java +++ b/app/src/main/java/me/impy/aegis/AddProfileActivity.java @@ -30,11 +30,11 @@ public class AddProfileActivity extends AppCompatActivity { setPreferredTheme(); setContentView(R.layout.activity_add_profile); - _profileName = (EditText) findViewById(R.id.addProfileName); - _textAlgorithm = (TextView) findViewById(R.id.tvAlgorithm); - _textIssuer = (TextView) findViewById(R.id.tvIssuer); - _textPeriod = (TextView) findViewById(R.id.tvPeriod); - _textOtp = (TextView) findViewById(R.id.tvOtp); + _profileName = findViewById(R.id.addProfileName); + _textAlgorithm = findViewById(R.id.tvAlgorithm); + _textIssuer = findViewById(R.id.tvIssuer); + _textPeriod = findViewById(R.id.tvPeriod); + _textOtp = findViewById(R.id.tvOtp); getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowTitleEnabled(false); @@ -43,7 +43,7 @@ public class AddProfileActivity extends AppCompatActivity { initializeForm(); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/me/impy/aegis/AuthActivity.java b/app/src/main/java/me/impy/aegis/AuthActivity.java index 1bba781a..dc572dd9 100644 --- a/app/src/main/java/me/impy/aegis/AuthActivity.java +++ b/app/src/main/java/me/impy/aegis/AuthActivity.java @@ -47,10 +47,10 @@ public class AuthActivity extends AppCompatActivity implements FingerprintUiHelp protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_auth); - _textPassword = (EditText) findViewById(R.id.text_password); - LinearLayout boxFingerprint = (LinearLayout) findViewById(R.id.box_fingerprint); - SwirlView imgFingerprint = (SwirlView) findViewById(R.id.img_fingerprint); - TextView textFingerprint = (TextView) findViewById(R.id.text_fingerprint); + _textPassword = findViewById(R.id.text_password); + LinearLayout boxFingerprint = findViewById(R.id.box_fingerprint); + SwirlView imgFingerprint = findViewById(R.id.img_fingerprint); + TextView textFingerprint = findViewById(R.id.text_fingerprint); Intent intent = getIntent(); _slots = (SlotCollection) intent.getSerializableExtra("slots"); @@ -76,7 +76,7 @@ public class AuthActivity extends AppCompatActivity implements FingerprintUiHelp } } - Button button = (Button) findViewById(R.id.button_decrypt); + Button button = findViewById(R.id.button_decrypt); button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java b/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java index 6f7266c6..3ec17e3a 100644 --- a/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java +++ b/app/src/main/java/me/impy/aegis/CustomAuthenticatedSlide.java @@ -45,11 +45,11 @@ public class CustomAuthenticatedSlide extends Fragment implements FingerprintUiH @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View view = inflater.inflate(R.layout.fragment_authenticated_slide, container, false); - _textPassword = (EditText) view.findViewById(R.id.text_password); - _textPasswordConfirm = (EditText) view.findViewById(R.id.text_password_confirm); - _boxFingerprint = (LinearLayout) view.findViewById(R.id.box_fingerprint); - _imgFingerprint = (SwirlView) view.findViewById(R.id.img_fingerprint); - _textFingerprint = (TextView) view.findViewById(R.id.text_fingerprint); + _textPassword = view.findViewById(R.id.text_password); + _textPasswordConfirm = view.findViewById(R.id.text_password_confirm); + _boxFingerprint = view.findViewById(R.id.box_fingerprint); + _imgFingerprint = view.findViewById(R.id.img_fingerprint); + _textFingerprint = view.findViewById(R.id.text_fingerprint); view.findViewById(R.id.main).setBackgroundColor(_bgColor); return view; } diff --git a/app/src/main/java/me/impy/aegis/CustomAuthenticationSlide.java b/app/src/main/java/me/impy/aegis/CustomAuthenticationSlide.java index cbde3f9b..a24c87a9 100644 --- a/app/src/main/java/me/impy/aegis/CustomAuthenticationSlide.java +++ b/app/src/main/java/me/impy/aegis/CustomAuthenticationSlide.java @@ -33,7 +33,7 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy, final View view = inflater.inflate(R.layout.fragment_authentication_slide, container, false); final Context context = getContext(); - _buttonGroup = (RadioGroup) view.findViewById(R.id.rg_authenticationMethod); + _buttonGroup = view.findViewById(R.id.rg_authenticationMethod); _buttonGroup.setOnCheckedChangeListener(this); onCheckedChanged(_buttonGroup, _buttonGroup.getCheckedRadioButtonId()); @@ -41,8 +41,8 @@ public class CustomAuthenticationSlide extends Fragment implements ISlidePolicy, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { FingerprintManager fingerprintManager = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE); if (ActivityCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) == PackageManager.PERMISSION_GRANTED && fingerprintManager.isHardwareDetected()) { - RadioButton button = (RadioButton) view.findViewById(R.id.rb_fingerprint); - TextView text = (TextView) view.findViewById(R.id.text_rb_fingerprint); + RadioButton button = view.findViewById(R.id.rb_fingerprint); + TextView text = view.findViewById(R.id.text_rb_fingerprint); button.setVisibility(View.VISIBLE); text.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java b/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java index e5fcf025..c7eda039 100644 --- a/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java +++ b/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java @@ -108,11 +108,11 @@ public class KeyProfileAdapter extends RecyclerView.Adapter { Intent scannerActivity = new Intent(getApplicationContext(), ScannerActivity.class); startActivityForResult(scannerActivity, CODE_GET_KEYINFO); }); - RecyclerView rvKeyProfiles = (RecyclerView) findViewById(R.id.rvKeyProfiles); + RecyclerView rvKeyProfiles = findViewById(R.id.rvKeyProfiles); LinearLayoutManager mLayoutManager = new LinearLayoutManager(this); rvKeyProfiles.setLayoutManager(mLayoutManager); @@ -353,9 +353,9 @@ public class MainActivity extends AppCompatActivity implements KeyProfileAdapter private BottomSheetDialog createBottomSheet(KeyProfile profile) { View bottomSheetView = getLayoutInflater().inflate(R.layout.bottom_sheet_edit_profile, null); - LinearLayout copyLayout = (LinearLayout) bottomSheetView.findViewById(R.id.copy_button); - LinearLayout deleteLayout = (LinearLayout) bottomSheetView.findViewById(R.id.delete_button); - LinearLayout editLayout = (LinearLayout) bottomSheetView.findViewById(R.id.edit_button); + LinearLayout copyLayout = bottomSheetView.findViewById(R.id.copy_button); + LinearLayout deleteLayout = bottomSheetView.findViewById(R.id.delete_button); + LinearLayout editLayout = bottomSheetView.findViewById(R.id.edit_button); bottomSheetView.findViewById(R.id.edit_button); BottomSheetDialog bottomDialog = new BottomSheetDialog(this); bottomDialog.setContentView(bottomSheetView);