Differential D3373 Diff 8188 src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java

Changeset View

Standalone View

View Options

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

Context not available.
22package org.kde.kdeconnect.Plugins.RunCommandPlugin; 22​package org.kde.kdeconnect.Plugins.RunCommandPlugin;
23 23​
24import android.app.Activity; 24​import android.app.Activity;
25​import android.app.PendingIntent;
25import android.content.Intent; 26​import android.content.Intent;
26import android.graphics.drawable.Drawable; 27​import android.graphics.drawable.Drawable;
27import android.support.v4.content.ContextCompat; 28​import android.support.v4.content.ContextCompat;
Context not available.
30import org.json.JSONObject; 31​import org.json.JSONObject;
31import org.kde.kdeconnect.NetworkPackage; 32​import org.kde.kdeconnect.NetworkPackage;
32import org.kde.kdeconnect.Plugins.Plugin; 33​import org.kde.kdeconnect.Plugins.Plugin;
34​import org.kde.kdeconnect.UserInterface.List.ListAdapter;
35​import org.kde.kdeconnect.UserInterface.MaterialActivity;
33import org.kde.kdeconnect_tp.R; 36​import org.kde.kdeconnect_tp.R;
34 37​
35import java.util.ArrayList; 38​import java.util.ArrayList;
39​import java.util.Collections;
40​import java.util.Comparator;
36import java.util.Iterator; 41​import java.util.Iterator;
37 42​
43​import cyanogenmod.app.CMStatusBarManager;
44​import cyanogenmod.app.CustomTile;
45​
38public class RunCommandPlugin extends Plugin { 46​public class RunCommandPlugin extends Plugin {
39 47​
48​ public final static int CUSTOM_TILE_ID = 1;
40 public final static String PACKAGE_TYPE_RUNCOMMAND = "kdeconnect.runcommand"; 49​ public final static String PACKAGE_TYPE_RUNCOMMAND = "kdeconnect.runcommand";
50​ public final static String PACKAGE_TYPE_RUNCOMMAND_DEVICEID = "kdeconnect.runcommand.deviceid";
albertvakaUnsubmitted
Not Done

Rename to EXTRA_RUNCOMMAND_DEVICEID or something like that, to differentiate it from PACKAGE_TYPE_RUNCOMMAND and PACKAGE_TYPE_RUNCOMMAND_REQUEST. These two are "command types" and are used for a different purpose.

albertvaka: Rename to EXTRA_RUNCOMMAND_DEVICEID or something like that, to differentiate it from…
41 public final static String PACKAGE_TYPE_RUNCOMMAND_REQUEST = "kdeconnect.runcommand.request"; 51​ public final static String PACKAGE_TYPE_RUNCOMMAND_REQUEST = "kdeconnect.runcommand.request";
42 52​
43 private ArrayList<JSONObject> commandList = new ArrayList<>(); 53​ private ArrayList< ListAdapter.Item > commandList = new ArrayList<>();
44 private ArrayList<CommandsChangedCallback> callbacks = new ArrayList<>(); 54​ private ArrayList< CommandsChangedCallback > callbacks = new ArrayList<>();
45 55​
46 public void addCommandsUpdatedCallback(CommandsChangedCallback newCallback) { 56​ public void addCommandsUpdatedCallback( CommandsChangedCallback newCallback ){
47 callbacks.add(newCallback); 57​ callbacks.add( newCallback );
48 } 58​ }
49 59​
50 public void removeCommandsUpdatedCallback(CommandsChangedCallback theCallback) { 60​ public void removeCommandsUpdatedCallback( CommandsChangedCallback theCallback ){
51 callbacks.remove(theCallback); 61​ callbacks.remove( theCallback );
52 } 62​ }
albertvakaUnsubmitted
Not Done

Don't commit whitespace changes as part of a new feature.

albertvaka: Don't commit whitespace changes as part of a new feature.
53 63​
54 interface CommandsChangedCallback { 64​ interface CommandsChangedCallback {
55 void update(); 65​ void update();
56 }; 66​ }
57 67​
58 public ArrayList<JSONObject> getCommandList() { 68​ public ArrayList< ListAdapter.Item > getCommandList(){
59 return commandList; 69​ return commandList;
60 } 70​ }
61 71​
62 @Override 72​ @Override
63 public String getDisplayName() { 73​ public String getDisplayName(){
64 return context.getResources().getString(R.string.pref_plugin_runcommand); 74​ return context.getResources().getString( R.string.pref_plugin_runcommand );
65 } 75​ }
66 76​
67 @Override 77​ @Override
68 public String getDescription() { 78​ public String getDescription(){
69 return context.getResources().getString(R.string.pref_plugin_runcommand_desc); 79​ return context.getResources().getString( R.string.pref_plugin_runcommand_desc );
70 } 80​ }
71 81​
72 @Override 82​ @Override
73 public Drawable getIcon() { 83​ public Drawable getIcon(){
74 return ContextCompat.getDrawable(context, R.drawable.runcommand_plugin_icon); 84​ return ContextCompat.getDrawable( context, R.drawable.runcommand_plugin_icon );
75 } 85​ }
76 86​
77 @Override 87​ @Override
78 public boolean onCreate() { 88​ public boolean onCreate(){
79 requestCommandList(); 89​ requestCommandList();
80 return true; 90​ return true;
81 } 91​ }
82 92​
83 @Override 93​ @Override
84 public boolean onPackageReceived(NetworkPackage np) { 94​ public boolean onPackageReceived( NetworkPackage np ){
95​
96​ if( np.has( "commandList" ) ){
85 97​
86 if (np.has("commandList")) { ​
87 commandList.clear(); 98​ commandList.clear();
88 try { 99​
89 JSONObject obj = new JSONObject(np.getString("commandList")); 100​ try{
90 Iterator<String> keys = obj.keys(); 101​ JSONObject obj = new JSONObject( np.getString( "commandList" ) );
91 while(keys.hasNext()){ 102​ Iterator< String > keys = obj.keys();
103​ ArrayList< CustomTile.ExpandedListItem > expandedListItems = new ArrayList<>();
104​ Intent intent;
105​ PendingIntent pendingIntent;
106​ int intentIndex = 0;
107​ Intent activityIntent = new Intent( context, MaterialActivity.class );
108​ activityIntent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK );
109​
110​ PendingIntent pendingActivityIntent = PendingIntent.getActivity( context, 0, activityIntent, PendingIntent.FLAG_UPDATE_CURRENT );
111​
112​ while( keys.hasNext() ){
92 String s = keys.next(); 113​ String s = keys.next();
93 JSONObject o = obj.getJSONObject(s); 114​ JSONObject o = obj.getJSONObject( s );
94 o.put("key", s); 115​ o.put( "key", s );
95 commandList.add(o); 116​
117​ try{
118​ commandList.add( new CommandEntry( o.getString( "name" ), o.getString( "command" ), o.getString( "key" ) ) );
119​ }
120​ catch( JSONException e ){
121​ e.printStackTrace();
122​ }
96 } 123​ }
97 } catch (JSONException e) { 124​
125​ Collections.sort( commandList, new Comparator< ListAdapter.Item >() {
126​ @Override
127​ public int compare( ListAdapter.Item lhs, ListAdapter.Item rhs ){
128​ String lName = ( (CommandEntry) lhs ).getName();
129​ String rName = ( (CommandEntry) rhs ).getName();
130​ return lName.compareTo( rName );
131​ }
132​ } );
133​
134​ for( ListAdapter.Item command : commandList ){
135​
136​ intent = new Intent();
137​
138​ intent.setAction( PACKAGE_TYPE_RUNCOMMAND );
139​ intent.putExtra( PACKAGE_TYPE_RUNCOMMAND, ((CommandEntry)command).getKey() );
140​ intent.putExtra( PACKAGE_TYPE_RUNCOMMAND_DEVICEID, device.getDeviceId() );
141​
142​ pendingIntent = PendingIntent.getBroadcast( context, intentIndex, intent, PendingIntent.FLAG_UPDATE_CURRENT );
143​
144​ CustomTile.ExpandedListItem expandedListItem = new CustomTile.ExpandedListItem();
145​
146​ expandedListItem.setExpandedListItemDrawable( R.drawable.ic_command );
147​ expandedListItem.setExpandedListItemTitle( ( (CommandEntry) command ).getName() );
148​
149​ expandedListItem.setExpandedListItemSummary( ( (CommandEntry) command ).getCommand() );
150​
151​ expandedListItem.setExpandedListItemOnClickIntent( pendingIntent );
152​ expandedListItems.add( expandedListItem );
153​
154​ intentIndex++;
155​ }
156​
157​ CustomTile.ListExpandedStyle listExpandedStyle = new CustomTile.ListExpandedStyle();
158​ listExpandedStyle.setListItems( expandedListItems );
159​
160​ CustomTile mCustomTile = new CustomTile.Builder( context )
161​ .setExpandedStyle( listExpandedStyle )
162​ .setLabel( "KDE Connect" )
163​ .setIcon( R.drawable.icon )
164​ .setOnLongClickIntent( pendingActivityIntent )
165​ .shouldCollapsePanel( true )
166​ .build();
167​
168​ CMStatusBarManager.getInstance( context ).publishTile( "TAG", CUSTOM_TILE_ID, mCustomTile );
albertvakaUnsubmitted
Not Done

This could be moved to a separate function, so we split Cyanogen code from all-platforms code.

Also, I've never used the Cyanogen API, but I'm curious about this: don't we need to guard it with an "if (device_is_cyanogen)" or something like that? Will it just run without effect on other Androids?

albertvaka: This could be moved to a separate function, so we split Cyanogen code from all-platforms code.
169​
170​ }
171​ catch( JSONException e ){
98 e.printStackTrace(); 172​ e.printStackTrace();
99 } 173​ }
100 174​
101 for (CommandsChangedCallback aCallback : callbacks) { 175​ for( CommandsChangedCallback aCallback : callbacks ){
102 aCallback.update(); 176​ aCallback.update();
103 } 177​ }
104 178​
105 device.onPluginsChanged(); ​
albertvakaUnsubmitted
Not Done

Did you remove this for a reason, or was unintended?

albertvaka: Did you remove this for a reason, or was unintended?
106 ​
107 return true; 179​ return true;
108 } 180​ }
109 return false; 181​ return false;
110 } 182​ }
111 183​
112 @Override 184​ @Override
113 public String[] getSupportedPackageTypes() { 185​ public String[] getSupportedPackageTypes(){
114 return new String[]{PACKAGE_TYPE_RUNCOMMAND}; 186​ return new String[]{ PACKAGE_TYPE_RUNCOMMAND };
115 } 187​ }
116 188​
117 @Override 189​ @Override
118 public String[] getOutgoingPackageTypes() { 190​ public String[] getOutgoingPackageTypes(){
119 return new String[]{PACKAGE_TYPE_RUNCOMMAND_REQUEST}; 191​ return new String[]{ PACKAGE_TYPE_RUNCOMMAND_REQUEST };
120 } 192​ }
121 193​
122 public void runCommand(String cmdKey) { 194​ public void runCommand( String cmdKey ){
123 NetworkPackage np = new NetworkPackage(PACKAGE_TYPE_RUNCOMMAND_REQUEST); 195​ NetworkPackage np = new NetworkPackage( PACKAGE_TYPE_RUNCOMMAND_REQUEST );
124 np.set("key", cmdKey); 196​ np.set( "key", cmdKey );
125 device.sendPackage(np); 197​ device.sendPackage( np );
126 } 198​ }
127 199​
128 private void requestCommandList() { 200​ private void requestCommandList(){
129 NetworkPackage np = new NetworkPackage(PACKAGE_TYPE_RUNCOMMAND_REQUEST); 201​ NetworkPackage np = new NetworkPackage( PACKAGE_TYPE_RUNCOMMAND_REQUEST );
130 np.set("requestCommandList", true); 202​ np.set( "requestCommandList", true );
131 device.sendPackage(np); 203​ device.sendPackage( np );
132 } 204​ }
133 205​
134 @Override 206​ @Override
135 public boolean hasMainActivity() { 207​ public boolean hasMainActivity(){
136 return !commandList.isEmpty(); 208​ return !commandList.isEmpty();
137 } 209​ }
138 210​
139 @Override 211​ @Override
140 public void startMainActivity(Activity parentActivity) { 212​ public void startMainActivity( Activity parentActivity ){
141 Intent intent = new Intent(parentActivity, RunCommandActivity.class); 213​ Intent intent = new Intent( parentActivity, RunCommandActivity.class );
142 intent.putExtra("deviceId", device.getDeviceId()); 214​ intent.putExtra( "deviceId", device.getDeviceId() );
143 parentActivity.startActivity(intent); 215​ parentActivity.startActivity( intent );
144 } 216​ }
145 217​
146 @Override 218​ @Override
147 public String getActionName() { 219​ public String getActionName(){
148 return context.getString(R.string.pref_plugin_runcommand); 220​ return context.getString( R.string.pref_plugin_runcommand );
149 } 221​ }
150 222​
151} 223​}
Context not available.