Fix the rotation/network behaviour on the message detail activity

judit-juhasz · Jul 13, 2018 · 8213f38 · 8213f38
1 parent 6cfd5dd
commit 8213f38
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/app/src/main/java/name/juhasz/judit/udacity/tanits/fragment/MessageDetailsFragment.java b/app/src/main/java/name/juhasz/judit/udacity/tanits/fragment/MessageDetailsFragment.java
@@ -24,6 +24,8 @@ public class MessageDetailsFragment extends Fragment {
 
     public static final String MESSAGE_DATA = "MESSAGE_DATA";
 
+    private static final String SAVE_MESSAGE_CONTENT_KEY = "SAVE_MESSAGE_CONTENT_KEY";
+
     @BindView(R.id.tv_date)
     TextView mDateTextView;
     @BindView(R.id.tv_content)
@@ -57,10 +59,17 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
         ButterKnife.bind(this, rootView);
 
         if (null != mMessage) {
-            if (NetworkUtils.isNetworkAvailable(getContext())) {
-                showProgressBar();
-            } else {
+            final boolean hasValidSavedData =
+                    (null != savedInstanceState && savedInstanceState.containsKey(SAVE_MESSAGE_CONTENT_KEY));
+            if (!NetworkUtils.isNetworkAvailable(getContext()) && !hasValidSavedData) {
                 showNotification(getString(R.string.internet_required));
+            } else if (hasValidSavedData) {
+                mDateTextView.setText(mMessage.getDate());
+                mSummaryTextView.setText(mMessage.getSummary());
+                mContentTextView.setText(savedInstanceState.getString(SAVE_MESSAGE_CONTENT_KEY));
+                showMessageDetails();
+            } else {
+                showProgressBar();
             }
             FirebaseUtils.queryMessageContent(mMessage.getId(), new FirebaseUtils.StringListener() {
                 @Override
@@ -81,6 +90,12 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
         return rootView;
     }
 
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        outState.putString(SAVE_MESSAGE_CONTENT_KEY, mContentTextView.getText().toString());
+        super.onSaveInstanceState(outState);
+    }
+
     private void showNotification(@NonNull final String notificationText) {
         mLoadProgressBar.setVisibility(View.INVISIBLE);
         mMessageDetailsScrollView.setVisibility(View.GONE);