Add forceNewThread flag which allows Feedback to always create a new message thread (#189)

* Add forceNewThread flag which allows Feedback to always create a new message thread
* Set force new feedback thread through listener

Author: brentwatson

hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java

@@ -67,6 +67,11 @@ public class FeedbackActivity extends Activity implements OnClickListener {
      */
     public static final String EXTRA_URL = "url";
 
+    /**
+     * Optional extra that can be passed as {@code true} to force a new feedback message thread.
+     */
+    public static final String EXTRA_FORCE_NEW_THREAD = "forceNewThread";
+
     /**
      * Extra for initial username to set for the feedback message.
      */
@@ -165,6 +170,12 @@ public class FeedbackActivity extends Activity implements OnClickListener {
      **/
     private boolean mInSendFeedback;
 
+    /**
+     * Indicates if a new thread should be created for each new feedback message as opposed to
+     * the default resume thread behaviour.
+     */
+    private boolean mForceNewThread;
+
     /**
      * True when the view was initialized
      **/
@@ -193,6 +204,7 @@ public void onCreate(Bundle savedInstanceState) {
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
             mUrl = extras.getString(EXTRA_URL);
+            mForceNewThread = extras.getBoolean(EXTRA_FORCE_NEW_THREAD);
             initialUserName = extras.getString(EXTRA_INITIAL_USER_NAME);
             initialUserEmail = extras.getString(EXTRA_INITIAL_USER_EMAIL);
 
@@ -316,8 +328,8 @@ public void onClick(View v) {
                 openContextMenu(v);
             }
         } else if (viewId == R.id.button_add_response) {
-            configureFeedbackView(false);
             mInSendFeedback = true;
+            configureFeedbackView(false);
         } else if (viewId == R.id.button_refresh) {
             sendFetchFeedback(mUrl, null, null, null, null, null, PrefsUtil.getInstance().getFeedbackTokenFromPrefs(mContext), mFeedbackHandler, true);
         }
@@ -494,7 +506,7 @@ protected void configureFeedbackView(boolean haveToken) {
                         mNameInput.setText(nameEmailSubjectArray[0]);
                         mEmailInput.setText(nameEmailSubjectArray[1]);
 
-                        if (nameEmailSubjectArray.length >= 3) {
+                        if (!mForceNewThread && nameEmailSubjectArray.length >= 3) {
                             mSubjectInput.setText(nameEmailSubjectArray[2]);
                             mTextInput.requestFocus();
                         } else {
@@ -524,8 +536,8 @@ protected void configureFeedbackView(boolean haveToken) {
             /** Reset the remaining fields if previously populated */
             mTextInput.setText("");
 
-            /** Check to see if the Feedback Token is availabe */
-            if (PrefsUtil.getInstance().getFeedbackTokenFromPrefs(mContext) != null) {
+            /** Check to see if the Feedback Token is available */
+            if ((!mForceNewThread || mInSendFeedback) && PrefsUtil.getInstance().getFeedbackTokenFromPrefs(mContext) != null) {
                 /** If Feedback Token is available, hide the Subject Input field */
                 mSubjectInput.setVisibility(View.GONE);
             } else {
@@ -586,8 +598,11 @@ private boolean addAttachment(int request) {
 
     private void configureAppropriateView() {
         /** Try to retrieve the Feedback Token from {@link SharedPreferences} */
-        mToken = PrefsUtil.getInstance().getFeedbackTokenFromPrefs(this);
-        if ((mToken == null) || (mInSendFeedback)) {
+        if (!mForceNewThread || mInSendFeedback) {
+            mToken = PrefsUtil.getInstance().getFeedbackTokenFromPrefs(this);
+        }
+
+        if (mToken == null || mInSendFeedback) {
             /** If Feedback Token is NULL, show the usual feedback view */
             configureFeedbackView(false);
         } else {
@@ -708,7 +723,7 @@ private void sendFeedback() {
         enableDisableSendFeedbackButton(false);
         hideKeyboard();
 
-        String token = PrefsUtil.getInstance().getFeedbackTokenFromPrefs(mContext);
+        String token = mForceNewThread && !mInSendFeedback ? null : PrefsUtil.getInstance().getFeedbackTokenFromPrefs(mContext);
 
         String name = mNameInput.getText().toString().trim();
         String email = mEmailInput.getText().toString().trim();

hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java

@@ -183,6 +183,7 @@ public static void showFeedbackActivity(Context context, Bundle extras, Uri... a
             if (activityClass == null) {
                 activityClass = FeedbackActivity.class;
             }
+            boolean forceNewThread = lastListener != null && lastListener.shouldCreateNewFeedbackThread();
 
             Intent intent = new Intent();
             if (extras != null && !extras.isEmpty()) {
@@ -191,6 +192,7 @@ public static void showFeedbackActivity(Context context, Bundle extras, Uri... a
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.setClass(context, activityClass);
             intent.putExtra(FeedbackActivity.EXTRA_URL, getURLString(context));
+            intent.putExtra(FeedbackActivity.EXTRA_FORCE_NEW_THREAD, forceNewThread);
             intent.putExtra(FeedbackActivity.EXTRA_INITIAL_USER_NAME, userName);
             intent.putExtra(FeedbackActivity.EXTRA_INITIAL_USER_EMAIL, userEmail);
             intent.putExtra(FeedbackActivity.EXTRA_INITIAL_ATTACHMENTS, attachments);

hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManagerListener.java

@@ -26,4 +26,12 @@ public Class<? extends FeedbackActivity> getFeedbackActivityClass() {
      * and false if not and a notification should be fired.
      */
     public abstract boolean feedbackAnswered(FeedbackMessage latestMessage);
+
+    /**
+     * Called when posting a new feedback message.
+     * @return Whether a new feedback thread should be created or not. Defaults to false.
+     */
+    public boolean shouldCreateNewFeedbackThread() {
+        return false;
+    }
 }