Updated a logic of handle errors. | #67.

DenBond7 · DenBond7 · commit 4250857c7c51 · 2017-08-12T16:32:04.000+03:00
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.java
@@ -115,7 +115,7 @@ public void onErrorFromSyncServiceReceived(int requestCode, int errorType, Excep
         switch (requestCode) {
             case R.id.syns_request_code_load_next_messages:
             case R.id.syns_request_code_force_load_new_messages:
-                notifyEmailListFragmentAboutError(requestCode, errorType);
+                notifyEmailListFragmentAboutError(requestCode, errorType, e);
                 break;
         }
     }
@@ -296,13 +296,14 @@ public Folder getCurrentFolder() {
      *
      * @param requestCode The unique request code for the reply to {@link android.os.Messenger}.
      * @param errorType   The {@link SyncErrorTypes}
+     * @param e           The exception which happened.
      */
-    private void notifyEmailListFragmentAboutError(int requestCode, int errorType) {
+    private void notifyEmailListFragmentAboutError(int requestCode, int errorType, Exception e) {
         EmailListFragment emailListFragment = (EmailListFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.emailListFragment);
 
         if (emailListFragment != null) {
-            emailListFragment.onErrorOccurred(requestCode, errorType);
+            emailListFragment.onErrorOccurred(requestCode, errorType, e);
         }
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MessageDetailsActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MessageDetailsActivity.java
@@ -38,8 +38,8 @@
  *         Time: 16:29
  *         E-mail: DenBond7@gmail.com
  */
-public class MessageDetailsActivity extends BaseBackStackSyncActivity implements LoaderManager
-        .LoaderCallbacks<Cursor>, MessageDetailsFragment.OnActionListener {
+public class MessageDetailsActivity extends BaseBackStackSyncActivity implements
+        LoaderManager.LoaderCallbacks<Cursor>, MessageDetailsFragment.OnActionListener {
     public static final int RESULT_CODE_UPDATE_LIST = 100;
 
     public static final String EXTRA_KEY_FOLDER = GeneralUtil.generateUniqueExtraKey("EXTRA_KEY_FOLDER",
@@ -223,11 +223,11 @@ public void onErrorFromSyncServiceReceived(int requestCode, int errorType, Excep
         switch (requestCode) {
             case R.id.syns_request_code_load_message_details:
                 isRequestMessageDetailsStarted = false;
-                notifyMessageDetailsFragmentAboutError(requestCode, errorType);
+                notifyMessageDetailsFragmentAboutError(requestCode, errorType, e);
                 break;
 
             default:
-                notifyMessageDetailsFragmentAboutError(requestCode, errorType);
+                notifyMessageDetailsFragmentAboutError(requestCode, errorType, e);
                 break;
         }
     }
@@ -271,13 +271,14 @@ private void notifyUserAboutError(int requestCode) {
      *
      * @param requestCode The unique request code for the reply to {@link android.os.Messenger}.
      * @param errorType   The {@link SyncErrorTypes}
+     * @param e           The exception which happened.
      */
-    private void notifyMessageDetailsFragmentAboutError(int requestCode, int errorType) {
+    private void notifyMessageDetailsFragmentAboutError(int requestCode, int errorType, Exception e) {
         MessageDetailsFragment messageDetailsFragment = (MessageDetailsFragment)
                 getSupportFragmentManager().findFragmentById(R.id.messageDetailsFragment);
 
         if (messageDetailsFragment != null) {
-            messageDetailsFragment.onErrorOccurred(requestCode, errorType);
+            messageDetailsFragment.onErrorOccurred(requestCode, errorType, e);
         }
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureComposeActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureComposeActivity.java
@@ -62,12 +62,12 @@ public boolean isCanFinishActivity() {
     }
 
     @Override
-    protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType) {
+    protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {
         SecureComposeFragment secureComposeFragment = (SecureComposeFragment)
                 getSupportFragmentManager().findFragmentById(R.id.secureComposeFragment);
 
         if (secureComposeFragment != null) {
-            secureComposeFragment.onErrorOccurred(requestCode, errorType);
+            secureComposeFragment.onErrorOccurred(requestCode, errorType, e);
         }
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureReplyActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureReplyActivity.java
@@ -91,12 +91,12 @@ protected String getStandardTitle() {
     }
 
     @Override
-    protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType) {
+    protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {
         SecureReplyFragment secureReplyFragment = (SecureReplyFragment)
                 getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);
 
         if (secureReplyFragment != null) {
-            secureReplyFragment.onErrorOccurred(requestCode, errorType);
+            secureReplyFragment.onErrorOccurred(requestCode, errorType, e);
         }
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java
@@ -60,7 +60,7 @@ public abstract class BaseSendingMessageActivity extends BaseBackStackSyncActivi
 
     protected abstract String getStandardTitle();
 
-    protected abstract void notifyFragmentAboutErrorFromService(int requestCode, int errorType);
+    protected abstract void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e);
 
     protected abstract void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
                                                                                    messageEncryptionType);
@@ -153,7 +153,7 @@ public void onErrorFromSyncServiceReceived(int requestCode, int errorType, Excep
         switch (requestCode) {
             case R.id.syns_request_send_encrypted_message:
                 isMessageSendingNow = false;
-                notifyFragmentAboutErrorFromService(requestCode, errorType);
+                notifyFragmentAboutErrorFromService(requestCode, errorType, e);
                 break;
         }
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/EmailListFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/EmailListFragment.java
@@ -299,8 +299,8 @@ public void onScroll(AbsListView view, int firstVisibleItem,
     }
 
     @Override
-    public void onErrorOccurred(int requestCode, int errorType) {
-        super.onErrorOccurred(requestCode, errorType);
+    public void onErrorOccurred(int requestCode, int errorType, Exception e) {
+        super.onErrorOccurred(requestCode, errorType, e);
         switch (requestCode) {
             case R.id.syns_request_code_load_next_messages:
                 footerProgressView.setVisibility(View.GONE);
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java
@@ -225,8 +225,8 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onErrorOccurred(int requestCode, int errorType) {
-        super.onErrorOccurred(requestCode, errorType);
+    public void onErrorOccurred(int requestCode, int errorType, Exception e) {
+        super.onErrorOccurred(requestCode, errorType, e);
         isAdditionalActionEnable = true;
         getActivity().invalidateOptionsMenu();
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseGmailFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseGmailFragment.java
@@ -54,8 +54,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
      *
      * @param requestCode The unique request code for the reply to {@link android.os.Messenger}.
      * @param errorType   The {@link SyncErrorTypes}
+     * @param e           The exception which happened.
      */
-    public void onErrorOccurred(int requestCode, int errorType) {
+    public void onErrorOccurred(int requestCode, int errorType, Exception e) {
         getContentView().setVisibility(View.GONE);
         textViewStatusInfo.setText(R.string.there_was_syncing_problem);
         UIUtil.exchangeViewVisibility(getContext(), false, progressView, statusView);
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseSendSecurityMessageFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseSendSecurityMessageFragment.java
@@ -285,7 +285,7 @@ public void onLoaderReset(Loader<LoaderResult> loader) {
     }
 
     @Override
-    public void onErrorOccurred(int requestCode, int errorType) {
+    public void onErrorOccurred(int requestCode, int errorType, Exception e) {
         notifyUserAboutErrorWhenSendMessage();
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/FeedbackActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/FeedbackActivity.java
@@ -40,10 +40,8 @@
  *         E-mail: DenBond7@gmail.com
  */
 
-public class FeedbackActivity extends BaseBackStackSyncActivity implements
-        LoaderManager.LoaderCallbacks<BaseResponse> {
-    private static final String KEY_IS_MESSAGE_SENT = BuildConfig.APPLICATION_ID + "" +
-            ".KEY_IS_MESSAGE_SENT";
+public class FeedbackActivity extends BaseBackStackSyncActivity implements LoaderManager.LoaderCallbacks<BaseResponse> {
+    private static final String KEY_IS_MESSAGE_SENT = BuildConfig.APPLICATION_ID + ".KEY_IS_MESSAGE_SENT";
 
     private View progressBar;
     private View layoutInput;
diff --git a/FlowCrypt/src/main/res/layout/sync_status.xml b/FlowCrypt/src/main/res/layout/sync_status.xml
@@ -28,6 +28,7 @@
         android:layout_marginLeft="@dimen/default_margin_content_small"
         android:layout_marginRight="@dimen/default_margin_content_small"
         android:layout_marginTop="@dimen/default_margin_content_small"
+        android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceMedium"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public void onErrorFromSyncServiceReceived(int requestCode, int errorType, Excep`
`115`	`115`	`switch (requestCode) {`
`116`	`116`	`case R.id.syns_request_code_load_next_messages:`
`117`	`117`	`case R.id.syns_request_code_force_load_new_messages:`
`118`		`- notifyEmailListFragmentAboutError(requestCode, errorType);`
	`118`	`+ notifyEmailListFragmentAboutError(requestCode, errorType, e);`
`119`	`119`	`break;`
`120`	`120`	`}`
`121`	`121`	`}`
`@@ -296,13 +296,14 @@ public Folder getCurrentFolder() {`
`296`	`296`	`*`
`297`	`297`	`* @param requestCode The unique request code for the reply to {@link android.os.Messenger}.`
`298`	`298`	`* @param errorType The {@link SyncErrorTypes}`
	`299`	`+ * @param e The exception which happened.`
`299`	`300`	`*/`
`300`		`- private void notifyEmailListFragmentAboutError(int requestCode, int errorType) {`
	`301`	`+ private void notifyEmailListFragmentAboutError(int requestCode, int errorType, Exception e) {`
`301`	`302`	`EmailListFragment emailListFragment = (EmailListFragment) getSupportFragmentManager()`
`302`	`303`	`.findFragmentById(R.id.emailListFragment);`
`303`	`304`
`304`	`305`	`if (emailListFragment != null) {`
`305`		`- emailListFragment.onErrorOccurred(requestCode, errorType);`
	`306`	`+ emailListFragment.onErrorOccurred(requestCode, errorType, e);`
`306`	`307`	`}`
`307`	`308`	`}`
`308`	`309`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@ public boolean isCanFinishActivity() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType) {`
	`65`	`+ protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {`
`66`	`66`	`SecureComposeFragment secureComposeFragment = (SecureComposeFragment)`
`67`	`67`	`getSupportFragmentManager().findFragmentById(R.id.secureComposeFragment);`
`68`	`68`
`69`	`69`	`if (secureComposeFragment != null) {`
`70`		`- secureComposeFragment.onErrorOccurred(requestCode, errorType);`
	`70`	`+ secureComposeFragment.onErrorOccurred(requestCode, errorType, e);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ protected String getStandardTitle() {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`		`- protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType) {`
	`94`	`+ protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {`
`95`	`95`	`SecureReplyFragment secureReplyFragment = (SecureReplyFragment)`
`96`	`96`	`getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);`
`97`	`97`
`98`	`98`	`if (secureReplyFragment != null) {`
`99`		`- secureReplyFragment.onErrorOccurred(requestCode, errorType);`
	`99`	`+ secureReplyFragment.onErrorOccurred(requestCode, errorType, e);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public abstract class BaseSendingMessageActivity extends BaseBackStackSyncActivi`
`60`	`60`
`61`	`61`	`protected abstract String getStandardTitle();`
`62`	`62`
`63`		`- protected abstract void notifyFragmentAboutErrorFromService(int requestCode, int errorType);`
	`63`	`+ protected abstract void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e);`
`64`	`64`
`65`	`65`	`protected abstract void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType`
`66`	`66`	`messageEncryptionType);`
`@@ -153,7 +153,7 @@ public void onErrorFromSyncServiceReceived(int requestCode, int errorType, Excep`
`153`	`153`	`switch (requestCode) {`
`154`	`154`	`case R.id.syns_request_send_encrypted_message:`
`155`	`155`	`isMessageSendingNow = false;`
`156`		`- notifyFragmentAboutErrorFromService(requestCode, errorType);`
	`156`	`+ notifyFragmentAboutErrorFromService(requestCode, errorType, e);`
`157`	`157`	`break;`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,8 @@ public void onClick(View v) {`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`@Override`
`228`		`- public void onErrorOccurred(int requestCode, int errorType) {`
`229`		`- super.onErrorOccurred(requestCode, errorType);`
	`228`	`+ public void onErrorOccurred(int requestCode, int errorType, Exception e) {`
	`229`	`+ super.onErrorOccurred(requestCode, errorType, e);`
`230`	`230`	`isAdditionalActionEnable = true;`
`231`	`231`	`getActivity().invalidateOptionsMenu();`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ public void onLoaderReset(Loader<LoaderResult> loader) {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`@Override`
`288`		`- public void onErrorOccurred(int requestCode, int errorType) {`
	`288`	`+ public void onErrorOccurred(int requestCode, int errorType, Exception e) {`
`289`	`289`	`notifyUserAboutErrorWhenSendMessage();`
`290`	`290`	`}`
`291`	`291`