Reload Note.model after template editing, Fixes ankidroid#5011

The template editor edits the model template live in the database
which bleeds into Note.model, if you discard the template edits and
return to the NoteEditor the Note.model.templates state was still the
edited + reverted state. This hook and call allow for the Note.model
object to be loaded from the database where the template editor left
the correct state as it was closing down

Author: mikehardy

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java

@@ -332,7 +332,7 @@ protected void onCollectionLoaded(Collection col) {
         this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
 
         Intent intent = getIntent();
-        Timber.d("onCollectionLoaded: caller: %d", mCaller);
+        Timber.d("NoteEditor() onCollectionLoaded: caller: %d", mCaller);
 
         registerExternalStorageListener();
 
@@ -532,7 +532,7 @@ public void onClick(View v) {
         });
 
         if (!mAddNote && mCurrentEditedCard != null) {
-            Timber.i("NoteEditor:: Edit note activity successfully started with card id %d", mCurrentEditedCard.getId());
+            Timber.i("onCollectionLoaded() Edit note activity successfully started with card id %d", mCurrentEditedCard.getId());
         }
 
         //set focus to FieldEditText 'first' on startup like Anki desktop
@@ -1067,19 +1067,22 @@ private void showCardTemplateEditor() {
         // Pass the model ID
         try {
             intent.putExtra("modelId", getCurrentlySelectedModel().getLong("id"));
+            Timber.d("showCardTemplateEditor() for model %s", intent.getLongExtra("modelId", -1L));
         } catch (JSONException e) {
            throw new RuntimeException(e);
         }
         // Also pass the card ID if not adding new note
         if (!mAddNote) {
             intent.putExtra("noteId", mCurrentEditedCard.note().getId());
+            Timber.d("showCardTemplateEditor() with note %s", mCurrentEditedCard.note().getId());
         }
         startActivityForResultWithAnimation(intent, REQUEST_TEMPLATE_EDIT, ActivityTransitionAnimation.LEFT);
     }
 
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Timber.d("onActivityResult() with request/result: %s/%s", requestCode, resultCode);
         super.onActivityResult(requestCode, resultCode, data);
 
         if (resultCode == DeckPicker.RESULT_DB_ERROR) {
@@ -1126,6 +1129,9 @@ else if (fieldEditText.hasFocus()) {
                 if (resultCode == RESULT_OK) {
                     mReloadRequired = true;
                 }
+                // rebuild the model post-template-edit so we get the correct number of cards
+                Timber.d("onActivityResult() template edit - reloading model");
+                mEditorNote.reloadModel();
                 updateCards(mEditorNote.model());
                 break;
             }
@@ -1480,10 +1486,12 @@ private void updateTags() {
 
     /** Update the list of card templates for current note type */
     private void updateCards(JSONObject model) {
+        Timber.d("updateCards()");
         try {
             JSONArray tmpls = model.getJSONArray("tmpls");
             String cardsList = "";
             // Build comma separated list of card names
+            Timber.d("updateCards() template count is %s", tmpls.length());
             for (int i = 0; i < tmpls.length(); i++) {
                 String name = tmpls.getJSONObject(i).optString("name");
                 // If more than one card then make currently selected card underlined

AnkiDroid/src/main/java/com/ichi2/libanki/Note.java

@@ -31,6 +31,8 @@
 import java.util.Locale;
 import java.util.Map;
 
+import timber.log.Timber;
+
 
 public class Note implements Cloneable {
 
@@ -88,6 +90,7 @@ public Note(Collection col, JSONObject model, Long id) {
 
 
     public void load() {
+        Timber.d("load()");
         Cursor cursor = null;
         try {
             cursor = mCol.getDb().getDatabase()
@@ -113,6 +116,10 @@ public void load() {
         }
     }
 
+    public void reloadModel() {
+        mModel = mCol.getModels().get(mMid);
+    }
+
 
     /*
      * If fields or tags have changed, write changes to disk.