bug fix - update to v0.6.1

nextcloud · May 4, 2014 · a5da58b · a5da58b
1 parent 586e80e
commit a5da58b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/News-Android-App.apk b/News-Android-App.apk
diff --git a/News-Android-App.iml b/News-Android-App.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="C:\Users\David\Documents\Android-Projects\News-Android-App" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

diff --git a/News-Android-App/News-Android-App-News-Android-App.iml b/News-Android-App/News-Android-App-News-Android-App.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="C:\Users\David\Documents\Android-Projects\News-Android-App\News-Android-App" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="News-Android-App" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="News-Android-App" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -69,14 +69,14 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="extra-abs-0.9.3" level="project" />
-    <orderEntry type="library" exported="" name="library-0.2.0" level="project" />
-    <orderEntry type="library" exported="" name="library-0.9.3" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
     <orderEntry type="library" exported="" name="butterknife-4.0.1" level="project" />
+    <orderEntry type="library" exported="" name="extra-abs-0.9.9" level="project" />
     <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
+    <orderEntry type="library" exported="" name="library-0.9.9" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.7.2" level="project" />
+    <orderEntry type="library" exported="" name="library-0.4.0" level="project" />
     <orderEntry type="library" exported="" name="actionbarsherlock-4.4.0" level="project" />
     <orderEntry type="module" module-name="MessageBar" exported="" />
     <orderEntry type="module" module-name="ChangeLogLibrary" exported="" />

diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.luhmer.owncloudnewsreader"
-    android:versionCode="45"
-    android:versionName="0.6.0" >
+    android:versionCode="46"
+    android:versionName="0.6.1" >
 
     <uses-sdk
         android:minSdkVersion="7"

diff --git a/...rc/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java b/...rc/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java
@@ -93,6 +93,11 @@ public int getValue() {
         public String getValueString() {
             return String.valueOf(id);
         }
+
+        @Override
+        public String toString() {
+            return getValueString();
+        }
     }
 
     int mTextColorLightTheme;
@@ -306,7 +311,7 @@ public void onClick(View v) {
 				boolean skipFireEvent = false;
 				if(group.idFolder != null)
 				{
-					if(group.idFolder.equals(ITEMS_WITHOUT_FOLDER))
+					if(group.idFolder.equals(ITEMS_WITHOUT_FOLDER.getValueString()))
 					{
 						fireListTextClicked(val, mContext, false, group.idFolder);
 						skipFireEvent = true;
@@ -323,7 +328,7 @@ public void onClick(View v) {
         boolean skipGetUnread = false;
         if(group.idFolder != null)
         {
-        	if(group.idFolder.equals(ITEMS_WITHOUT_FOLDER))
+        	if(group.idFolder.equals(ITEMS_WITHOUT_FOLDER.getValueString()))
         	{
                 String unreadCount = unreadCountFeeds.get((int) group.id_database);
 
@@ -361,14 +366,14 @@ public void onClick(View v) {
 
         if(group.idFolder != null)
         {
-	        if(group.idFolder.equals(ITEMS_WITHOUT_FOLDER))
+	        if(group.idFolder.equals(ITEMS_WITHOUT_FOLDER.getValueString()))
 	        {
                 String favIconURL = urlsToFavIcons.get((int) group.id_database);
 
                 loadFavIconForFeed(favIconURL, viewHolder.imgView);
 	        }
         } else {
-        	if(String.valueOf(group.id_database).equals(ALL_STARRED_ITEMS)) {
+        	if(String.valueOf(group.id_database).equals(ALL_STARRED_ITEMS.getValueString())) {
         		viewHolder.imgView.setVisibility(View.VISIBLE);
         		//viewHolder.imgView.setImageResource(R.drawable.btn_rating_star_off_normal_holo_light);
                 viewHolder.imgView.setImageDrawable(getBtn_rating_star_off_normal_holo_light(mContext));

diff --git a/README.md b/README.md
@@ -64,9 +64,15 @@ git clone --recursive https://github.com/owncloud/News-Android-App.git -b dev
 
 Updates
 ==================================
-0.6.1 (in development)
+0.6.2 (in development)
 ---------------------
 
+
+0.6.1 (Google Play)
+---------------------
+- Bug fix - <a href="https://github.com/owncloud/News-Android-App/issues/216">#216 Bug in list overview in 0.6.0</a>
+
+
 0.6.0 (Google Play - Beta)(in development)
 ---------------------
 - Performance improvements