Commit e74f21f1 authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Fix null value dereferences, add annotations

parent 688caf06

app/src/main/java/net/fabiszewski/ulogger/AutoNamePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class AutoNamePreference extends TrimmedEditTextPreference { 
    public CharSequence getSummary() {

        if ((getSummaryProvider() != null)) {

            final String text = super.getText();

            if (!TextUtils.isEmpty(text)) {

            if (text != null && !TextUtils.isEmpty(text)) {

                return getAutoName(text, Calendar.getInstance().getTime());

            }

        }

app/src/main/java/net/fabiszewski/ulogger/AutoNamePreferenceDialogFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ public class AutoNamePreferenceDialogFragment extends EditTextPreferenceDialogFr 
    private TextView preview = null;

    private Date TEMPLATE_DATE;



    @NonNull

    public static AutoNamePreferenceDialogFragment newInstance(String key) {

        final AutoNamePreferenceDialogFragment fragment = new AutoNamePreferenceDialogFragment();

        final Bundle b = new Bundle(1);
@@ -51,7 +52,7 @@ public class AutoNamePreferenceDialogFragment extends EditTextPreferenceDialogFr 
            if (positiveButton != null && editText != null) {

                editText.addTextChangedListener(this);

                ViewGroup layout = (ViewGroup) editText.getParent();

                preview = new TextView(getContext());

                preview = new TextView(requireContext());

                layout.addView(preview, layout.indexOfChild(editText));

                preview.setGravity(Gravity.CENTER);

                updatePreview(editText.getText().toString());

app/src/main/java/net/fabiszewski/ulogger/ListPreferenceDialogWithMessageFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.preference.DialogPreference;

import androidx.preference.ListPreferenceDialogFragmentCompat;



public class ListPreferenceDialogWithMessageFragment extends ListPreferenceDialogFragmentCompat {



    @NonNull

    public static ListPreferenceDialogWithMessageFragment newInstance(String key) {

        final ListPreferenceDialogWithMessageFragment fragment = new ListPreferenceDialogWithMessageFragment();

        final Bundle b = new Bundle(1);
@@ -34,11 +36,11 @@ public class ListPreferenceDialogWithMessageFragment extends ListPreferenceDialo 
     * @param builder AlertDialog builder

     */

    @Override

    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {

    protected void onPrepareDialogBuilder(@NonNull AlertDialog.Builder builder) {

        super.onPrepareDialogBuilder(builder);

        final DialogPreference preference = getPreference();

        @SuppressLint("InflateParams")

        View customTitleView = LayoutInflater.from(getActivity()).inflate(R.layout.alert_dialog_title, null);

        View customTitleView = LayoutInflater.from(requireActivity()).inflate(R.layout.alert_dialog_title, null);

        final TextView dialogTitle = customTitleView.findViewById(R.id.customTitle);

        dialogTitle.setText(preference.getDialogTitle());

        final TextView messageView = customTitleView.findViewById(R.id.customMessage);

app/src/main/java/net/fabiszewski/ulogger/ListWithEditTextPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.widget.Button; 
import android.widget.EditText;

import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.core.text.BidiFormatter;

import androidx.preference.ListPreference;
@@ -76,7 +77,7 @@ class ListWithEditTextPreference extends ListPreference implements Preference.On 
     * @return {@code true} to update the state of the preference with the new value

     */

    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

    public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {

        if (newValue.toString().equals(OTHER)) {

            showOtherDialog(preference);

            return false;

app/src/main/java/net/fabiszewski/ulogger/PasswordPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class PasswordPreference extends EditTextPreference implements EditTextPreferenc 
    public CharSequence getSummary() {

        if ((getSummaryProvider() != null)) {

            final String text = super.getText();

            if (!TextUtils.isEmpty(text)) {

            if (text != null && !TextUtils.isEmpty(text)) {

                return getMaskedText(text);

            }

        }