Merge branch 'hotfix/5.4.4'

federicoiosue · Mar 2, 2018 · 748654b · 748654b
2 parents 42a02dd + ca86e64
commit 748654b
Show file tree

Hide file tree

Showing 23 changed files with 62 additions and 17 deletions.
diff --git a/fastlane/en-US/changelogs/237.txt b/fastlane/en-US/changelogs/237.txt
@@ -0,0 +1,4 @@
+5.4.2
+☆ Updated translations
+☆ Widget showing two lines of content and top-aligned
+✓ Bugfixes
diff --git a/fastlane/en-US/changelogs/238.txt b/fastlane/en-US/changelogs/238.txt
@@ -0,0 +1,4 @@
+5.4.3
+★ Added Basque language
+☆ Updated translations
+✓ Reminders are not fired again after notes deletion
diff --git a/fastlane/en-US/description.txt b/fastlane/en-US/description.txt
@@ -0,0 +1,25 @@
+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
+
+Help to keep translations updated is always welcome, if you want give a hand checkout the translation project at Crowdin.
+
+Features:
+★ Material Design interface Basic add, modify, archive, trash and delete notes actions
+★ Share, merge and search notes
+★ Image, audio and generic file attachments
+★ Manage your notes using tags and categories
+★ To-do list
+★ Sketch-note mode
+★ Notes shortcut on home screen
+★ Export/import notes to backup
+★ Google Now integration: just tell "write a note" followed by the content
+★ Multiple widgets, DashClock extension, Android 4.2 lockscreen compatibility
+★ Multilanguage: 30+ languages supported: https://crowdin.com/project/omni-notes
+
+Further developments will include:
+☆ Notes sychronization
+☆ Web interface to manage notes
+☆ You can find a complete changelog inside the application settings menu!
+
+If you need some help on how to use the application you'll find everything you need in the Help Online section
diff --git a/fastlane/en-US/name.txt b/fastlane/en-US/name.txt
@@ -0,0 +1 @@
+Omni Notes
diff --git a/fastlane/en-US/phoneScreenshots/02.png b/fastlane/en-US/phoneScreenshots/02.png
diff --git a/fastlane/en-US/phoneScreenshots/03.png b/fastlane/en-US/phoneScreenshots/03.png
diff --git a/fastlane/en-US/phoneScreenshots/04.png b/fastlane/en-US/phoneScreenshots/04.png
diff --git a/fastlane/en-US/phoneScreenshots/05.png b/fastlane/en-US/phoneScreenshots/05.png
diff --git a/fastlane/en-US/phoneScreenshots/06.png b/fastlane/en-US/phoneScreenshots/06.png
diff --git a/fastlane/en-US/phoneScreenshots/07.png b/fastlane/en-US/phoneScreenshots/07.png
diff --git a/fastlane/en-US/phoneScreenshots/08.png b/fastlane/en-US/phoneScreenshots/08.png
diff --git a/fastlane/en-US/phoneScreenshots/09.png b/fastlane/en-US/phoneScreenshots/09.png
diff --git a/fastlane/en-US/phoneScreenshots/10.png b/fastlane/en-US/phoneScreenshots/10.png
diff --git a/fastlane/en-US/phoneScreenshots/11.png b/fastlane/en-US/phoneScreenshots/11.png
diff --git a/fastlane/en-US/summary.txt b/fastlane/en-US/summary.txt
@@ -0,0 +1 @@
+Note taking open-source application aimed to have both a simple interface but keeping smart behavior
diff --git a/gradle.properties b/gradle.properties
@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION_NAME=5.4.3
-VERSION_CODE=238
+VERSION_NAME=5.4.4
+VERSION_CODE=239
 PACKAGE=it.feio.android.omninotes
 
 MIN_SDK=16

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java
@@ -71,6 +71,7 @@ public class MainActivity extends BaseActivity implements OnDateSetListener, OnT
     public final String FRAGMENT_LIST_TAG = "fragment_list";
     public final String FRAGMENT_DETAIL_TAG = "fragment_detail";
     public final String FRAGMENT_SKETCH_TAG = "fragment_sketch";
+    private static boolean isPasswordAccepted = false;
     private FragmentManager mFragmentManager;
     public Uri sketchUri;
 
@@ -83,8 +84,10 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
 		EventBus.getDefault().register(this);
 
-        // This method starts the bootstrap chain.
-        checkPassword();
+		if (!isPasswordAccepted) {
+            // This method starts the bootstrap chain.
+            checkPassword();
+        }
 
         initUI();
 
@@ -132,8 +135,10 @@ public void onEvent(PasswordRemovedEvent passwordRemovedEvent) {
 
 
 	private void init() {
-        mFragmentManager = getSupportFragmentManager();
+        isPasswordAccepted = true;
 
+        mFragmentManager = getSupportFragmentManager();
+
         NavigationDrawerFragment mNavigationDrawerFragment = (NavigationDrawerFragment) mFragmentManager
                 .findFragmentById(R.id.navigation_drawer);
         if (mNavigationDrawerFragment == null) {

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/db/DbHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/db/DbHelper.java
@@ -128,8 +128,8 @@ public SQLiteDatabase getDatabase() {
 	public SQLiteDatabase getDatabase(boolean forceWritable) {
 		try {
 			SQLiteDatabase db = getReadableDatabase();
-			if (forceWritable && db.isReadOnly()) {
-				throw new SQLiteReadOnlyDatabaseException("Required writable database, obtained read-only");
+			if (db.isReadOnly() && forceWritable) {
+				db = getWritableDatabase();
 			}
 			return db;
 		} catch (IllegalStateException e) {
@@ -150,7 +150,6 @@ public void onCreate(SQLiteDatabase db) {
     }
 
 
-    // Upgrading database
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
 		this.db = db;

diff --git a/omniNotes/src/main/res/raw/changelog.xml b/omniNotes/src/main/res/raw/changelog.xml
@@ -17,6 +17,12 @@
   -->
 <changelog bulletedList="true">
 
+    <changelogversion versionName="5.4.4" changeDate="Mar 02, 2018">
+        <changelogtext>[i]Improved![/i] Updated translations</changelogtext>
+        <changelogtext>[i]Improved![/i] Added full description and screenshots for F-Droid users</changelogtext>
+        <changelogtext>[u]Fix[/u] When screen is rotated password will be asked no more after first time now</changelogtext>
+    </changelogversion>
+
     <changelogversion versionName="5.4.3" changeDate="Jan 29, 2018">
         <changelogtext>[b]New![/b] Added Basque language</changelogtext>
         <changelogtext>[i]Improved![/i] Updated translations</changelogtext>

diff --git a/omniNotes/src/main/res/values-el-rGR/strings.xml b/omniNotes/src/main/res/values-el-rGR/strings.xml
@@ -107,7 +107,7 @@
   <string name="delete_category_confirmation">Αυτή η κατηγορία χρησιμοποιείται από ορισμένες σημειώσεις. \nΕγκρίνετε απο-κατηγοριοποίηση και διαγραφή κατηγορίας;</string>
   <string name="discard">Απόρριψη</string>
   <string name="remove_category">Αφαίρεση κατηγορίας</string>
-  <string name="no_tags_created">No tags available yet\nCreate them by writing hashtags into your notes</string>
+  <string name="no_tags_created">Δεν υπάρχει ακόμη ετικέτα\nΔημιουργήστε με το σύμβολο δίεσης μέσα στις σημειώσεις</string>
   <string name="no_categories_created">Δεν έχουν ακόμη δημιουργηθεί κατηγορίες ακόμη</string>
   <string name="notes_category_removed">Η κατηγορία αφαιρέθηκε από τις σημειώσεις</string>
   <string name="notes_categorized_as">Σημειώσεις κατηγοριοποιημένες ως</string>
@@ -156,7 +156,7 @@
   <string name="widget_list_description">Γραφικό οθόνης κυλιόμενης λίστας με κουμπιά</string>
   <string name="notes">σημειώσεις</string>
   <string name="show_thumbnails">Εμφάνιση μικρογραφιών του συνημμένου</string>
-  <string name="show_timestamps">Show timestamps</string>
+  <string name="show_timestamps">Εμφάνιση χρονικής σήμανσης</string>
   <string name="choose_action">Επιλέξτε ενέργεια</string>
   <string name="edit">Επεξεργασία</string>
   <string name="reminders">υπενθυμίσεις</string>

diff --git a/omniNotes/src/main/res/values-eu-rES/arrays.xml b/omniNotes/src/main/res/values-eu-rES/arrays.xml
@@ -31,15 +31,15 @@
     <item>Oroigarriaren data</item>
   </string-array>
   <string-array name="checked_items_behavior">
-    <item>Mantendu kokalekua</item>
+    <item>Mantendu posizioa</item>
     <item>Mugitu zerrendaren amaierara</item>
     <item>Mugitu markatu gabeko elementuen amaierara</item>
   </string-array>
   <string-array name="colors_app">
     <item>Desgaituta</item>
     <item>Marratxoa besterik ez</item>
     <item>Ohar-zerrenda bakarrik</item>
-    <item>Eginda</item>
+    <item>Osoa</item>
   </string-array>
   <string-array name="colors_widget">
     <item>Desgaituta</item>

diff --git a/omniNotes/src/main/res/values-eu-rES/strings.xml b/omniNotes/src/main/res/values-eu-rES/strings.xml
@@ -198,7 +198,7 @@
   <string name="permission_coarse_location">Kokapena atzitzeko baimena behar da kokalekuaren informazioa oharretara gehitu ahal izateko</string>
   <string name="permission_not_granted">Baimena ukatuta</string>
   <string name="checklist">Egiaztapen-zerrenda</string>
-  <string name="text_note">Testu oharra</string>
+  <string name="text_note">Testu-oharra</string>
   <string name="photo">Argazkia</string>
   <!-- Settings -->
   <string name="dashclock_description">Erakutsi Omni Notes aplikazioko estatistika batzuk eta iraungitze datak</string>
@@ -322,11 +322,11 @@
   <string name="settings_prettified_dates_summary_on">Datak formatu sinpleagoan erakusten dira</string>
   <string name="settings_prettified_dates_summary_off">Datak formatu xehetsuagoan erakusten dira</string>
   <string name="settings_screen_privacy">Pribatutasuna</string>
-  <string name="settings_error_reporting">Erroren berri ematea</string>
+  <string name="settings_error_reporting">Erroreen berri-ematea</string>
   <string name="settings_error_reporting_summary_on">Aplikazioa kraskatzen denean garatzaileari jakinaraziko zaio zu laguntzeko</string>
   <string name="settings_error_reporting_summary_off">Ez da kraskatze txostenik bidaliko. Ez kexatu zerbait gaizki badabil gero!</string>
   <string name="settings_send_analytics">Partekatu datu anonimoak</string>
-  <string name="settings_send_analytics_summary">Lagundu garatzailea pribatua ez den informazioa bidaliz, gailuaren modeloa, hizkuntza, maiz erabilitako aplikazioaren ezaugarriak. Datu hauek kode irekiko aplikazioa hobetzeko besterik ez dira erabiltzen.</string>
+  <string name="settings_send_analytics_summary">Lagundu garatzailea kontuzkoa ez den informazioa bidaliz, adibidez gailuaren modeloa, hizkuntza, maiz erabilitako aplikazioaren ezaugarriak. Datu hauek kode irekiko aplikazioa hobetzeko besterik ez dira erabiltzen.</string>
   <string name="settings_statistics">Estatistikak</string>
   <!-- Stats -->
   <string name="stats_total_notes">Oharrak guztira</string>
@@ -359,7 +359,7 @@
   <string name="tour_listactivity_actions_title">Ekintzak</string>
   <string name="tour_listactivity_actions_detail">Sortu ohar berriak, ordenatu itzazu, sartu hobespenetan</string>
   <string name="tour_listactivity_home_title">Nabigatu</string>
-  <string name="tour_listactivity_home_detail">Nabigazio menuak oharretatik iragazki eta etiketen bidez mugitzea ahalbidetzen dizu</string>
+  <string name="tour_listactivity_home_detail">Nabigazio menuak oharretatik mugitzea ahalbidetzen dizu iragazki eta etiketen bidez</string>
   <string name="tour_listactivity_tag_title">Etiketak</string>
   <string name="tour_listactivity_tag_detail">Gehitu kolorezko etiketak oharrak berehala aurkitzeko</string>
   <string name="tour_detailactivity_attachment_title">Hobetu</string>

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -17,7 +17,7 @@
 
 sonar.projectKey=omni-notes
 sonar.projectName=Omni Notes
-sonar.projectVersion=5.4.3
+sonar.projectVersion=5.4.4
 
 sonar.sources=omniNotes/src/main/java
 sonar.language=java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Note taking open-source application aimed to have both a simple interface but keeping smart behavior