Skip to content

Commit dbcdaeb

Browse files
committed
Added user id in output and added notification string which asks for updating plugin.
1 parent e73a449 commit dbcdaeb

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/main/java/org/jetbrains/research/groups/ml_methods/error_reporting/AnonymousFeedback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class AnonymousFeedback {
4242
usersInformationToPresentableForm.put(APP_BUILD, "App Build");
4343
usersInformationToPresentableForm.put(APP_VERSION, "App Version");
4444
usersInformationToPresentableForm.put(LAST_ACTION, "Last Action");
45+
usersInformationToPresentableForm.put(PERMANENT_INSTALLATION_ID, "User's Permanent Installation ID");
4546
}
4647

4748
private AnonymousFeedback() {
@@ -102,7 +103,6 @@ static SubmittedReportInfo sendFeedback(ErrorReportInformation errorReportInform
102103
@Nullable
103104
private static Issue findFirstDuplicate(String uniqueTitle, final IssueService service, RepositoryId repo) {
104105
Map<String, String> searchParameters = new HashMap<>(2);
105-
// TODO: process closed: if it is closed advice update
106106
searchParameters.put(IssueService.FILTER_STATE, IssueService.STATE_OPEN);
107107
final PageIterator<Issue> pages = service.pageIssues(repo, searchParameters);
108108
for (Collection<Issue> page : pages) {

src/main/java/org/jetbrains/research/groups/ml_methods/error_reporting/ErrorReportInformation.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.jetbrains.research.groups.ml_methods.error_reporting;
22

33
import com.intellij.openapi.application.ApplicationNamesInfo;
4+
import com.intellij.openapi.application.PermanentInstallationID;
45
import com.intellij.openapi.application.ex.ApplicationInfoEx;
56
import com.intellij.openapi.diagnostic.Attachment;
67
import com.intellij.util.SystemProperties;
@@ -16,7 +17,7 @@ class ErrorReportInformation {
1617
public enum InformationType {
1718
ERROR_DESCRIPTION, PLUGIN_NAME, PLUGIN_VERSION, OS_NAME, JAVA_VERSION, JAVA_VM_VENDOR,
1819
APP_NAME, APP_FULL_NAME, APP_VERSION_NAME, IS_EAP, APP_BUILD, APP_VERSION, LAST_ACTION,
19-
ERROR_MESSAGE, ERROR_STACKTRACE, ERROR_HASH, ATTACHMENT_NAME, ATTACHMENT_VALUE
20+
PERMANENT_INSTALLATION_ID, ERROR_MESSAGE, ERROR_STACKTRACE, ERROR_HASH, ATTACHMENT_NAME, ATTACHMENT_VALUE
2021
}
2122

2223
private final EnumMap<InformationType, String> information = new EnumMap<>(InformationType.class);
@@ -28,18 +29,16 @@ private ErrorReportInformation(GitHubErrorBean error,
2829

2930
information.put(PLUGIN_NAME, error.getPluginName());
3031
information.put(PLUGIN_VERSION, error.getPluginVersion());
31-
3232
information.put(OS_NAME, SystemProperties.getOsName());
3333
information.put(JAVA_VERSION, SystemProperties.getJavaVersion());
3434
information.put(JAVA_VM_VENDOR, SystemProperties.getJavaVmVendor());
35-
3635
information.put(APP_NAME, namesInfo.getProductName());
3736
information.put(APP_FULL_NAME, namesInfo.getFullProductName());
3837
information.put(APP_VERSION_NAME, appInfo.getVersionName());
3938
information.put(IS_EAP, Boolean.toString(appInfo.isEAP()));
4039
information.put(APP_BUILD, appInfo.getBuild().asString());
4140
information.put(APP_VERSION, appInfo.getFullVersion());
42-
41+
information.put(PERMANENT_INSTALLATION_ID, PermanentInstallationID.get());
4342
information.put(LAST_ACTION, error.getLastAction());
4443

4544
information.put(ERROR_MESSAGE, error.getMessage());

src/main/resources/ArchitectureReloadedBundle.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,7 @@ target.class.is.not.valid = Target class is not valid anymore
3838
report.error.to.plugin.vendor = Report error to plugin vendor
3939
report.error.progress.dialog.text = Submitting error report...
4040
report.error.connection.failure = Could not communicate with GitHub
41-
git.issue.text = <a href="{0}">Created issue {1}</a>. Thank you for your feedback!
42-
git.issue.duplicate.text = <a href="{0}">A similar issues was already reported (#{1})</a>. Thank you for your feedback!
41+
git.issue.text = <a href="{0}">Created issue {1}</a>. Thank you for your feedback! \n \
42+
Make sure you have the latest plugin version.
43+
git.issue.duplicate.text = <a href="{0}">A similar issues was already reported (#{1})</a>. \n \
44+
Thank you for your feedback! Make sure you have the latest plugin version.

0 commit comments

Comments
 (0)