Differential D7993 Diff 32929 src/org/kde/kdeconnect/Plugins/SystemvolumePlugin/SystemvolumePlugin.java

Changeset View

Standalone View

src/org/kde/kdeconnect/Plugins/SystemvolumePlugin/SystemvolumePlugin.java

This file was added.

1		/*
2		* Copyright 2018 Nicolas Fella <nicolas.fella@gmx.de>
3		*
4		* This program is free software; you can redistribute it and/or
5		* modify it under the terms of the GNU General Public License as
6		* published by the Free Software Foundation; either version 2 of
7		* the License or (at your option) version 3 or any later version
8		* accepted by the membership of KDE e.V. (or its successor approved
9		* by the membership of KDE e.V.), which shall act as a proxy
10		* defined in Section 14 of version 3 of the license.
11		*
12		* This program is distributed in the hope that it will be useful,
13		* but WITHOUT ANY WARRANTY; without even the implied warranty of
14		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15		* GNU General Public License for more details.
16		*
17		* You should have received a copy of the GNU General Public License
18		* along with this program. If not, see <http://www.gnu.org/licenses/>.
19		*/
20
21		package org.kde.kdeconnect.Plugins.SystemvolumePlugin;
22
23		import org.json.JSONArray;
24		import org.json.JSONException;
25		import org.json.JSONObject;
26		import org.kde.kdeconnect.NetworkPacket;
27		import org.kde.kdeconnect.Plugins.Plugin;
28		import org.kde.kdeconnect_tp.R;
29
30		import java.util.ArrayList;
31		import java.util.Collection;
32		import java.util.HashMap;
33
34
35		public class SystemvolumePlugin extends Plugin {
36
37		private final static String PACKET_TYPE_SYSTEMVOLUME = "kdeconnect.systemvolume";
38
	albertvakaUnsubmitted Not Done Since the packets you send and the packets you receive are not symmetrical (you receive packets that have a 'sinkList' but you send packets that have, for example a 'name' and 'volume', and they are never interchangeable), I think we should split the type in two (like it is done in other asymmetrical plugins). albertvaka: Since the packets you send and the packets you receive are not symmetrical (you receive packets…
39		public interface SinkListener {
40		void sinksChanged();
	mtijinkUnsubmitted Not Done Did you split this into remote/local requests? Because we can't control the Android volume yet, and also cannot control from the desktop. mtijink: Did you split this into remote/local requests? Because we can't control the Android volume yet…
41		}
42
43		private HashMap<String, Sink> sinks;
44		private ArrayList<SinkListener> listeners;
45
46		public SystemvolumePlugin() {
47		sinks = new HashMap<>();
48		listeners = new ArrayList<>();
49		}
50
51		@Override
52		public String getDisplayName() {
53		return context.getResources().getString(R.string.pref_plugin_systemvolume);
54		}
55
56		@Override
57		public String getDescription() {
58		return context.getResources().getString(R.string.pref_plugin_systemvolume_desc);
59		}
60
61		@Override
62		public boolean onPacketReceived(NetworkPacket np) {
63
64		if (np.has("sinkList")) {
65		sinks.clear();
66
67		try {
68		JSONArray sinkArray = np.getJSONArray("sinkList");
69
	mtijinkUnsubmitted Done Leftover `Log`s? mtijink: Leftover `Log`s?
70		for (int i = 0; i < sinkArray.length(); i++) {
71		JSONObject sinkObj = sinkArray.getJSONObject(i);
72		Sink sink = new Sink(sinkObj);
73		sinks.put(sink.getName(), sink);
74		}
75		} catch (JSONException e) {
	mtijinkUnsubmitted Done You can use a for in loop. mtijink: You can use a for in loop.
	nicolasfellaAuthorUnsubmitted Not Done JSONArray doesn't really support that nicolasfella: JSONArray doesn't really support that
76		e.printStackTrace();
77		}
78
79		for (SinkListener l : listeners) {
80		l.sinksChanged();
81		}
82
83		} else {
84		String name = np.getString("name");
85		if (sinks.containsKey(name)) {
86		if (np.has("volume")) {
87		sinks.get(name).setVolume(np.getInt("volume"));
88		} else if (np.has("muted")) {
89		sinks.get(name).setMute(np.getBoolean("muted"));
	mtijinkUnsubmitted Done Should have a check on the sink name. mtijink: Should have a check on the sink name.
	mtijinkUnsubmitted Done This is not done, right? The sink might not actually exist here. mtijink: This is not done, right? The sink might not actually exist here.
90		}
91		}
	mtijinkUnsubmitted Done Here too. mtijink: Here too.
92		}
93		return true;
94		}
95
96		void sendVolume(String name, int volume) {
97		NetworkPacket np = new NetworkPacket(PACKET_TYPE_SYSTEMVOLUME);
98		np.set("volume", volume);
99		np.set("name", name);
100		device.sendPacket(np);
101		}
102
103		void sendMute(String name, boolean mute) {
104		NetworkPacket np = new NetworkPacket(PACKET_TYPE_SYSTEMVOLUME);
105		np.set("muted", mute);
106		np.set("name", name);
107		device.sendPacket(np);
108		}
109
110		void requestSinkList() {
111		NetworkPacket np = new NetworkPacket(PACKET_TYPE_SYSTEMVOLUME);
112		np.set("requestSinks", true);
113		device.sendPacket(np);
114		}
115
116		@Override
117		public boolean hasMainActivity() {
118		return false;
119		}
120
121		@Override
122		public boolean displayInContextMenu() {
123		return false;
124		}
125
126		@Override
127		public String[] getSupportedPacketTypes() {
128		return new String[]{PACKET_TYPE_SYSTEMVOLUME};
129		}
130
131		@Override
132		public String[] getOutgoingPacketTypes() {
133		return new String[]{PACKET_TYPE_SYSTEMVOLUME};
134		}
135
136		Collection<Sink> getSinks() {
137		return sinks.values();
138		}
139
140		void addSinkListener(SinkListener listener) {
141		listeners.add(listener);
142		}
143
144		void removeSinkListener(SinkListener listener) {
145		listeners.remove(listener);
146		}
147
148		}