Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 303a2ae5 authored by Dan Zivkovic's avatar Dan Zivkovic
Browse files

Fix NPE in PunctuationSuggestions. 

The NPE happens when the keyboard doesn't specify any punctuation suggestions.

Bug 18047927.

Change-Id: I9f8aa35df4f163b527dc6580a99afc6da45a96b8
parent da27faeb

java/src/com/android/inputmethod/latin/PunctuationSuggestions.java

+11 −5
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import com.android.inputmethod.latin.common.StringUtils; 
import java.util.ArrayList;

import java.util.Arrays;



import javax.annotation.Nullable;



/**

 * The extended {@link SuggestedWords} class to represent punctuation suggestions.

 *
@@ -49,12 +51,16 @@ public final class PunctuationSuggestions extends SuggestedWords { 
     * @return The {@link PunctuationSuggestions} object.

     */

    public static PunctuationSuggestions newPunctuationSuggestions(

            final String[] punctuationSpecs) {

        final ArrayList<SuggestedWordInfo> puncuationsList = new ArrayList<>();

        for (final String puncSpec : punctuationSpecs) {

            puncuationsList.add(newHardCodedWordInfo(puncSpec));

            @Nullable final String[] punctuationSpecs) {

        if (punctuationSpecs == null || punctuationSpecs.length == 0) {

            return new PunctuationSuggestions(new ArrayList<SuggestedWordInfo>(0));

        }

        final ArrayList<SuggestedWordInfo> punctuationList =

                new ArrayList<>(punctuationSpecs.length);

        for (String spec : punctuationSpecs) {

            punctuationList.add(newHardCodedWordInfo(spec));

        }

        return new PunctuationSuggestions(puncuationsList);

        return new PunctuationSuggestions(punctuationList);

    }



    /**