From c57b171076724e068b3de2ddeb98692323edfe31 Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Fri, 16 Sep 2016 11:51:44 +0200
Subject: [PATCH 01/16] Prevent context leak in isConnectedToNetwork

Fixes #177
---
 hockeysdk/src/main/java/net/hockeyapp/android/utils/Util.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/utils/Util.java b/hockeysdk/src/main/java/net/hockeyapp/android/utils/Util.java
index f15a6d1d2..4ae4785f4 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/utils/Util.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/utils/Util.java
@@ -264,7 +264,7 @@ private static Bundle getBundle(Context context) {
     }
 
     public static boolean isConnectedToNetwork(Context context) {
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
         if (connectivityManager != null) {
             NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
             return activeNetwork != null && activeNetwork.isConnected();

From 6564ca9563eb8559abd9a9b9e6672403bce7c262 Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Fri, 16 Sep 2016 12:09:11 +0200
Subject: [PATCH 02/16] Fix issue with feedback UI not being hidden

---
 .../src/main/java/net/hockeyapp/android/FeedbackActivity.java | 3 +++
 .../src/main/java/net/hockeyapp/android/FeedbackManager.java  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
index 85df43f6b..a07d763ce 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
@@ -518,6 +518,9 @@ protected void configureFeedbackView(boolean haveToken) {
                 mFeedbackViewInitialized = true;
             }
 
+            mNameInput.setVisibility(FeedbackManager.getRequireUserName() == FeedbackUserDataElement.DONT_SHOW ? View.GONE : View.VISIBLE);
+            mEmailInput.setVisibility(FeedbackManager.getRequireUserEmail() == FeedbackUserDataElement.DONT_SHOW ? View.GONE : View.VISIBLE);
+
             /** Reset the remaining fields if previously populated */
             mTextInput.setText("");
 
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
index c7aa8b657..070648400 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
@@ -81,12 +81,12 @@ public class FeedbackManager {
     /**
      * Whether the user's name is required.
      */
-    private static FeedbackUserDataElement requireUserName;
+    private static FeedbackUserDataElement requireUserName = FeedbackUserDataElement.REQUIRED;
 
     /**
      * Whether the user's email is required.
      */
-    private static FeedbackUserDataElement requireUserEmail;
+    private static FeedbackUserDataElement requireUserEmail = FeedbackUserDataElement.REQUIRED;
 
     private static String userName;
 

From 312751762f9cf3531651edee9c61c3e5a0aed6c1 Mon Sep 17 00:00:00 2001
From: Jared Burrows <jaredsburrows@gmail.com>
Date: Thu, 20 Oct 2016 23:04:10 -0700
Subject: [PATCH 03/16] fix npe on listfiles in isFreeSpaceAvailable() method

---
 .../main/java/net/hockeyapp/android/metrics/Persistence.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java
index 492296cec..4fa504f50 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java
@@ -269,12 +269,13 @@ protected boolean isFreeSpaceAvailable() {
         // TODO Check for available disk space as well.
         synchronized (LOCK) {
             Context context = getContext();
-            if ((context.getFilesDir()) != null) {
+            if (context.getFilesDir() != null) {
                 File filesDir = context.getFilesDir();
                 String path = filesDir.getAbsolutePath() + BIT_TELEMETRY_DIRECTORY;
                 if (!TextUtils.isEmpty(path)) {
                     File dir = new File(path);
-                    return (dir.listFiles().length < MAX_FILE_COUNT);
+                    File[] files = dir.listFiles();
+                    return files != null && files.length < MAX_FILE_COUNT;
                 }
             }
             return false;

From fedc26a97ae1f0ec825b87bf6709cb197ebd7a14 Mon Sep 17 00:00:00 2001
From: Jared Burrows <jaredsburrows@gmail.com>
Date: Thu, 20 Oct 2016 23:23:28 -0700
Subject: [PATCH 04/16] fix npe on equals() in FeedbackActivity

---
 .../src/main/java/net/hockeyapp/android/FeedbackActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
index a07d763ce..3a7a52c15 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
@@ -794,10 +794,10 @@ public void handleMessage(Message msg) {
                 String responseString = bundle.getString(SendFeedbackTask.BUNDLE_FEEDBACK_RESPONSE);
                 String statusCode = bundle.getString(SendFeedbackTask.BUNDLE_FEEDBACK_STATUS);
                 String requestType = bundle.getString(SendFeedbackTask.BUNDLE_REQUEST_TYPE);
-                if ((requestType.equals("send") && ((responseString == null) || (Integer.parseInt(statusCode) != 201)))) {
+                if ("send".equals(requestType) && (responseString == null || Integer.parseInt(statusCode) != 201)) {
                     // Send feedback went wrong if response is empty or status code != 201
                     error.setMessage(feedbackActivity.getString(R.string.hockeyapp_feedback_send_generic_error));
-                } else if ((requestType.equals("fetch") && (statusCode != null) && ((Integer.parseInt(statusCode) == 404) || (Integer.parseInt(statusCode) == 422)))) {
+                } else if ("fetch".equals(requestType) && statusCode != null && (Integer.parseInt(statusCode) == 404 || Integer.parseInt(statusCode) == 422)) {
                     // Fetch feedback went wrong if status code is 404 or 422
                     feedbackActivity.resetFeedbackView();
                     success = true;

From 0ace6648b2b1bd954d47f3d125457d22ca6b360a Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Mon, 24 Oct 2016 13:18:31 +0200
Subject: [PATCH 05/16] Safe-guard device resolution against NPE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NPEs occurred due to WindowManager.getDefaultDisplay() returnin `null` which shouldn’t happen but actually did.
---
 .../android/metrics/TelemetryContext.java     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java
index 29081a8ab..5d9bc027e 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java
@@ -235,9 +235,16 @@ protected void updateScreenResolution() {
                     Context.WINDOW_SERVICE);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
                 Point size = new Point();
-                wm.getDefaultDisplay().getRealSize(size);
-                width = size.x;
-                height = size.y;
+                Display d = wm.getDefaultDisplay();
+                if (d != null) {
+                    d.getRealSize(size);
+                    width = size.x;
+                    height = size.y;
+                } else {
+                    width = 0;
+                    height = 0;
+                }
+
             } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
                 try {
                     //We have to use undocumented API here. Android 4.0 introduced soft buttons for
@@ -250,9 +257,15 @@ protected void updateScreenResolution() {
                     height = (Integer) mGetRawH.invoke(display);
                 } catch (Exception ex) {
                     Point size = new Point();
-                    wm.getDefaultDisplay().getSize(size);
-                    width = size.x;
-                    height = size.y;
+                    Display d = wm.getDefaultDisplay();
+                    if (d != null) {
+                        d.getRealSize(size);
+                        width = size.x;
+                        height = size.y;
+                    } else {
+                        width = 0;
+                        height = 0;
+                    }
                     HockeyLog.debug(TAG, "Couldn't determine screen resolution: " + ex.toString());
                 }
 

From 9ad786cb7ecb61ee2c9ce6bc11a1b1b69e5cb64f Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Mon, 14 Nov 2016 18:20:09 -0800
Subject: [PATCH 06/16] Correctly notify listener when dialog cancelled

Fixes #168
---
 .../hockeyapp/android/tasks/CheckUpdateTaskWithUI.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/CheckUpdateTaskWithUI.java b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/CheckUpdateTaskWithUI.java
index 162b4490a..eeab39858 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/CheckUpdateTaskWithUI.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/CheckUpdateTaskWithUI.java
@@ -96,6 +96,16 @@ public void onClick(DialogInterface dialog, int which) {
                 }
             });
 
+            builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                @Override
+                public void onCancel(DialogInterface dialog) {
+                    cleanUp();
+                    if (null != listener) {
+                        listener.onCancel();
+                    }
+                }
+            });
+
             builder.setPositiveButton(R.string.hockeyapp_update_dialog_positive_button, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     if (getCachingEnabled()) {

From 4d0b4c4cefc9908fe457acd02c8e1f0b2926f3a9 Mon Sep 17 00:00:00 2001
From: Thomas Dohmke <thomas@dohmke.de>
Date: Fri, 18 Nov 2016 09:27:34 -0800
Subject: [PATCH 07/16] Fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9c1eccbf8..68b1de484 100644
--- a/README.md
+++ b/README.md
@@ -231,7 +231,7 @@ This will add the ability for your users to provide feedback from right inside y
 ```java
 import net.hockeyapp.android.FeedbackManager;
 
-public class YourActivity extends Activitiy {
+public class YourActivity extends Activity {
 
   @Override
   public void onCreate(Bundle savedInstanceState) {

From 65c7717202b55b1bcbbd49b8a220604d6e11083c Mon Sep 17 00:00:00 2001
From: Giancarlo Romeo <giancarloromeo@gmail.com>
Date: Mon, 21 Nov 2016 16:57:26 +0100
Subject: [PATCH 08/16] Add italian localization (#170)

* Added italian localization
---
 hockeysdk/src/main/res/values-it/strings.xml | 94 ++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 hockeysdk/src/main/res/values-it/strings.xml

diff --git a/hockeysdk/src/main/res/values-it/strings.xml b/hockeysdk/src/main/res/values-it/strings.xml
new file mode 100644
index 000000000..9833bb43a
--- /dev/null
+++ b/hockeysdk/src/main/res/values-it/strings.xml
@@ -0,0 +1,94 @@
+<resources>
+    <!-- Crash Dialog -->
+    <string name="hockeyapp_crash_dialog_app_name_fallback">Questa app</string>
+    <string name="hockeyapp_crash_dialog_title">%s chiusa inaspettatamente</string>
+    <string name="hockeyapp_crash_dialog_message">Vuoi inviare un report in modo anonimo così possiamo risolvere il problema?</string>
+    <string name="hockeyapp_crash_dialog_negative_button">Non inviare</string>
+    <string name="hockeyapp_crash_dialog_neutral_button">Invia sempre</string>
+    <string name="hockeyapp_crash_dialog_positive_button">Invia report</string>
+
+    <!-- Download Failed -->
+    <string name="hockeyapp_download_failed_dialog_title">Download fallito</string>
+    <string name="hockeyapp_download_failed_dialog_message">Impossibile scaricare l\'aggiornamento. Vuoi riprovare?</string>
+    <string name="hockeyapp_download_failed_dialog_negative_button">Annulla</string>
+    <string name="hockeyapp_download_failed_dialog_positive_button">Riprova</string>
+
+    <!-- Update -->
+    <string name="hockeyapp_update_mandatory_toast">%s è dispobinile ed è un aggiornamento obbligatorio!</string>
+    <string name="hockeyapp_update_dialog_title">Aggiornamento disponibile</string>
+    <string name="hockeyapp_update_button">Aggiorna</string>
+    <string name="hockeyapp_update_dialog_message">Mostrare informazioni sul nuovo aggiornamento?</string>
+    <string name="hockeyapp_update_dialog_negative_button">Ignora</string>
+    <string name="hockeyapp_update_dialog_positive_button">Mostra</string>
+
+    <!-- Expiry Info -->
+    <string name="hockeyapp_expiry_info_title">Build scaduta</string>
+    <string name="hockeyapp_expiry_info_text">%s è scaduta. Controlla HockeyApp per aggiornamenti.</string>
+
+    <!-- Feedback Activity -->
+    <string name="hockeyapp_feedback_failed_title">In attesa</string>
+    <string name="hockeyapp_feedback_failed_text">Vuoi mandare il tuo feedback nuovamente?</string>
+    <string name="hockeyapp_feedback_name_hint">Nome</string>
+    <string name="hockeyapp_feedback_email_hint">E-mail</string>
+    <string name="hockeyapp_feedback_subject_hint">Soggetto</string>
+    <string name="hockeyapp_feedback_message_hint">Messaggio</string>
+    <string name="hockeyapp_feedback_last_updated_text">Ultimo aggiornamento: %s</string>
+    <string name="hockeyapp_feedback_attachment_button_text">Aggiungi allegato</string>
+    <string name="hockeyapp_feedback_send_button_text">Invia feedback</string>
+    <string name="hockeyapp_feedback_response_button_text">Aggiungi una risposta</string>
+    <string name="hockeyapp_feedback_refresh_button_text">Aggiorna</string>
+    <string name="hockeyapp_feedback_title">Feedback</string>
+    <string name="hockeyapp_feedback_send_generic_error">Impossibile pubblicare il messaggio. Controlla i valori inseriti e la tua connessione, quindi prova di nuovo.</string>
+    <string name="hockeyapp_feedback_send_network_error">Nessuna risposta dal server. Controlla la tua connessione, quindi prova di nuovo.</string>
+    <string name="hockeyapp_feedback_validate_subject_error">Inserisci un soggetto</string>
+    <string name="hockeyapp_feedback_validate_email_error">Inserisci un indirizzo e-mail valido</string>
+    <string name="hockeyapp_feedback_validate_email_empty">Inserisci un indirizzo e-mail</string>
+    <string name="hockeyapp_feedback_validate_name_error">Inserisci il tuo nome</string>
+    <string name="hockeyapp_feedback_validate_text_error">Impossibile pubblicare il messaggio. Inserisci un testo per il feedback</string>
+    <string name="hockeyapp_feedback_generic_error">Si è verificato un errore</string>
+    <string name="hockeyapp_feedback_attach_file">Allega un file</string>
+    <string name="hockeyapp_feedback_attach_picture">Allega un\'immagine</string>
+    <string name="hockeyapp_feedback_select_file">Seleziona il file</string>
+    <string name="hockeyapp_feedback_select_picture">Seleziona l\'immagine</string>
+    <string name="hockeyapp_feedback_max_attachments_allowed">E\' consentito un massimo di %s allegati.</string>
+    <string name="hockeyapp_feedback_attachment_loading">Caricamento…</string>
+    <string name="hockeyapp_feedback_attachment_error">Errore</string>
+
+    <!-- Send Feedback Task -->
+    <string name="hockeyapp_feedback_sending_feedback_text">Invio feedback…</string>
+    <string name="hockeyapp_feedback_fetching_feedback_text">Recupero discussioni…</string>
+
+    <!-- Login Activity -->
+    <string name="hockeyapp_login_headline_text">Inserisci l\'indirizzo e-mail e la password del tuo account HockeyApp per autorizzare l\'accesso a questa app.</string>
+    <string name="hockeyapp_login_headline_text_email_only">Inserisci l\'indirizzo e-mail del tuo account HockeyApp per autorizzare l\'accesso a questa app.</string>
+    <string name="hockeyapp_login_missing_credentials_toast">Inserisci le credenziali dell\'account mancanti.</string>
+    <string name="hockeyapp_login_email_hint">E-mail</string>
+    <string name="hockeyapp_login_password_hint">Password</string>
+    <string name="hockeyapp_login_login_button_text">Accedi</string>
+
+    <!-- Paint Activity -->
+    <string name="hockeyapp_paint_indicator_toast">Disegna qualcosa!</string>
+    <string name="hockeyapp_paint_menu_save">Salva</string>
+    <string name="hockeyapp_paint_menu_undo">Annulla</string>
+    <string name="hockeyapp_paint_menu_clear">Cancella</string>
+    <string name="hockeyapp_paint_dialog_message">Vuoi salvare i tuoi disegni?</string>
+    <string name="hockeyapp_paint_dialog_negative_button">Scarta</string>
+    <string name="hockeyapp_paint_dialog_positive_button">Salva</string>
+    <string name="hockeyapp_paint_dialog_neutral_button">Annulla</string>
+
+    <!-- Permissions -->
+    <string name="hockeyapp_permission_update_title">Accesso allo spazio di archiviazione richiesto</string>
+    <string name="hockeyapp_permission_update_message">Per scaricare ed installare gli aggiornamenti dell\'app devi consentire l\'accesso allo spazio di archiviazione del dispositivo.</string>
+    <string name="hockeyapp_permission_dialog_negative_button">Annulla</string>
+    <string name="hockeyapp_permission_dialog_positive_button">Riprova</string>
+
+    <!-- Dialogs -->
+    <string name="hockeyapp_dialog_positive_button">OK</string>
+    <string name="hockeyapp_dialog_negative_button">Annulla</string>
+    <string name="hockeyapp_dialog_error_title">Errore</string>
+    <string name="hockeyapp_dialog_error_message">Si è verificato un errore</string>
+
+    <!-- Misc -->
+    <string name="hockeyapp_error_no_network_message">Il tuo dispositivo non è connesso ad internet. Risolvi i problemi di connessione e riprova.</string>
+
+</resources>

From 52fcce9276bf582ed3978cbd607949a1baff30c9 Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Mon, 21 Nov 2016 16:58:42 +0100
Subject: [PATCH 09/16] Fix typo in Italian localization

---
 hockeysdk/src/main/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hockeysdk/src/main/res/values-it/strings.xml b/hockeysdk/src/main/res/values-it/strings.xml
index 9833bb43a..8f9313f1a 100644
--- a/hockeysdk/src/main/res/values-it/strings.xml
+++ b/hockeysdk/src/main/res/values-it/strings.xml
@@ -14,7 +14,7 @@
     <string name="hockeyapp_download_failed_dialog_positive_button">Riprova</string>
 
     <!-- Update -->
-    <string name="hockeyapp_update_mandatory_toast">%s è dispobinile ed è un aggiornamento obbligatorio!</string>
+    <string name="hockeyapp_update_mandatory_toast">%s è disponibile ed è un aggiornamento obbligatorio!</string>
     <string name="hockeyapp_update_dialog_title">Aggiornamento disponibile</string>
     <string name="hockeyapp_update_button">Aggiorna</string>
     <string name="hockeyapp_update_dialog_message">Mostrare informazioni sul nuovo aggiornamento?</string>

From 979276ae3a85017253c46f3d0541adb3eae5e070 Mon Sep 17 00:00:00 2001
From: Rafael Roman <panthro.rafael@gmail.com>
Date: Mon, 21 Nov 2016 17:01:43 +0100
Subject: [PATCH 10/16] pt-br hockeyapp translation (#159)

---
 hockeysdk/src/main/res/values-pt/strings.xml | 95 ++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 hockeysdk/src/main/res/values-pt/strings.xml

diff --git a/hockeysdk/src/main/res/values-pt/strings.xml b/hockeysdk/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..bc75b1699
--- /dev/null
+++ b/hockeysdk/src/main/res/values-pt/strings.xml
@@ -0,0 +1,95 @@
+<resources>
+    <!-- Crash Dialog -->
+    <string name="hockeyapp_crash_dialog_app_name_fallback">Esta App</string>
+    <string name="hockeyapp_crash_dialog_title">%s Parou inesperadamente</string>
+    <string name="hockeyapp_crash_dialog_message">Gostaria de enviar um relatório anônimo para corrigirmos o problema?</string>
+    <string name="hockeyapp_crash_dialog_negative_button">Não enviar</string>
+    <string name="hockeyapp_crash_dialog_neutral_button">Sempre enviar</string>
+    <string name="hockeyapp_crash_dialog_positive_button">Enviar relatório</string>
+
+    <!-- Download Failed -->
+    <string name="hockeyapp_download_failed_dialog_title">Falha no download</string>
+    <string name="hockeyapp_download_failed_dialog_message">Não foi possivel baixar a atualização. Gostaria de tentar de novo?</string>
+    <string name="hockeyapp_download_failed_dialog_negative_button">Cancelar</string>
+    <string name="hockeyapp_download_failed_dialog_positive_button">Tentar novamente</string>
+
+    <!-- Update -->
+    <string name="hockeyapp_update_mandatory_toast">%s está disponível e é obrigatória!</string>
+    <string name="hockeyapp_update_dialog_title">Atualização disponível</string>
+    <string name="hockeyapp_update_button">Atualizar</string>
+    <string name="hockeyapp_update_dialog_message">Mostrar informações sobre a nova atualização?</string>
+    <string name="hockeyapp_update_dialog_negative_button">Ignorar</string>
+    <string name="hockeyapp_update_dialog_positive_button">Mostrar</string>
+  
+
+    <!-- Expiry Info -->
+    <string name="hockeyapp_expiry_info_title">Build Expirada</string>
+    <string name="hockeyapp_expiry_info_text">%s expirou. Por favor, verifique no HockeyApp para atualizações.</string>
+
+    <!-- Feedback Activity -->
+    <string name="hockeyapp_feedback_failed_title">Pendente</string>
+    <string name="hockeyapp_feedback_failed_text">Gostaria de enviar o feedback novamente?</string>
+    <string name="hockeyapp_feedback_name_hint">Nome</string>
+    <string name="hockeyapp_feedback_email_hint">Email</string>
+    <string name="hockeyapp_feedback_subject_hint">Assunto</string>
+    <string name="hockeyapp_feedback_message_hint">Mensagem</string>
+    <string name="hockeyapp_feedback_last_updated_text">Ultima atualização: %s</string>
+    <string name="hockeyapp_feedback_attachment_button_text">Adicionar anexo</string>
+    <string name="hockeyapp_feedback_send_button_text">Enviar feedback</string>
+    <string name="hockeyapp_feedback_response_button_text">Adicionar Resposta</string>
+    <string name="hockeyapp_feedback_refresh_button_text">Atualizar</string>
+    <string name="hockeyapp_feedback_title">Feedback</string>
+    <string name="hockeyapp_feedback_send_generic_error">A mensagem não pôde ser enviada. Por favor verifique os campos, sua conexão com a internet e tente novamente..</string>
+    <string name="hockeyapp_feedback_send_network_error">Sem resposta do servidor. Por favor, verifique sua conexão e tente novamente.</string>
+    <string name="hockeyapp_feedback_validate_subject_error">Por favor preencha um assunto</string>
+    <string name="hockeyapp_feedback_validate_email_error">Por favor preencha seu nome</string>
+    <string name="hockeyapp_feedback_validate_email_empty">Por favor preencha seu email</string>
+    <string name="hockeyapp_feedback_validate_name_error">Por favor preencha a mensagem</string>
+    <string name="hockeyapp_feedback_validate_text_error">A mensagem não pôde ser enviada. Por favor verifique o formato do seu email.</string>
+    <string name="hockeyapp_feedback_generic_error">Ocorreu um erro</string>
+    <string name="hockeyapp_feedback_attach_file">Anexar arquivo</string>
+    <string name="hockeyapp_feedback_attach_picture">Anexar imagem</string>
+    <string name="hockeyapp_feedback_select_file">Selecionar arquivo</string>
+    <string name="hockeyapp_feedback_select_picture">Selecionar imagem</string>
+    <string name="hockeyapp_feedback_max_attachments_allowed">Máximo %s anexos permitidos.</string>
+    <string name="hockeyapp_feedback_attachment_loading">Carregando…</string>
+    <string name="hockeyapp_feedback_attachment_error">Erro</string>
+
+    <!-- Send Feedback Task -->
+    <string name="hockeyapp_feedback_sending_feedback_text">Enviando Feedback…</string>
+    <string name="hockeyapp_feedback_fetching_feedback_text">Recebendo discussões…</string>
+
+    <!-- Login Activity -->
+    <string name="hockeyapp_login_headline_text">Por favor preencha seu email e senha do HockeyApp para ter acesso a esse aplicativo.</string>
+    <string name="hockeyapp_login_headline_text_email_only">Por favor preencha seu email do HockeyApp para ter acesso a esse aplicativo.</string>
+    <string name="hockeyapp_login_missing_credentials_toast">Por favor preencha suas credenciais.</string>
+    <string name="hockeyapp_login_email_hint">Email</string>
+    <string name="hockeyapp_login_password_hint">Senha</string>
+    <string name="hockeyapp_login_login_button_text">Login</string>
+
+    <!-- Paint Activity -->
+    <string name="hockeyapp_paint_indicator_toast">Desenhe algo!</string>
+    <string name="hockeyapp_paint_menu_save">Salvar</string>
+    <string name="hockeyapp_paint_menu_undo">Desfazer</string>
+    <string name="hockeyapp_paint_menu_clear">Limpar</string>
+    <string name="hockeyapp_paint_dialog_message">Quer salvar seu desenho?</string>
+    <string name="hockeyapp_paint_dialog_negative_button">Descartar</string>
+    <string name="hockeyapp_paint_dialog_positive_button">Salvar</string>
+    <string name="hockeyapp_paint_dialog_neutral_button">Cancelar</string>
+
+    <!-- Permissions -->
+    <string name="hockeyapp_permission_update_title">Acesso ao armazenamento necessário</string>
+    <string name="hockeyapp_permission_update_message">Para poder fazer download e instalar atualizações, você deve permitir que esse aplicativo acesse o armazenamento do seu dispositivo.</string>
+    <string name="hockeyapp_permission_dialog_negative_button">Cancelar</string>
+    <string name="hockeyapp_permission_dialog_positive_button">Tentar novamente</string>
+
+    <!-- Dialogs -->
+    <string name="hockeyapp_dialog_positive_button">OK</string>
+    <string name="hockeyapp_dialog_negative_button">Cancelar</string>
+    <string name="hockeyapp_dialog_error_title">Erro</string>
+    <string name="hockeyapp_dialog_error_message">Ocorreu um erro</string>
+
+    <!-- Misc -->
+    <string name="hockeyapp_error_no_network_message">Seu dispositivo não está conectado à internet. Por favor verifique sua conexão e tente novamente.</string>
+
+</resources>

From 6343e151f8edcca69e0186e5ee38748a13364055 Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Mon, 21 Nov 2016 17:02:41 +0100
Subject: [PATCH 11/16] Fix typo in Brazilian-Portuguese translation

---
 hockeysdk/src/main/res/values-pt/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hockeysdk/src/main/res/values-pt/strings.xml b/hockeysdk/src/main/res/values-pt/strings.xml
index bc75b1699..1fc6f57aa 100644
--- a/hockeysdk/src/main/res/values-pt/strings.xml
+++ b/hockeysdk/src/main/res/values-pt/strings.xml
@@ -39,7 +39,7 @@
     <string name="hockeyapp_feedback_response_button_text">Adicionar Resposta</string>
     <string name="hockeyapp_feedback_refresh_button_text">Atualizar</string>
     <string name="hockeyapp_feedback_title">Feedback</string>
-    <string name="hockeyapp_feedback_send_generic_error">A mensagem não pôde ser enviada. Por favor verifique os campos, sua conexão com a internet e tente novamente..</string>
+    <string name="hockeyapp_feedback_send_generic_error">A mensagem não pôde ser enviada. Por favor verifique os campos, sua conexão com a internet e tente novamente…</string>
     <string name="hockeyapp_feedback_send_network_error">Sem resposta do servidor. Por favor, verifique sua conexão e tente novamente.</string>
     <string name="hockeyapp_feedback_validate_subject_error">Por favor preencha um assunto</string>
     <string name="hockeyapp_feedback_validate_email_error">Por favor preencha seu nome</string>

From c6ff80b334f40af7ae2f56b60a127b026734444d Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Mon, 21 Nov 2016 21:09:19 +0100
Subject: [PATCH 12/16] Change Update button width to adapt to languages

---
 hockeysdk/src/main/res/layout/hockeyapp_activity_update.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hockeysdk/src/main/res/layout/hockeyapp_activity_update.xml b/hockeysdk/src/main/res/layout/hockeyapp_activity_update.xml
index 6ab15e383..9e1fdd087 100644
--- a/hockeysdk/src/main/res/layout/hockeyapp_activity_update.xml
+++ b/hockeysdk/src/main/res/layout/hockeyapp_activity_update.xml
@@ -56,19 +56,20 @@
 
         <Button
             android:id="@+id/button_update"
-            android:layout_width="120dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_below="@id/label_version"
             android:layout_margin="20dp"
             android:background="@drawable/hockeyapp_btn_background"
+            android:minWidth="120dp"
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
             android:paddingRight="20dp"
             android:paddingTop="10dp"
             android:text="@string/hockeyapp_update_button"
             android:textColor="@color/hockeyapp_text_white"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
     </RelativeLayout>
 

From fee5bae23095e31f4115213df761996d1607ec13 Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Mon, 21 Nov 2016 21:09:19 +0100
Subject: [PATCH 13/16] Change Update button width to adapt to languages

---
 .../src/main/res/layout-land/hockeyapp_activity_update.xml   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hockeysdk/src/main/res/layout-land/hockeyapp_activity_update.xml b/hockeysdk/src/main/res/layout-land/hockeyapp_activity_update.xml
index 396d5caf9..0f10daf2b 100644
--- a/hockeysdk/src/main/res/layout-land/hockeyapp_activity_update.xml
+++ b/hockeysdk/src/main/res/layout-land/hockeyapp_activity_update.xml
@@ -53,15 +53,16 @@
 
         <Button
             android:id="@+id/button_update"
-            android:layout_width="120dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_below="@id/label_version"
             android:layout_margin="20dp"
             android:background="@drawable/hockeyapp_btn_background"
+            android:minWidth="120dp"
             android:text="@string/hockeyapp_update_button"
             android:textColor="@color/hockeyapp_text_white"
-            android:textSize="16sp" />
+            android:textSize="16sp"/>
 
 
     </RelativeLayout>

From 7c84b10c4e81d4f034840deb0c068a7c51763d9e Mon Sep 17 00:00:00 2001
From: Brent Watson <brent@brentwatson.com>
Date: Thu, 24 Nov 2016 05:46:58 -0500
Subject: [PATCH 14/16] 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
---
 .../hockeyapp/android/FeedbackActivity.java   | 29 ++++++++++++++-----
 .../hockeyapp/android/FeedbackManager.java    |  2 ++
 .../android/FeedbackManagerListener.java      |  8 +++++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
index 3a7a52c15..477b250c1 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
+++ b/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();
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
index 070648400..10f364f1f 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
+++ b/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);
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManagerListener.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManagerListener.java
index b7ebc66a2..d81a2c47f 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManagerListener.java
+++ b/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;
+    }
 }

From e134d7b9a6d9d80045a51ea277c21a239647b0c4 Mon Sep 17 00:00:00 2001
From: Rohan <devsgate@gmail.com>
Date: Thu, 24 Nov 2016 16:17:56 +0530
Subject: [PATCH 15/16] Update README.md (#190)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 68b1de484..9be2c1ea8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ HockeySDK-Android implements support for using HockeyApp in your Android applica
 
 The following features are currently supported:
 
-1. **Crash Reports:** If your app crashes, a crash log is written to the device's storage. If the user starts the app again, they will be asked asked to submit the crash report to HockeyApp. This works for both beta and live apps, i.e. those submitted to Google Play or other app stores. Crash logs contain viable information for you to help resolve the issue. Furthermore, you as a developer can add additional information to the report as well.
+1. **Crash Reports:** If your app crashes, a crash log is written to the device's storage. If the user starts the app again, they will be asked to submit the crash report to HockeyApp. This works for both beta and live apps, i.e. those submitted to Google Play or other app stores. Crash logs contain viable information for you to help resolve the issue. Furthermore, you as a developer can add additional information to the report as well.
 
 2. **User Metrics:** Understand user behavior to improve your app. Track usage through daily and monthly active users, monitor crash impacted users, as well as customer engagement through session count. User Metrics requires a minimum API level of 14 (Android 4.x Ice Cream Sandwich).
 

From f93326757c16ba8ed1de0b093ea85cd9f23cb409 Mon Sep 17 00:00:00 2001
From: Matthias Wenz <matwen@microsoft.com>
Date: Thu, 8 Dec 2016 16:05:45 +0100
Subject: [PATCH 16/16] Update version for release

---
 README.md    | 14 +++++++-------
 build.gradle |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9be2c1ea8..331d9dd95 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/bitstadium/HockeySDK-Android.svg?branch=develop)](https://travis-ci.org/bitstadium/HockeySDK-Android)
 [![Slack Status](https://slack.hockeyapp.net/badge.svg)](https://slack.hockeyapp.net)
 
-## Version 4.1.1
+## Version 4.1.2
 
 ## Introduction
 
@@ -75,7 +75,7 @@ Please see the "[How to create a new app](http://support.hockeyapp.net/kb/about-
 Add the SDK to your app module's dependencies in Android Studio by adding the following line to your `dependencies { ... }` configuration:
 
 ```groovy
-compile 'net.hockeyapp.android:HockeySDK:4.1.1'
+compile 'net.hockeyapp.android:HockeySDK:4.1.2'
 ```
 
 <a id="integrate-sdk"></a>
@@ -314,7 +314,7 @@ If you don't want to use Gradle or Maven dependency management you can also down
 4. Configure your development tools to use the .aar/.jar file.
 5. In Android Studio, create a new module via `File > New > New Module`
 6. Select **Import .JAR/.AAR Package** and click **Next**.
-7. In the next menu select the .aar/.jar file you just copied to the libs folder. You can rename the module to whatever you want, but we in general recommend leaving it as is. If you don't rename the module, it will match the name of the .aar/.jar file, in this case **HockeySDK-4.1.1**. This way you'll quickly know which version of the SDK you are using in the future.
+7. In the next menu select the .aar/.jar file you just copied to the libs folder. You can rename the module to whatever you want, but we in general recommend leaving it as is. If you don't rename the module, it will match the name of the .aar/.jar file, in this case **HockeySDK-4.1.2**. This way you'll quickly know which version of the SDK you are using in the future.
 8. Make sure Android Studio added the necessary code to integrate the HockeySDK:
 
 Head over to your app's `build.gradle` to verify the dependency was added correctly. It should look like this:
@@ -324,19 +324,19 @@ dependencies {
 	//your other dependencies
 	//...
 	
-    compile project(':HockeySDK-4.1.1')
+    compile project(':HockeySDK-4.1.2')
 }
 ```
 Next, make sure your `settings.gradle` contains the new module:
 
 ```groovy
-include ':app', ':HockeySDK-4.1.1'
+include ':app', ':HockeySDK-4.1.2'
 ```
 
 Finally, check the `build.gradle` of the newly added module:
 ```groovy
 configurations.maybeCreate("default")
-artifacts.add("default", file('HockeySDK-4.1.1.aar'))
+artifacts.add("default", file('HockeySDK-4.1.2.aar'))
 ```
 
 Once you have verified that everything necessary has been added, proceed with [SDK integration](#integrate-sdk).
@@ -527,7 +527,7 @@ However, if you provide a custom user interface fragment for the update distribu
 <a id="documentation"></a>
 ## 5. Documentation
 
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/android/4.1.1/index.html).
+Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/android/4.1.2/index.html).
 
 <a id="troubleshooting"></a>
 ## 6.Troubleshooting
diff --git a/build.gradle b/build.gradle
index fbbc6d87d..5430ed178 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ allprojects {
 
 ext {
     ARTIFACT_ID = 'HockeySDK'
-    VERSION_NAME = '4.1.1'
+    VERSION_NAME = '4.1.2'
     VERSION_CODE = 10
     SITE_URL = 'https://github.com/bitstadium/hockeysdk-android'
     GIT_URL = 'https://github.com/bitstadium/HockeySDK-Android.git'