mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-30 05:37:43 +00:00
Code Issues Releases Wiki Activity

Merge branch '0.9'

Browse Source 
# Conflicts:
#	res/values-ca/strings.xml
#	res/values-fi/strings.xml
#	res/values-nl/strings.xml
#	res/values-pt-rBR/strings.xml
#	res/values-pt/strings.xml
#	res/values-sv/strings.xml
#	res/values-uk/strings.xml
#	res/values/strings.xml
#	src/org/kde/kdeconnect/Device.java
This commit is contained in:
Albert Vaca 2015-09-18 08:11:44 -07:00
commit 9322970d58
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.kde.kdeconnect_tp"
android:versionCode="905"
android:versionName="0.9">
android:versionCode="907"
android:versionName="0.9c">
<uses-sdk android:minSdkVersion="9"
android:targetSdkVersion="22" />

13
src/org/kde/kdeconnect/Device.java
View File

@ -52,6 +52,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
public class Device implements BaseLink.PackageReceiver {
@ -75,8 +76,8 @@ public class Device implements BaseLink.PackageReceiver {
private ArrayList<String> incomingCapabilities;
private ArrayList<String> outgoingCapabilities;
private final HashMap<String, Plugin> plugins = new HashMap<>();
private final HashMap<String, Plugin> failedPlugins = new HashMap<>();
private final ConcurrentHashMap<String, Plugin> plugins = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, Plugin> failedPlugins = new ConcurrentHashMap<>();
private ArrayList<String> unsupportedPlugins = new ArrayList<>();
private HashSet<String> supportedIncomingInterfaces = new HashSet<>();
@ -495,16 +496,12 @@ public class Device implements BaseLink.PackageReceiver {
if (pairStatus == PairStatus.Requested) { //We started pairing
Log.i("KDE/Pairing","Pair answer");
hidePairingNotification();
pairingDone();
} else {
Log.i("KDE/Pairing","Pair request");
Intent intent = new Intent(context, MaterialActivity.class);
intent.putExtra("deviceId", deviceId);
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT);
@ -877,11 +874,11 @@ public class Device implements BaseLink.PackageReceiver {
}
}
public HashMap<String,Plugin> getLoadedPlugins() {
public ConcurrentHashMap<String,Plugin> getLoadedPlugins() {
return plugins;
}
public HashMap<String,Plugin> getFailedPlugins() {
public ConcurrentHashMap<String,Plugin> getFailedPlugins() {
return failedPlugins;
}

1
src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
View File

@ -301,7 +301,6 @@ public class DeviceFragment extends Fragment {
@Override
public void run() {
Log.e("DEVICE",device.getName() + device.isPairRequestedByOtherEnd() + device.isPairRequested());
if (device.isPairRequestedByOtherEnd()) {
((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.pair_requested);
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);