nutomic/controldna
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Possible fix for build error.

Browse source
This commit is contained in:
Felix Ableitner 2013-06-27 09:20:27 +02:00
parent bb8dfb2b03
commit 0972b7973b
4 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/github/nutomic/controldlna/DeviceArrayAdapter.java
View file

@ -153,10 +153,10 @@ public class DeviceArrayAdapter extends ArrayAdapter<Device<?, ?, ?>>
} }
/** /**
* Not implemented on lower API levels. * Replacement for addAll, which is not implemented on lower API levels.
*/ */
@Override @SuppressWarnings("rawtypes")
public void addAll(Collection<? extends Device<?, ?, ?>> collection) { public void add(Collection<Device> collection) {
for (Device<?, ?, ?> d : collection) for (Device<?, ?, ?> d : collection)
add(d); add(d);
} }

10
src/com/github/nutomic/controldlna/FileArrayAdapter.java
View file

@ -27,7 +27,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.github.nutomic.controldlna; package com.github.nutomic.controldlna;
import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import org.teleal.cling.support.model.DIDLObject; import org.teleal.cling.support.model.DIDLObject;
@ -89,13 +88,4 @@ public class FileArrayAdapter extends ArrayAdapter<DIDLObject> {
return convertView; return convertView;
} }
/**
* Not implemented on lower API levels.
*/
@Override
public void addAll(Collection<? extends DIDLObject> collection) {
for (DIDLObject d : collection)
add(d);
}
} }

4
src/com/github/nutomic/controldlna/RendererFragment.java
View file

@ -27,7 +27,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.github.nutomic.controldlna; package com.github.nutomic.controldlna;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -139,13 +138,12 @@ public class RendererFragment extends Fragment implements
*/ */
private ServiceConnection mUpnpServiceConnection = new ServiceConnection() { private ServiceConnection mUpnpServiceConnection = new ServiceConnection() {
@SuppressWarnings("unchecked")
public void onServiceConnected(ComponentName className, IBinder service) { public void onServiceConnected(ComponentName className, IBinder service) {
mUpnpService = (AndroidUpnpService) service; mUpnpService = (AndroidUpnpService) service;
Log.i(TAG, "Starting device search"); Log.i(TAG, "Starting device search");
mUpnpService.getRegistry().addListener(mRendererAdapter); mUpnpService.getRegistry().addListener(mRendererAdapter);
mUpnpService.getControlPoint().search(); mUpnpService.getControlPoint().search();
mRendererAdapter.addAll((Collection<? extends Device<?, ?, ?>>) mRendererAdapter.add(
mUpnpService.getControlPoint().getRegistry().getDevices()); mUpnpService.getControlPoint().getRegistry().getDevices());
} }

4
src/com/github/nutomic/controldlna/ServerFragment.java
View file

@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.github.nutomic.controldlna; package com.github.nutomic.controldlna;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Stack; import java.util.Stack;
@ -103,13 +102,12 @@ public class ServerFragment extends ListFragment implements OnBackPressedListene
*/ */
private ServiceConnection mUpnpServiceConnection = new ServiceConnection() { private ServiceConnection mUpnpServiceConnection = new ServiceConnection() {
@SuppressWarnings("unchecked")
public void onServiceConnected(ComponentName className, IBinder service) { public void onServiceConnected(ComponentName className, IBinder service) {
mUpnpService = (AndroidUpnpService) service; mUpnpService = (AndroidUpnpService) service;
Log.i(TAG, "Starting device search"); Log.i(TAG, "Starting device search");
mUpnpService.getRegistry().addListener(mServerAdapter); mUpnpService.getRegistry().addListener(mServerAdapter);
mUpnpService.getControlPoint().search(); mUpnpService.getControlPoint().search();
mServerAdapter.addAll((Collection<? extends Device<?, ?, ?>>) mServerAdapter.add(
mUpnpService.getControlPoint().getRegistry().getDevices()); mUpnpService.getControlPoint().getRegistry().getDevices());
} }