Fix issue with "Unsupported gitflow version" message presented at sta…

…rtup #328 #329
OpherV · Aug 18, 2021 · e4995a9 · e4995a9
1 parent ea17872
commit e4995a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,6 +36,7 @@ patchPluginXml {
 
       <H2>Changelog for 0.7.7</H2>
       <ul>                                                                                                                                 
+        <li>Fix issue with "Unsupported gitflow version" message presented at startup #328 #329</li>                                                                                                                                                                                                                                             
         <li>Support for 2021.2 build</li>                                                                                                                                                                                                                                             
       </ul>
 

diff --git a/src/main/java/gitflow/GitflowVersionTester.java b/src/main/java/gitflow/GitflowVersionTester.java
@@ -72,4 +72,8 @@ public void init(){
 			version = returnedVersion;
 		}
 	}
+
+	public boolean hasVersionBeenTested(){
+		return version != null;
+	}
 }
diff --git a/src/main/java/gitflow/ui/GitflowWidget.java b/src/main/java/gitflow/ui/GitflowWidget.java
@@ -141,7 +141,7 @@ public ListPopup getPopupStep() {
     @NotNull
     @Override
     public String getSelectedValue() {
-        if (!getIsSupportedVersion()) {
+        if (getHasVersionBeenTested() && !getIsSupportedVersion()) {
             return "Unsupported Git Flow Version";
         }
         return myText;
@@ -283,7 +283,12 @@ public float getAlignment() {
     }
 
     public boolean getIsSupportedVersion(){
-        return GitflowVersionTester.forProject(myProject).isSupportedVersion();
+        GitflowVersionTester versionTester = GitflowVersionTester.forProject(myProject);
+        return versionTester.hasVersionBeenTested() && versionTester.isSupportedVersion();
+    }
+
+    public boolean getHasVersionBeenTested(){
+        return GitflowVersionTester.forProject(myProject).hasVersionBeenTested();
     }
 
     private void initVersionCheck(){
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ patchPluginXml { @@
           <H2>Changelog for 0.7.7</H2>
           <ul>
+            <li>Fix issue with "Unsupported gitflow version" message presented at startup #328 #329</li>
             <li>Support for 2021.2 build</li>
           </ul>
@@ Expand Down @@