Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad29275 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Fix migration bug (and merge master branch)

parents 17d30812 9f978afd
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android {
        applicationId "it.niedermann.owncloud.notes"
        minSdkVersion 14
        targetSdkVersion 28
        versionCode 48
        versionName "1.0.0"
        versionCode 49
        versionName "1.0.1"
//        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
+3 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ import android.util.Log;
import android.widget.RemoteViews;
import android.widget.RemoteViewsService;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
import com.nextcloud.android.sso.helper.SingleAccountHelper;
import com.yydcdut.markdown.MarkdownProcessor;
import com.yydcdut.markdown.syntax.text.TextFactory;

@@ -57,6 +54,9 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
        long noteID = sp.getLong(SingleNoteWidget.WIDGET_KEY + appWidgetId, -1);

        if (noteID >= 0) {
            Log.v(TAG, "Fetch note for account " + SingleNoteWidget.ACCOUNT_ID_KEY + appWidgetId);
            Log.v(TAG, "Fetch note for account " + sp.getLong(SingleNoteWidget.ACCOUNT_ID_KEY + appWidgetId, -1));
            Log.v(TAG, "Fetch note with id " + noteID);
            note = db.getNote(sp.getLong(SingleNoteWidget.ACCOUNT_ID_KEY + appWidgetId, -1), noteID);

            if (note == null) {
+4 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
                    createNotesTable(db, table_notes);

                    db.execSQL(String.format("INSERT INTO %s(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) ", table_notes, key_id,            key_account_id,  key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag)
                            + String.format("SELECT %s,%s,%s, %s,%s,strftime('%%s',%s),%s,%s,%s,%s FROM %s", key_id, key_account_id, key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag, table_temp));
                            + String.format("SELECT %s,%s,%s,%s,%s,strftime('%%s',%s),%s,%s,%s,%s FROM %s", key_id, values.get(key_account_id), key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag, table_temp));
                    db.execSQL(String.format("DROP TABLE %s;", table_temp));

                    AppWidgetManager awm = AppWidgetManager.getInstance(context);
@@ -220,6 +220,8 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
                        }
                    }

                    notifyNotesChanged();

                    // Clean up no longer needed SharedPreferences
                    editor.remove("notes_last_etag");
                    editor.remove("notes_last_modified");
+28 −1
Original line number Diff line number Diff line
@@ -2,30 +2,37 @@
<resources>

    <string name="app_name">Notes</string>
    <string name="no_notes">No notes yet</string>
    <string name="label_all_notes">All notes</string>
    <string name="label_favorites">Favourites</string>
    <string name="action_create">New note</string>
    <string name="action_settings">Settings</string>
    <string name="action_trashbin">Deleted notes</string>
    <string name="action_search">Search</string>
    <string name="action_create_save">Save</string>
    <string name="simple_cancel">Cancel</string>
    <string name="simple_edit">Edit</string>
    <string name="action_edit_save">Save</string>
    <string name="action_edit_saving">Saving &#8230;</string>
    <string name="action_edit_saved">Saved</string>
    <string name="simple_about">About</string>
    <string name="simple_bold">Bold</string>
    <string name="simple_link">Link</string>
    <string name="simple_italic">Italic</string>
    <string name="action_select_note">Select note</string>
    <string name="action_note_deleted">Note deleted</string>
    <string name="action_note_restored">Note restored</string>
    <string name="action_undo">Undo</string>
    <string name="action_drawer_open">open navigation</string>
    <string name="action_drawer_close">close navigation</string>
    <string name="action_recent">Recent</string>
    <string name="action_uncategorized">Uncategorised</string>
    <string name="menu_delete">Delete</string>
    <string name="menu_change_category">Category</string>
    <string name="menu_favorite">Favourite</string>
    <string name="menu_preview">Preview</string>
    <string name="menu_share">Share</string>
    <string name="menu_about">About</string>

    <string name="change_category_title">Choose a category</string>

@@ -33,8 +40,17 @@
    <string name="listview_updated_yesterday">Yesterday</string>
    <string name="listview_updated_this_week">This week</string>
    <string name="listview_updated_this_month">This month</string>

    <!-- Settings -->
    <string name="settings_server_settings">Account</string>
    <string name="settings_url">Server address</string>
    <string name="settings_url_check_description">Shows whether the address can be pinged.</string>
    <string name="settings_url_warn_http">WARNING: \"http\" is unsafe. Please use \"https\".</string>
    <string name="settings_username">Username</string>
    <string name="settings_password">Password</string>
    <string name="settings_password_unchanged">Password (not changed)</string>
    <string name="settings_password_check_description">Displays whether the credentials are correct.</string>
    <string name="settings_submit">Connect</string>
    <string name="settings_submitting">Connecting &#8230;</string>
    <string name="settings_note_mode">Display mode for notes</string>
    <string name="settings_theme_title">Dark theme</string>
    <string name="settings_font_title">Monospace font</string>
@@ -48,16 +64,26 @@
    <string name="settings_cert_reset_toast">All custom certificates have been cleared</string>

    <!-- Certificates -->
    <string name="certificate_notification_connection_security">Notes - Connection security</string>
    <string name="trust_certificate_unknown_certificate_found">Notes has encountered an unknown certificate. Do you want to trust it?</string>

    <!-- Network -->
    <string name="network_connecting">Connecting</string>
    <string name="network_connected">Connected</string>
    <string name="network_disconnected">No network available</string>

    <!-- Error -->
    <string name="error_sync">Synchronisation failed: %1$s</string>
    <string name="error_invalid_login">Invalid login: %1$s</string>
    <string name="error_json">is the Notes app activated on the server?</string>
    <string name="error_io">server connection is broken</string>
    <string name="error_no_network">no network connection</string>
    <string name="error_server">URL/Server has errors</string>
    <string name="error_url_malformed">Wrong server address</string>
    <string name="error_username_password_invalid">Wrong username or password</string>

    <!-- Snackbar Actions -->
    <string name="snackbar_settings">Settings</string>

    <!-- About -->
    <string name="about_version_title">Version</string>
@@ -98,6 +124,7 @@
    <string name="shortcut_create_long">Create a new note</string>

    <string name="pref_value_theme_light">Light</string>
    <string name="pref_value_theme_dark">Dark</string>
    <!-- Array: note modes -->
    <string-array name="noteMode_entries">
        <item>Open in edit mode</item>
+8 −0
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@
    <string name="listview_updated_today">Avui</string>
    <string name="listview_updated_yesterday">Ahir</string>
    <string name="listview_updated_this_week">Aquesta setmana</string>
    <string name="listview_updated_last_week">La setmana passada</string>
    <string name="listview_updated_this_month">Aquest mes</string>
    <string name="listview_updated_last_month">El mes passat</string>

    <!-- Settings -->
    <string name="settings_note_mode">Mode de visualització per les notes</string>
@@ -109,6 +111,12 @@
    <string name="copied_to_clipboard">S\'ha copiat al porta-retalls</string>
    <string name="pin_to_homescreen">Fixa-ho a la pantalla d\'inici</string>
    <string name="note_has_been_deleted">S\'ha suprimit aquesta nota</string>
    <string name="fallback_weblogin_text">Tornar a l\'antic mètode d\'inici de sessió</string>
    <string name="fallback_weblogin_back">Enrere</string>
    <string name="sso_announcment_title">Entrada simple</string>
    <string name="sso_announcment_message">L\'aplicació Notes començarà amb la propera versió principal amb la gran característica de Single-Sign-On-On-Nextcloud. D’aquesta manera augmentareu la seguretat, la fiabilitat i el confort. Assegureu-vos que heu instal·lat almenys la versió 3.8.0 de l\'aplicació de fitxers i seleccioneu a la primera obertura el mateix compte que ja esteu utilitzant.</string>
    <string name="sso_announcment_more_info">Més informació</string>
    <string name="sso_announcment_understood">Entès</string>

    <!-- Array: note modes -->
    <string-array name="noteMode_entries">
Loading