Differential D12229 Diff 33881 src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java

Changeset View

Standalone View

View Options

src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s)61 switch (item.getItemId()) {
65 default: 65​ default:
66 break; 66​ break;
67 } 67​ }
68 return true; 68​ return true;
69 } 69​ }
70 70​
71 private void updateComputerListAction() { 71​ private void updateComputerListAction() {
72 updateComputerList(); 72​ updateComputerList();
73 BackgroundService.RunCommand(ShareActivity.this, new BackgroundService.InstanceCallback() { 73​ BackgroundService.RunCommand(ShareActivity.this, BackgroundService::onNetworkChange);
74 @Override ​
75 public void onServiceStart(BackgroundService service) { ​
76 service.onNetworkChange(); ​
77 } ​
78 }); ​
79 74​
80 mSwipeRefreshLayout.setRefreshing(true); 75​ mSwipeRefreshLayout.setRefreshing(true);
81 new Thread(new Runnable() { 76​ new Thread(() -> {
82 @Override ​
83 public void run() { ​
84 try { 77​ try {
85 Thread.sleep(1500); 78​ Thread.sleep(1500);
86 } catch (InterruptedException ignored) { 79​ } catch (InterruptedException ignored) {
87 } 80​ }
88 runOnUiThread(new Runnable() { 81​ runOnUiThread(() -> mSwipeRefreshLayout.setRefreshing(false));
89 @Override ​
90 public void run() { ​
91 mSwipeRefreshLayout.setRefreshing(false); ​
92 } ​
93 }); ​
94 } ​
95 }).start(); 82​ }).start();
96 } 83​ }
97 84​
98 private void updateComputerList() { 85​ private void updateComputerList() {
99 86​
100 final Intent intent = getIntent(); 87​ final Intent intent = getIntent();
101 88​
102 String action = intent.getAction(); 89​ String action = intent.getAction();
103 if (!Intent.ACTION_SEND.equals(action) && !Intent.ACTION_SEND_MULTIPLE.equals(action)) { 90​ if (!Intent.ACTION_SEND.equals(action) && !Intent.ACTION_SEND_MULTIPLE.equals(action)) {
104 finish(); 91​ finish();
105 return; 92​ return;
106 } 93​ }
107 94​
108 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { 95​ BackgroundService.RunCommand(this, service -> {
109 @Override ​
110 public void onServiceStart(final BackgroundService service) { ​
111 96​
112 Collection<Device> devices = service.getDevices().values(); 97​ Collection<Device> devices = service.getDevices().values();
113 final ArrayList<Device> devicesList = new ArrayList<>(); 98​ final ArrayList<Device> devicesList = new ArrayList<>();
114 final ArrayList<ListAdapter.Item> items = new ArrayList<>(); 99​ final ArrayList<ListAdapter.Item> items = new ArrayList<>();
115 100​
116 items.add(new SectionItem(getString(R.string.share_to))); 101​ items.add(new SectionItem(getString(R.string.share_to)));
117 102​
118 for (Device d : devices) { 103​ for (Device d : devices) {
119 if (d.isReachable() && d.isPaired()) { 104​ if (d.isReachable() && d.isPaired()) {
120 devicesList.add(d); 105​ devicesList.add(d);
121 items.add(new EntryItem(d.getName())); 106​ items.add(new EntryItem(d.getName()));
122 } 107​ }
123 } 108​ }
124 109​
125 runOnUiThread(new Runnable() { 110​ runOnUiThread(() -> {
126 @Override ​
127 public void run() { ​
128 ListView list = (ListView) findViewById(R.id.devices_list); 111​ ListView list = (ListView) findViewById(R.id.devices_list);
129 list.setAdapter(new ListAdapter(ShareActivity.this, items)); 112​ list.setAdapter(new ListAdapter(ShareActivity.this, items));
130 list.setOnItemClickListener(new AdapterView.OnItemClickListener() { 113​ list.setOnItemClickListener((adapterView, view, i, l) -> {
131 @Override ​
132 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) { ​
133 114​
134 Device device = devicesList.get(i - 1); //NOTE: -1 because of the title! 115​ Device device = devicesList.get(i - 1); //NOTE: -1 because of the title!
135 SharePlugin.share(intent, device); 116​ SharePlugin.share(intent, device);
136 finish(); 117​ finish();
137 } ​
138 }); 118​ });
139 } ​
140 }); 119​ });
141 120​
142 } ​
143 }); 121​ });
144 } 122​ }
145 123​
146 @Override 124​ @Override
147 protected void onCreate(Bundle savedInstanceState) { 125​ protected void onCreate(Bundle savedInstanceState) {
148 super.onCreate(savedInstanceState); 126​ super.onCreate(savedInstanceState);
149 127​
150 ThemeUtil.setUserPreferredTheme(this); 128​ ThemeUtil.setUserPreferredTheme(this);
151 setContentView(R.layout.devices_list); 129​ setContentView(R.layout.devices_list);
152 130​
153 131​
154 ActionBar actionBar = getSupportActionBar(); 132​ ActionBar actionBar = getSupportActionBar();
155 mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.refresh_list_layout); 133​ mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.refresh_list_layout);
156 mSwipeRefreshLayout.setOnRefreshListener( 134​ mSwipeRefreshLayout.setOnRefreshListener(
157 new SwipeRefreshLayout.OnRefreshListener() { 135​ this::updateComputerListAction
158 @Override ​
159 public void onRefresh() { ​
160 updateComputerListAction(); ​
161 } ​
162 } ​
163 ); 136​ );
164 if (actionBar != null) { 137​ if (actionBar != null) {
165 actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM); 138​ actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
166 } 139​ }
167 } 140​ }
168 141​
169 142​
170 @Override 143​ @Override
171 protected void onStart() { 144​ protected void onStart() {
172 super.onStart(); 145​ super.onStart();
173 146​
174 final Intent intent = getIntent(); 147​ final Intent intent = getIntent();
175 final String deviceId = intent.getStringExtra("deviceId"); 148​ final String deviceId = intent.getStringExtra("deviceId");
176 149​
177 if (deviceId != null) { 150​ if (deviceId != null) {
178 151​
179 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { 152​ BackgroundService.RunCommand(this, service -> {
180 ​
181 @Override ​
182 public void onServiceStart(BackgroundService service) { ​
183 Log.d("DirectShare", "sharing to " + service.getDevice(deviceId).getName()); 153​ Log.d("DirectShare", "sharing to " + service.getDevice(deviceId).getName());
184 Device device = service.getDevice(deviceId); 154​ Device device = service.getDevice(deviceId);
185 if (device.isReachable() && device.isPaired()) { 155​ if (device.isReachable() && device.isPaired()) {
186 SharePlugin.share(intent, device); 156​ SharePlugin.share(intent, device);
187 } 157​ }
188 finish(); 158​ finish();
189 } ​
190 }); 159​ });
191 } else { 160​ } else {
192 161​
193 BackgroundService.addGuiInUseCounter(this); 162​ BackgroundService.addGuiInUseCounter(this);
194 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { 163​ BackgroundService.RunCommand(this, service -> {
195 @Override ​
196 public void onServiceStart(BackgroundService service) { ​
197 service.onNetworkChange(); 164​ service.onNetworkChange();
198 service.addDeviceListChangedCallback("ShareActivity", new BackgroundService.DeviceListChangedCallback() { 165​ service.addDeviceListChangedCallback("ShareActivity", this::updateComputerList);
199 @Override ​
200 public void onDeviceListChanged() { ​
201 updateComputerList(); ​
202 } ​
203 }); ​
204 } ​
205 }); 166​ });
206 updateComputerList(); 167​ updateComputerList();
207 } 168​ }
208 } 169​ }
209 170​
210 171​
211 @Override 172​ @Override
212 protected void onStop() { 173​ protected void onStop() {
213 BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { 174​ BackgroundService.RunCommand(this, service -> service.removeDeviceListChangedCallback("ShareActivity"));
214 @Override ​
215 public void onServiceStart(BackgroundService service) { ​
216 service.removeDeviceListChangedCallback("ShareActivity"); ​
217 } ​
218 }); ​
219 BackgroundService.removeGuiInUseCounter(this); 175​ BackgroundService.removeGuiInUseCounter(this);
220 super.onStop(); 176​ super.onStop();
221 } 177​ }
222 178​
223} 179​}