Clean up code

shell/platform/android/io/flutter/embedding/android/FlutterView.java

@@ -1227,6 +1227,7 @@ public void detachFromFlutterEngine() {
     textInputPlugin.getInputMethodManager().restartInput(this);
     textInputPlugin.destroy();
     keyboardManager.destroy();
+    spellCheckPlugin.destroy();
 
     if (mouseCursorPlugin != null) {
       mouseCursorPlugin.destroy();

shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java

@@ -38,30 +38,36 @@ public void initiateSpellCheck(String locale, String text) {
         });
   }
 
-  /** Calls on the Android spell check API to spell check specified text. */
+
+  public void destroy() {
+    mSpellCheckChannel.setSpellCheckMethodHandler(null);
+
+    if (mSpellCheckerSession != null) {
+      mSpellCheckerSession.close();
+    }
+  }
+
+  /** 
+   * Calls on the Android spell check API to spell check specified text.
+   */
   public void performSpellCheck(String locale, String text) {
     String[] localeCodes = locale.split("-");
-    Locale localeToUse;
+    Locale parsedLocale;
 
     if (localeCodes.length == 3) {
-      localeToUse = new Locale(localeCodes[0], localeCodes[1], localeCodes[2]);
+      parsedLocale = new Locale(localeCodes[0], localeCodes[1], localeCodes[2]);
     } else if (localeCodes.length == 2) {
-      localeToUse = new Locale(localeCodes[0], localeCodes[1]);
+      parsedLocale = new Locale(localeCodes[0], localeCodes[1]);
     } else {
-      localeToUse = new Locale(localeCodes[0]);
+      parsedLocale = new Locale(localeCodes[0]);
     }
 
-    // TODO(camillesimon): Figure out proper session management.
-    if (mSpellCheckerSession != null) {
-      mSpellCheckerSession.close();
-      mSpellCheckerSession = tsm.newSpellCheckerSession(null, Locale.ENGLISH, this, true);
-    } else {
-      mSpellCheckerSession = tsm.newSpellCheckerSession(null, Locale.ENGLISH, this, true);
+    if (mSpellCheckerSession == null) {
+      mSpellCheckerSession = tsm.newSpellCheckerSession(null, parsedLocale, this, true);
     }
-    SpellCheckerInfo infoChecker = mSpellCheckerSession.getSpellChecker();
 
+    SpellCheckerInfo infoChecker = mSpellCheckerSession.getSpellChecker();
     TextInfo[] textInfos = new TextInfo[] {new TextInfo(text)};
-
     mSpellCheckerSession.getSentenceSuggestions(textInfos, 3);
   }