Merge branch 'hotfix/v2.2.1'

* hotfix/v2.2.1: Bump version and re-generate binaries Fixed issue with add ons not showing correctly
7LPdWcaW · Feb 25, 2017 · 5162a72 · 5162a72
2 parents 7fd60a8 + 013b398
commit 5162a72
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 Welcome to grow tracker. This app was created to help record data about growing plants in order to monitor the growing conditions to help make the plants grow better, and identify potential issues during the grow process.
 
-[Latest APK: (MD5) 494a35112fa7e46403ff169f94fda9ab v2.2](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-production-release.apk)
+[Latest APK: (MD5) cbdf6ad0cfd4d87159fd0c2f762d142c v2.2.1](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-production-release.apk)
 
-[Latest APK (Discrete): (MD5) 3b2e3a2664777b2032ca09da2771241b v2.2](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-discrete-release.apk)
+[Latest APK (Discrete): (MD5) 1099cc60eb90568074d6ca3ee230f0da v2.2.1](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-discrete-release.apk)
 
 # Installation
 

diff --git a/app/app-discrete-release.apk b/app/app-discrete-release.apk
diff --git a/app/app-production-release.apk b/app/app-production-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
 		minSdkVersion 17
 		targetSdkVersion 25
 		versionCode 9
-		versionName "2.2"
+		versionName "2.2.1"
 	}
 
 	lintOptions {

diff --git a/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java b/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java
@@ -195,10 +195,11 @@ private void populateAddons()
 					}
 				}
 			}
-			else
-			{
-				getPreferenceScreen().removePreference(list);
-			}
+		}
+
+		if (list.getPreferenceCount() == 0)
+		{
+			getPreferenceScreen().removePreference(list);
 		}
 	}