← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~renatofilho/reminders-app/snappy-unity8 into lp:reminders-app

 

Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/reminders-app/snappy-unity8 into lp:reminders-app.

Commit message:
Make sure that the paths used to store notes is writable.
Created snap package.

Requested reviews:
  Ubuntu Notes app developers (notes-app-dev)

For more details, see:
https://code.launchpad.net/~renatofilho/reminders-app/snappy-unity8/+merge/312393
-- 
Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~renatofilho/reminders-app/snappy-unity8 into lp:reminders-app.
=== added directory 'setup'
=== added directory 'setup/gui'
=== added file 'setup/gui/icon.png'
Binary files setup/gui/icon.png	1970-01-01 00:00:00 +0000 and setup/gui/icon.png	2016-12-05 11:35:31 +0000 differ
=== added file 'setup/gui/ubuntu-notes-app.desktop'
--- setup/gui/ubuntu-notes-app.desktop	1970-01-01 00:00:00 +0000
+++ setup/gui/ubuntu-notes-app.desktop	2016-12-05 11:35:31 +0000
@@ -0,0 +1,97 @@
+[Desktop Entry]
+Name=Notes
+Name[am]=ማስታወሻዎች
+Name[ar]=ملاحظات
+Name[ast]=Notes
+Name[az]=Qeydlər
+Name[bem]=Utulembo
+Name[bg]=Бележки
+Name[br]=Notennoù
+Name[bs]=Bilješke
+Name[ca]=Notes
+Name[ca@valencia]=Notes
+Name[cs]=Poznámky
+Name[cy]=Nodiadau
+Name[da]=Noter
+Name[de]=Notizen
+Name[el]=Σημειώσεις
+Name[en_AU]=Notes
+Name[en_GB]=Notes
+Name[es]=Notas
+Name[eu]=Oharrak
+Name[fa]=یادداشت‌ها
+Name[fi]=Muistiinpanot
+Name[fo]=Viðmerkingar
+Name[fr]=Notes
+Name[fr_CA]=Notes
+Name[gd]=Nòtaichean
+Name[gl]=Notas
+Name[he]=פתקיות
+Name[hu]=Jegyzetek
+Name[id]=Catatan
+Name[is]=Minnispunktar
+Name[it]=Note
+Name[ja]=ノート
+Name[km]=ចំណាំ
+Name[ko]=쪽지
+Name[lv]=Piezīmes
+Name[ms]=Nota
+Name[my]=မှတ်စုများ
+Name[nb]=Notater
+Name[nl]=Notities
+Name[pa]=ਨੋਟ
+Name[pl]=Notatki
+Name[pt]=Notas
+Name[pt_BR]=Notas
+Name[ro]=Notițe
+Name[ru]=Заметки
+Name[sk]=Poznámky
+Name[sl]=Sporočilca
+Name[sq]=Shënimet
+Name[sr]=Белешке
+Name[st]=Dinoutu
+Name[sv]=Anteckningar
+Name[ta]=குறிப்புகள்
+Name[tr]=Notlar
+Name[ug]=ئىزاھ
+Name[uk]=Нотатки
+Name[zh_CN]=笔记
+Name[zh_TW]=記事
+Comment=Ubuntu Notes app, powered by Evernote
+Comment[am]=የ ኡቡንቱ ማስታወሻ መተግበሪያ በ ሁልጊዜ ማስታወሻ
+Comment[ast]=App Notes d'Ubuntu, basada n'Evernote
+Comment[br]=Arload Notennoù Ubuntu, kaset en-dro gant Evernote
+Comment[bs]=Aplikacija Ubuntu bilješke, pogonjena uz Evernote
+Comment[de]=Ubuntu-Notizenanwendung, von Evernote bereitgestellt
+Comment[el]=Εφαρμογή Σημειώσεις Ubuntu, από το Evernote
+Comment[en_AU]=Ubuntu Notes app, powered by Evernote
+Comment[en_GB]=Ubuntu Notes app, powered by Evernote
+Comment[es]=Ubuntu Notes, con Evernote
+Comment[fa]=کارهٔ یادداشت اوبونتو، قدرت‌گرفته از اورنوت
+Comment[fi]=Ubuntun muistiinpanosovellus, taustavoimana Evernote
+Comment[fo]=Ubuntu Notes appan, Evernoterikin
+Comment[fr]=Application Notes d'Ubuntu, fonctionnant avec Evernote
+Comment[fr_CA]=Appli Notes d'Ubuntu, propulsé par Evernote
+Comment[gd]=Aplacaid nòtaichean Ubuntu, le cumhachd Evernote
+Comment[gl]=Aplicativo de notas para Ubuntu, con tecnoloxía de Evernote
+Comment[hu]=Jegyzet alkalmazás Ubuntuhoz Evernote alapokon
+Comment[it]=App per le note di Ubuntu, basata su Evernote
+Comment[lv]=Ubuntu piezīmju lietotne, darbina Evernote
+Comment[nb]=Ubuntu notatprogram, drevet av Evernote
+Comment[nl]=Ubuntu Notes-app, geleverd door Evernote
+Comment[pl]=Aplikacja Ubuntu Notatki wspierająca Evernote
+Comment[pt]=Ubuntu Notes app, powered by Evernote
+Comment[sk]=Ubuntu aplikácia Poznámky, poháňaná Evernote
+Comment[sl]=Sporočilca Ubuntu s podporo Evernote
+Comment[sr]=Убунту Белешке, покреће Evernote
+Comment[sv]=Ubuntu Notes, drivet av Evernote
+Comment[tr]=Ubuntu Notlar uygulaması, Evernote desteğiyle
+Comment[uk]=Програма для роботи з нотатками Ubuntu з підтримкою Evernote
+Exec=reminders %u
+Icon=${SNAP}/meta/gui/icon.png
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true
+X-Ubuntu-Default-Department-ID=accessories
+X-Ubuntu-Splash-Show-Header=true
+X-Ubuntu-Splash-Color=#E5E3E5

=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== added file 'snap/ubuntu-notes-app.wrapper'
--- snap/ubuntu-notes-app.wrapper	1970-01-01 00:00:00 +0000
+++ snap/ubuntu-notes-app.wrapper	2016-12-05 11:35:31 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Disable the chromium sandbox to work around https://launchpad.net/bugs/1599234.
+# Rely on snapd’s security policy instead.
+export OXIDE_NO_SANDBOX=1
+
+exec $SNAP/usr/bin/reminders "$@"

=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-12-05 11:35:31 +0000
@@ -0,0 +1,58 @@
+name: ubuntu-notes-app
+version: 0.4
+summary: Notes application
+description: Note taking application powered by Evernote
+confinement: devmode  # use "strict" to enforce system access only via declared interfaces
+grade: devel
+
+apps:
+    ubuntu-notes-app:
+        command: desktop-launch $SNAP/bin/ubuntu-notes-app "$@"
+        plugs: [opengl, platform, unity7, unity8]
+
+plugs:
+    platform:
+        interface: content
+        content: ubuntu-app-platform1
+        target: ubuntu-app-platform
+        default-provider: ubuntu-app-platform
+
+parts:
+    ubuntu-notes-app:
+        plugin: cmake
+        configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
+        source: .
+        build-packages:
+            - cmake
+            - gettext
+            - intltool
+            - libboost-dev
+            - liboxideqt-qmlplugin
+            - libssl-dev
+            - pkg-config
+            - qt5-default
+            - qtdeclarative5-dev
+            - qtdeclarative5-dev-tools
+            - qtpim5-dev
+        stage-packages:
+            - qtdeclarative5-evernote0.1
+            - signon-plugin-oauth2
+        snap:
+            # ubuntu-notes-app
+            - usr/bin/reminders
+            - usr/bin/push-helper
+            - usr/share/accounts/applications/*
+            - usr/share/applications/*
+            - usr/share/locale
+            - usr/share/reminders/* 
+            # qtdeclarative5-evernote0.1
+            - usr/lib/*/qt5/qml/Evernote
+            # signon-plugin-oauth2
+            - usr/lib/*/signon
+        after: 
+            - desktop-ubuntu-app-platform
+    environment:
+        source: snap/
+        plugin: dump
+        organize:
+            ubuntu-notes-app.wrapper: bin/ubuntu-notes-app

=== modified file 'src/app/qml/Reminders.qml'
--- src/app/qml/Reminders.qml	2016-05-23 12:36:49 +0000
+++ src/app/qml/Reminders.qml	2016-12-05 11:35:31 +0000
@@ -225,7 +225,7 @@
 
         switch (accounts.count) {
         case 0:
-            PopupUtils.open(noAccountDialog, root);
+            PopupUtils.open(noAccountDialog);
             print("No account available. Please set up an account in System Settings.");
             break;
         case 1:

=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp	2016-04-29 07:47:14 +0000
+++ src/libqtevernote/notesstore.cpp	2016-12-05 11:35:31 +0000
@@ -72,7 +72,8 @@
 
     m_organizerAdapter = new OrganizerAdapter(this);
 
-    QDir storageDir(QStandardPaths::standardLocations(QStandardPaths::DataLocation).first());
+    QDir storageDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+    qCDebug(dcNotesStore) << "Notes storare dir" << storageDir;
     if (!storageDir.exists()) {
         qCDebug(dcNotesStore) << "Creating storage directory:" << storageDir.absolutePath();
         storageDir.mkpath(storageDir.absolutePath());
@@ -122,7 +123,7 @@
 
 QString NotesStore::storageLocation()
 {
-    return QStandardPaths::standardLocations(QStandardPaths::DataLocation).first() + "/" + m_username + "/";
+    return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/" + m_username + "/";
 }
 
 void NotesStore::userStoreConnected()


Follow ups