Merged release/6.0.1 into master

README.md

@@ -4,8 +4,6 @@ Omni-Notes
 ==========
 
 ![SLicense](https://img.shields.io/badge/License-GPLv3-red.svg)
-[![Stories in Ready](https://badge.waffle.io/federicoiosue/Omni-Notes.png?label=ready&title=Ready)](https://waffle.io/federicoiosue/Omni-Notes)
-[![Stories in In Progress](https://badge.waffle.io/federicoiosue/Omni-Notes.png?label=In%20Progress&title=InProgress)](https://waffle.io/federicoiosue/Omni-Notes)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/omni-notes/localized.png)](https://crowdin.com/project/omni-notes)
 [![Build Status](https://travis-ci.org/federicoiosue/Omni-Notes.svg?branch=develop)](https://travis-ci.org/federicoiosue/Omni-Notes)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/8ade707d00ef468fa79d3f6b622444b5)](https://www.codacy.com/app/federico-iosue/Omni-Notes?utm_source=github.com&utm_medium=referral&utm_content=federicoiosue/Omni-Notes&utm_campaign=Badge_Grade)
@@ -15,9 +13,9 @@ Note taking <b>open-source</b> application aimed to have both a <b>simple interf
 
 The project was inspired by the absence of such applications compatible with old phones and old versions of Android. It aims to provide an attractive look and follow the most recent design guidelines of the Google operating system.
 
-**Follow the developments and post your comments and advice on Google+ Beta Community at http://goo.gl/eF6qqF**
+**Follow the developments and post your comments and advice on Facebook Community at https://www.facebook.com/OmniNotes**
 
-*Help to keep translations updated is always welcome, if you want give a hand checkout the translation project at [Crowdin][2].*
+*Help to keep translations updated is always welcome, if you want give a hand checkout the translation project on **https://translate.omninotes.app.** *
 
 <a href="https://f-droid.org/repository/browse/?fdid=it.feio.android.omninotes.foss" target="_blank">
 <img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
@@ -92,6 +90,11 @@ Feel free to add yourself to [contributors.md](https://github.com/federicoiosue/
 
 This kind of contributions **must** have screenshots or screencast as demonstration of the new additions.
 
+### Code style
+
+If you plan to manipulate the code then you'll have to do it by following a [specific code style](https://gist.github.com/federicoiosue/dee53e882b3c70d544f8608769eb02fc).
+Also pay attention if you're using any plugin that automatically formats/cleans/rearrange your code and set it to only change that code that you touched and not the whole files.
+
 ### Test your code contributions!
 
 All code changes and additions **must** be tested.
@@ -171,6 +174,3 @@ They're all listed into the [build.gradle](https://github.com/federicoiosue/Omni
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-[2]: https://crowdin.net/project/omni-notes/
-[2]: https://crowdin.net/project/omni-notes/

assets/translations/strings.xml

@@ -13,7 +13,7 @@
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   ~ GNU General Public License for more details.
   ~
-  ~ You should have received a copy of the GNU General Public Licensefailed
+  ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>

gradle.properties

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-VERSION_NAME=6.0.0
-VERSION_CODE=273
+VERSION_NAME=6.0.1
+VERSION_CODE=274
 PACKAGE=it.feio.android.omninotes
 MIN_SDK=16
 TARGET_SDK=28

omniNotes/build.gradle

@@ -160,12 +160,13 @@ dependencies {
     implementation ('com.jakewharton:butterknife:8.5.1'){
         exclude group: 'com.android.support'
     }
-    implementation('org.mnode.ical4j:ical4j:1.0.6') {
+    implementation('org.mnode.ical4j:ical4j:3.0.11') {
         exclude group: 'commons.io'
     }
     debugImplementation ('com.squareup.leakcanary:leakcanary-android:1.6.2') {
         exclude group: "com.android.support"
     }
+    implementation 'org.apache.commons:commons-lang3:3.9'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     implementation 'com.pnikosis:materialish-progress:1.5'

omniNotes/proguard-rules.txt

@@ -34,7 +34,10 @@
 -keep class it.feio.android.omninotes.db.DbHelper { *; }
 -keep class it.feio.android.omninotes.async.upgrade.UpgradeProcessor { *; }
 
-## ical4j also contains groovy code which is not used in android
+###############
+# ical4j
+
+# Groovy code which is not used in android
 -dontwarn groovy.**
 -dontwarn org.codehaus.groovy.**
 -dontwarn org.apache.commons.logging.**
@@ -43,7 +46,6 @@
 -dontnote com.google.vending.**
 -dontnote com.android.vending.licensing.**
 
-###################
 # Get rid of #can't find referenced method in library class java.lang.Object# warnings for clone() and finalize()
 # Warning: net.fortuna.ical4j.model.CalendarFactory: can't find referenced method 'void finalize()' in library class java.lang.Object
 # Warning: net.fortuna.ical4j.model.ContentBuilder: can't find referenced method 'java.lang.Object clone()' in library class java.lang.Object
@@ -57,6 +59,14 @@
 -keepnames interface ** { *; }
 -keepnames enum ** { *; }
 
+-dontwarn java.awt.**
+-dontwarn javax.security.**
+-dontwarn javax.cache.**
+-dontwarn com.sun.activation.**
+-dontwarn org.slf4j.impl.**
+-dontwarn javax.activation.ActivationDataFlavor
+-dontwarn java.beans.Beans
+
 ###############
 # Retrolambda
 -dontwarn java.lang.invoke.*

omniNotes/src/alpha/java/it.feio.android.omninotes.helpers/GeocodeProviderFactory.java

@@ -17,11 +17,6 @@
 
 package it.feio.android.omninotes.helpers;
 
-import android.content.Context;
-
-import io.nlopez.smartlocation.location.LocationProvider;
-
-
 public class GeocodeProviderFactory extends GeocodeProviderBaseFactory {
 
 }

omniNotes/src/alpha/java/it/feio/android/omninotes/utils/Constants.java

@@ -3,9 +3,9 @@
 
 public interface Constants extends ConstantsBase {
 
-	String TAG = "Omni Notes Alpha";
-	String EXTERNAL_STORAGE_FOLDER = "Omni Notes Alpha";
-	String PACKAGE = "it.feio.android.omninotes.alpha";
-	String PREFS_NAME = PACKAGE + "_preferences";
+  String TAG = "Omni Notes Alpha";
+  String EXTERNAL_STORAGE_FOLDER = "Omni Notes Alpha";
+  String PACKAGE = "it.feio.android.omninotes.alpha";
+  String PREFS_NAME = PACKAGE + "_preferences";
 
 }