refactor share-plugin settings to be part of the plguin completely

elementary-community · Feb 23, 2017 · ce70163 · ce70163
1 parent 4d34675
commit ce70163
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 114 deletions.
diff --git a/plugins/share/Instapaper/CMakeLists.txt b/plugins/share/Instapaper/CMakeLists.txt
@@ -37,4 +37,5 @@ add_dependencies(${NAME} ${UI_NAME} ${DAEMON_NAME})
 
 install(TARGETS ${NAME} DESTINATION ${PKGLIBDIR}/pluginsShare)
 install(FILES ${NAME}.plugin DESTINATION ${PKGLIBDIR}/pluginsShare)
+add_schema ("org.gnome.feedreader.share.instapaper.gschema.xml")
 
diff --git a/plugins/share/Instapaper/InstapaperAPI.vala b/plugins/share/Instapaper/InstapaperAPI.vala
@@ -128,9 +128,9 @@ public class FeedReader.InstaAPI : ShareAccountInterface, Peas.ExtensionBase {
         settings.set_string("username", username);
         settings.set_string("user-id", userID);
 
-        var array = Settings.share().get_strv("instapaper");
+        var array = Settings.share("instapaper").get_strv("account-ids");
         array += id;
-		Settings.share().set_strv("instapaper", array);
+		Settings.share("instapaper").set_strv("account-ids", array);
 
         var pwSchema = new Secret.Schema ("org.gnome.feedreader.instapaper.password", Secret.SchemaFlags.NONE,
                                         "userID", Secret.SchemaAttributeType.STRING);
@@ -223,15 +223,15 @@ public class FeedReader.InstaAPI : ShareAccountInterface, Peas.ExtensionBase {
 			settings.reset(key);
 		}
 
-        var array = Settings.share().get_strv("instapaper");
+        var array = Settings.share("instapaper").get_strv("account-ids");
 
     	string[] array2 = {};
     	foreach(string i in array)
 		{
 			if(i != id)
 				array2 += i;
 		}
-		Settings.share().set_strv("instapaper", array2);
+		Settings.share("instapaper").set_strv("account-ids", array2);
 		deleteAccount(id);
 
         return true;

diff --git a/plugins/share/Instapaper/InstapaperSetup.vala b/plugins/share/Instapaper/InstapaperSetup.vala
@@ -77,7 +77,7 @@ public class FeedReader.InstapaperSetup : ServiceSetup {
 		{
 			m_spinner.start();
 			m_iconStack.set_visible_child_name("spinner");
-			string id = Share.generateNewID();
+			string id = Share.get_default().generateNewID();
 			string username = m_userEntry.get_text();
 			string password = m_passEntry.get_text();
 

diff --git a/plugins/share/Instapaper/org.gnome.feedreader.share.instapaper.gschema.xml b/plugins/share/Instapaper/org.gnome.feedreader.share.instapaper.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist>
+    <schema id="org.gnome.feedreader.share.instapaper" path="/org/gnome/feedreader/share/instapaper/" gettext-domain="feedreader">
+
+	<key name="account-ids" type="as">
+            <default>[]</default>
+            <summary>instapaper accounts</summary>
+            <description>
+                all the instapaper account ids
+            </description>
+        </key>
+
+    </schema>
+</schemalist>
diff --git a/plugins/share/Pocket/CMakeLists.txt b/plugins/share/Pocket/CMakeLists.txt
@@ -43,4 +43,5 @@ add_dependencies(${NAME} ${UI_NAME} ${DAEMON_NAME})
 
 install(TARGETS ${NAME} DESTINATION ${PKGLIBDIR}/pluginsShare)
 install(FILES ${NAME}.plugin DESTINATION ${PKGLIBDIR}/pluginsShare)
+add_schema ("org.gnome.feedreader.share.pocket.gschema.xml")
 
diff --git a/plugins/share/Pocket/PocketAPI.vala b/plugins/share/Pocket/PocketAPI.vala
@@ -112,9 +112,9 @@ public class FeedReader.PocketAPI : ShareAccountInterface, Peas.ExtensionBase {
         settings.set_string("oauth-access-token", accessToken);
         settings.set_string("username", user);
 
-        var array = Settings.share().get_strv("pocket");
+        var array = Settings.share("pocket").get_strv("account-ids");
         array += id;
-		Settings.share().set_strv("pocket", array);
+		Settings.share("pocket").set_strv("account-ids", array);
 
         return true;
     }
@@ -194,15 +194,15 @@ public class FeedReader.PocketAPI : ShareAccountInterface, Peas.ExtensionBase {
 			settings.reset(key);
 		}
 
-        var array = Settings.share().get_strv("pocket");
+        var array = Settings.share("pocket").get_strv("account-ids");
     	string[] array2 = {};
 
     	foreach(string i in array)
 		{
 			if(i != id)
 				array2 += i;
 		}
-		Settings.share().set_strv("pocket", array2);
+		Settings.share("pocket").set_strv("account-ids", array2);
 		deleteAccount(id);
 
         return true;

diff --git a/plugins/share/Pocket/PocketSetup.vala b/plugins/share/Pocket/PocketSetup.vala
@@ -34,7 +34,7 @@ public class FeedReader.PocketSetup : ServiceSetup {
 
 	public override void login()
 	{
-		string id = Share.generateNewID();
+		string id = Share.get_default().generateNewID();
 		string requestToken = m_api.getRequestToken();
 		string url = m_api.getURL(requestToken);
 		m_spinner.start();

diff --git a/plugins/share/Pocket/org.gnome.feedreader.share.pocket.gschema.xml b/plugins/share/Pocket/org.gnome.feedreader.share.pocket.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist>
+    <schema id="org.gnome.feedreader.share.pocket" path="/org/gnome/feedreader/share/pocket/" gettext-domain="feedreader">
+
+	<key name="account-ids" type="as">
+            <default>[]</default>
+            <summary>pocket accounts</summary>
+            <description>
+                all the pocket account ids
+            </description>
+        </key>
+
+    </schema>
+</schemalist>
diff --git a/plugins/share/Telegram/CMakeLists.txt b/plugins/share/Telegram/CMakeLists.txt
@@ -36,4 +36,5 @@ add_dependencies(${NAME} ${UI_NAME} ${DAEMON_NAME})
 
 install(TARGETS ${NAME} DESTINATION ${PKGLIBDIR}/pluginsShare)
 install(FILES ${NAME}.plugin DESTINATION ${PKGLIBDIR}/pluginsShare)
+add_schema ("org.gnome.feedreader.share.telegram.gschema.xml")
 
diff --git a/plugins/share/Telegram/Telegram.vala b/plugins/share/Telegram/Telegram.vala
@@ -20,9 +20,9 @@ public class FeedReader.Telegram : ShareAccountInterface, Peas.ExtensionBase {
 
 	public bool addTelegram(string id, string username)
 	{
-        	var settings = new GLib.Settings.with_path("org.gnome.feedreader.share.account", "/org/gnome/feedreader/share/telegram/%s/".printf(id));
+        var settings = new GLib.Settings.with_path("org.gnome.feedreader.share.account", "/org/gnome/feedreader/share/telegram/%s/".printf(id));
 		settings.set_string("username", username);
-		var array = Settings.share().get_strv("telegram");
+		var array = Settings.share("telegram").get_strv("account-ids");
 		foreach(string i in array)
 		{
 			if(i == id)
@@ -31,8 +31,9 @@ public class FeedReader.Telegram : ShareAccountInterface, Peas.ExtensionBase {
 				return false;
 			}
 		}
-        	array += id;
-		Settings.share().set_strv("telegram", array);
+
+        array += id;
+		Settings.share("telegram").set_strv("account-ids", array);
 
 		return true;
 	}
@@ -62,29 +63,29 @@ public class FeedReader.Telegram : ShareAccountInterface, Peas.ExtensionBase {
 	{
 		Logger.debug(@"Telegram.remove($id)");
 		var settings = new GLib.Settings.with_path("org.gnome.feedreader.share.account", "/org/gnome/feedreader/share/telegram/%s/".printf(id));
-    		var keys = settings.list_keys();
+    	var keys = settings.list_keys();
 		foreach(string key in keys)
 		{
 			settings.reset(key);
 		}
 
-        	var array = Settings.share().get_strv("telegram");
-    		string[] array2 = {};
+        var array = Settings.share("telegram").get_strv("account-ids");
+    	string[] array2 = {};
 
-    		foreach(string i in array)
+    	foreach(string i in array)
 		{
 			if(i != id)
 				array2 += i;
 		}
-		Settings.share().set_strv("telegram", array2);
+		Settings.share("telegram").set_strv("account-ids", array2);
 		deleteAccount(id);
 		return true;
 	}
 
 	public string getIconName()
-    	{
-        	return "feed-share-telegram";
-    	}
+    {
+        return "feed-share-telegram";
+    }
 
 	public string getUsername(string id)
 	{
@@ -97,29 +98,29 @@ public class FeedReader.Telegram : ShareAccountInterface, Peas.ExtensionBase {
 	}
 
 	public bool useSystemAccounts()
-    	{
-        	return false;
-    	}
+    {
+        return false;
+    }
 
 	public string pluginID()
-    	{
-        	return "telegram";
-    	}
+    {
+        return "telegram";
+    }
 
 	public string pluginName()
 	{
 		return _("Telegram");
 	}
 
 	public ServiceSetup? newSetup_withID(string id, string username)
-    	{
-        	return new TelegramSetup(id, this, username);
-    	}
-
-    	public ServiceSetup? newSetup()
-    	{
-        	return new TelegramSetup(null, this);
-    	}
+    {
+    	return new TelegramSetup(id, this, username);
+    }
+
+    public ServiceSetup? newSetup()
+	{
+    	return new TelegramSetup(null, this);
+	}
 
 	public ServiceSetup? newSystemAccount(string id, string username)
 	{

diff --git a/plugins/share/Telegram/TelegramForm.vala b/plugins/share/Telegram/TelegramForm.vala
@@ -16,7 +16,6 @@
 
 public class FeedReader.TelegramForm : ShareForm {
 
-	private Gtk.Entry m_entry;
 	private Gtk.TextView m_textView;
 
 	public TelegramForm()

diff --git a/plugins/share/Telegram/TelegramSetup.vala b/plugins/share/Telegram/TelegramSetup.vala
@@ -24,7 +24,7 @@ public class FeedReader.TelegramSetup : ServiceSetup {
 			loggedIN = true;
 
 		base("Telegram", "feed-share-telegram", loggedIN, username);
-		
+
 		m_tg = tg;
 		//no login, so change the labels
 		m_login_button.set_label(_("Add"));
@@ -37,7 +37,7 @@ public class FeedReader.TelegramSetup : ServiceSetup {
 
 	public override void login()
 	{
-		showInfoBar(_("Telegram needs to be installed on your system!."));
+		showInfoBar(_("Telegram needs to be installed on your system."));
 		//use static id to determin if already added
 		string id = "X-URL-SCHEME-TELEGRAM";
 		string username = m_tg.getUsername(id);

diff --git a/plugins/share/Telegram/org.gnome.feedreader.share.telegram.gschema.xml b/plugins/share/Telegram/org.gnome.feedreader.share.telegram.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist>
+    <schema id="org.gnome.feedreader.share.telegram" path="/org/gnome/feedreader/share/telegram/" gettext-domain="feedreader">
+
+	<key name="account-ids" type="as">
+            <default>[]</default>
+            <summary>Telegram accounts</summary>
+            <description>
+                all the telegram account ids
+            </description>
+        </key>
+
+    </schema>
+</schemalist>
diff --git a/plugins/share/Twitter/CMakeLists.txt b/plugins/share/Twitter/CMakeLists.txt
@@ -38,4 +38,5 @@ add_dependencies(${NAME} ${UI_NAME} ${DAEMON_NAME})
 
 install(TARGETS ${NAME} DESTINATION ${PKGLIBDIR}/pluginsShare)
 install(FILES ${NAME}.plugin DESTINATION ${PKGLIBDIR}/pluginsShare)
+add_schema ("org.gnome.feedreader.share.twitter.gschema.xml")
 
diff --git a/plugins/share/Twitter/TwitterAPI.vala b/plugins/share/Twitter/TwitterAPI.vala
@@ -116,9 +116,9 @@ public class FeedReader.TwitterAPI : ShareAccountInterface, Peas.ExtensionBase {
 
 
 
-        var array = Settings.share().get_strv("twitter");
+        var array = Settings.share("twitter").get_strv("account-ids");
         array += id;
-		Settings.share().set_strv("twitter", array);
+		Settings.share("twitter").set_strv("account-ids", array);
 
         return true;
     }
@@ -165,15 +165,15 @@ public class FeedReader.TwitterAPI : ShareAccountInterface, Peas.ExtensionBase {
 			settings.reset(key);
 		}
 
-        var array = Settings.share().get_strv("twitter");
+        var array = Settings.share("twitter").get_strv("account-ids");
     	string[] array2 = {};
 
     	foreach(string i in array)
 		{
 			if(i != id)
 				array2 += i;
 		}
-		Settings.share().set_strv("twitter", array2);
+		Settings.share("twitter").set_strv("account-ids", array2);
 		deleteAccount(id);
 
         return true;
@@ -250,7 +250,7 @@ public class FeedReader.TwitterAPI : ShareAccountInterface, Peas.ExtensionBase {
 		if(m_urlLength > 0)
 			return m_urlLength;
 
-        var array = Settings.share().get_strv("twitter");
+        var array = Settings.share("twitter").get_strv("account-ids");
 		string id = array[0];
 
 		var settings = new GLib.Settings.with_path("org.gnome.feedreader.share.account", "/org/gnome/feedreader/share/twitter/%s/".printf(id));

diff --git a/plugins/share/Twitter/TwitterSetup.vala b/plugins/share/Twitter/TwitterSetup.vala
@@ -34,7 +34,7 @@ public class FeedReader.TwitterSetup : ServiceSetup {
 
 	public override void login()
 	{
-		string id = Share.generateNewID();
+		string id = Share.get_default().generateNewID();
 		string requestToken = m_api.getRequestToken();
 		string url = m_api.getURL(requestToken);
 		m_spinner.start();

diff --git a/plugins/share/Twitter/org.gnome.feedreader.share.twitter.gschema.xml b/plugins/share/Twitter/org.gnome.feedreader.share.twitter.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist>
+    <schema id="org.gnome.feedreader.share.twitter" path="/org/gnome/feedreader/share/twitter/" gettext-domain="feedreader">
+
+	<key name="account-ids" type="as">
+            <default>[]</default>
+            <summary>twitter accounts</summary>
+            <description>
+                all the twitter account ids
+            </description>
+        </key>
+
+    </schema>
+</schemalist>
diff --git a/plugins/share/Wallabag/CMakeLists.txt b/plugins/share/Wallabag/CMakeLists.txt
@@ -37,4 +37,5 @@ add_dependencies(${NAME} ${UI_NAME} ${DAEMON_NAME})
 
 install(TARGETS ${NAME} DESTINATION ${PKGLIBDIR}/pluginsShare)
 install(FILES ${NAME}.plugin DESTINATION ${PKGLIBDIR}/pluginsShare)
+add_schema ("org.gnome.feedreader.share.wallabag.gschema.xml")
 
diff --git a/plugins/share/Wallabag/WallabagAPI.vala b/plugins/share/Wallabag/WallabagAPI.vala
@@ -95,7 +95,7 @@ public class FeedReader.WallabagAPI : ShareAccountInterface, Peas.ExtensionBase
 		settings.set_string("client-secret", clientSecret);
 
 
-        var array = Settings.share().get_strv("wallabag");
+        var array = Settings.share("wallabag").get_strv("wallabag");
 		foreach(string i in array)
 		{
 			if(i == id)
@@ -105,7 +105,7 @@ public class FeedReader.WallabagAPI : ShareAccountInterface, Peas.ExtensionBase
 			}
 		}
         array += id;
-		Settings.share().set_strv("wallabag", array);
+		Settings.share("wallabag").set_strv("wallabag", array);
 
 
 		var pwSchema = new Secret.Schema ("org.gnome.feedreader.wallabag.password", Secret.SchemaFlags.NONE,
@@ -180,15 +180,15 @@ public class FeedReader.WallabagAPI : ShareAccountInterface, Peas.ExtensionBase
 			settings.reset(key);
 		}
 
-        var array = Settings.share().get_strv("wallabag");
+        var array = Settings.share("wallabag").get_strv("wallabag");
     	string[] array2 = {};
 
     	foreach(string i in array)
 		{
 			if(i != id)
 				array2 += i;
 		}
-		Settings.share().set_strv("wallabag", array2);
+		Settings.share("wallabag").set_strv("wallabag", array2);
 		deleteAccount(id);
 
         return true;

diff --git a/plugins/share/Wallabag/WallabagSetup.vala b/plugins/share/Wallabag/WallabagSetup.vala
@@ -111,7 +111,7 @@ public class FeedReader.WallabagSetup : ServiceSetup {
 	{
 		if(m_login_revealer.get_child_revealed())
 		{
-			string id = Share.generateNewID();
+			string id = Share.get_default().generateNewID();
 			string username = m_userEntry.get_text();
 			string password = m_passEntry.get_text();
 			string clientID = m_idEntry.get_text();