Merged hotfix/5.2.16 into master

srkns · Jun 21, 2016 · 7b6ebca · 7b6ebca
2 parents ac856f8 + 396aed2
commit 7b6ebca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 374 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 
 MIN_SDK=14
 TARGET_SDK=23
-VERSION_NAME=5.2.15
-VERSION_CODE=219
+VERSION_NAME=5.2.16
+VERSION_CODE=220
 PACKAGE=it.feio.android.omninotes
 
 # The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow:

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/ListFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/ListFragment.java
@@ -952,6 +952,7 @@ private void checkSortActionPerformed(MenuItem item) {
             listViewPositionOffset = 16;
             listViewPosition = 0;
             restoreListScrollPosition();
+			toggleSearchLabel(false);
             // Updates app widgets
             BaseActivity.notifyAppWidgets(mainActivity);
         }

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java
@@ -368,7 +368,7 @@ private boolean receivedIntent(Intent i) {
     private boolean noteAlreadyOpened(Note note) {
         DetailFragment detailFragment = (DetailFragment) mFragmentManager.findFragmentByTag(FRAGMENT_DETAIL_TAG);
         return detailFragment != null && detailFragment.getCurrentNote() != null && detailFragment.getCurrentNote()
-                .get_id() == note.get_id();
+				.get_id().equals(note.get_id());
     }
 
 

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/SimpleDiskCache.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/SimpleDiskCache.java