From 3bd6aabc968dbad9d28d1524b82db0b56753dfa7 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 7 Sep 2015 12:02:21 -0700 Subject: [PATCH 1/9] Ooops --- src/org/kde/kdeconnect/UserInterface/PairingFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java index b34dcfbb..99bbe4fe 100644 --- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java @@ -247,7 +247,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb mActivity.runOnUiThread(new Runnable() { @Override public void run() { - menuProgress.setVisible(true); + menuProgress.setVisible(false); } }); } From 57bc4d46a9d04e9491d9d012563cd13e85d279d8 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Wed, 9 Sep 2015 01:05:48 -0700 Subject: [PATCH 2/9] Make it look better on old Androids --- res/drawable/text_section_header.xml | 7 +++++++ res/layout/activity_list.xml | 3 +-- res/layout/list_item_category.xml | 17 ++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 res/drawable/text_section_header.xml diff --git a/res/drawable/text_section_header.xml b/res/drawable/text_section_header.xml new file mode 100644 index 00000000..9427d83a --- /dev/null +++ b/res/drawable/text_section_header.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/res/layout/activity_list.xml b/res/layout/activity_list.xml index 75a946aa..5e9ee5c1 100644 --- a/res/layout/activity_list.xml +++ b/res/layout/activity_list.xml @@ -2,10 +2,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="16dip" + android:padding="16dip" tools:context=".MainActivity" android:id="@+id/listView1" android:addStatesFromChildren="true" android:orientation="vertical"> - diff --git a/res/layout/list_item_category.xml b/res/layout/list_item_category.xml index 3d259bc8..0eb1cc11 100644 --- a/res/layout/list_item_category.xml +++ b/res/layout/list_item_category.xml @@ -5,9 +5,20 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + Date: Wed, 9 Sep 2015 01:07:17 -0700 Subject: [PATCH 3/9] Device type should be "desktop", no "computer" --- src/org/kde/kdeconnect/Device.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java index 482e8d75..da9c2ade 100644 --- a/src/org/kde/kdeconnect/Device.java +++ b/src/org/kde/kdeconnect/Device.java @@ -77,13 +77,13 @@ public class Device implements BaseLink.PackageReceiver { public static DeviceType FromString(String s) { if ("tablet".equals(s)) return Tablet; - if ("computer".equals(s)) return Computer; + if ("desktop".equals(s)) return Computer; return Phone; //Default } public String toString() { switch (this) { case Tablet: return "tablet"; - case Computer: return "computer"; + case Computer: return "desktop"; default: return "phone"; } } @@ -118,7 +118,7 @@ public class Device implements BaseLink.PackageReceiver { this.name = settings.getString("deviceName", context.getString(R.string.unknown_device)); this.pairStatus = PairStatus.Paired; this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet - this.deviceType = DeviceType.FromString(settings.getString("deviceType", "computer")); + this.deviceType = DeviceType.FromString(settings.getString("deviceType", "desktop")); try { byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0); @@ -139,10 +139,10 @@ public class Device implements BaseLink.PackageReceiver { this.context = context; this.deviceId = np.getString("deviceId"); - this.name = np.getString("deviceName", context.getString(R.string.unknown_device)); + this.name = context.getString(R.string.unknown_device); //We read it in addLink this.pairStatus = PairStatus.NotPaired; - this.protocolVersion = np.getInt("protocolVersion"); - this.deviceType = DeviceType.FromString(np.getString("deviceType", "computer")); + this.protocolVersion = 0; + this.deviceType = DeviceType.Computer; this.publicKey = null; settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE); @@ -381,7 +381,7 @@ public class Device implements BaseLink.PackageReceiver { } if (identityPackage.has("deviceType")) { - this.deviceType = DeviceType.FromString(identityPackage.getString("deviceType", "computer")); + this.deviceType = DeviceType.FromString(identityPackage.getString("deviceType", "desktop")); } From cedffe6578e152252c1842dec9e29d4e208712fe Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Wed, 9 Sep 2015 01:11:46 -0700 Subject: [PATCH 4/9] Assume computer by default from the phone for device with no type --- src/org/kde/kdeconnect/Device.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java index da9c2ade..0ae05811 100644 --- a/src/org/kde/kdeconnect/Device.java +++ b/src/org/kde/kdeconnect/Device.java @@ -49,6 +49,7 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Set; import java.util.Timer; import java.util.TimerTask; @@ -77,14 +78,14 @@ public class Device implements BaseLink.PackageReceiver { public static DeviceType FromString(String s) { if ("tablet".equals(s)) return Tablet; - if ("desktop".equals(s)) return Computer; - return Phone; //Default + if ("phone".equals(s)) return Phone; + return Computer; //Default } public String toString() { switch (this) { case Tablet: return "tablet"; - case Computer: return "desktop"; - default: return "phone"; + case Phone: return "phone"; + default: return "desktop"; } } } From 10d9ff5a5a83267cb2a2924d1a6d41d01a7561fe Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 8 Sep 2015 05:18:57 -0700 Subject: [PATCH 5/9] Commented out some logs --- src/org/kde/kdeconnect/UserInterface/DeviceFragment.java | 6 +++--- src/org/kde/kdeconnect/UserInterface/MaterialActivity.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java index b404fc40..39f7130e 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java @@ -99,7 +99,7 @@ public class DeviceFragment extends Fragment { setHasOptionsMenu(true); - Log.e("DeviceFragment", "device: " + deviceId); + //Log.e("DeviceFragment", "device: " + deviceId); BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() { @Override @@ -203,7 +203,7 @@ public class DeviceFragment extends Fragment { @Override public void onPrepareOptionsMenu(Menu menu) { - Log.e("DeviceFragment", "onPrepareOptionsMenu"); + //Log.e("DeviceFragment", "onPrepareOptionsMenu"); super.onPrepareOptionsMenu(menu); menu.clear(); @@ -287,7 +287,7 @@ public class DeviceFragment extends Fragment { } void refreshUI() { - Log.e("DeviceFragment", "refreshUI"); + //Log.e("DeviceFragment", "refreshUI"); if (device == null || rootView == null) { return; diff --git a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java index 4f59b0c7..84a37aad 100644 --- a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java +++ b/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java @@ -124,7 +124,7 @@ public class MaterialActivity extends AppCompatActivity { private void updateComputerList() { - Log.e("MaterialActivity", "UpdateComputerList"); + //Log.e("MaterialActivity", "UpdateComputerList"); BackgroundService.RunCommand(MaterialActivity.this, new BackgroundService.InstanceCallback() { @Override From b0a96ace3239edfefdb853f218ee4f843d0c3042 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 8 Sep 2015 14:45:01 -0700 Subject: [PATCH 6/9] Show connected devices in pairingfragment because otherwise it's confusing --- src/org/kde/kdeconnect/UserInterface/PairingFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java index 99bbe4fe..a436d13d 100644 --- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java @@ -120,7 +120,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb section.isSectionEmpty = false; } } -/* + section = new SectionItem(res.getString(R.string.category_connected_devices)); section.isSectionEmpty = true; items.add(section); @@ -133,7 +133,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb if (section.isSectionEmpty) { items.remove(items.size() - 1); //Remove connected devices section if empty } -*/ + section = new SectionItem(res.getString(R.string.category_remembered_devices)); section.isSectionEmpty = true; items.add(section); From 803464a7ce984caa0d148cc509c27e01acc711fb Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 8 Sep 2015 14:39:07 -0700 Subject: [PATCH 7/9] Fixed crash --- src/org/kde/kdeconnect/NetworkPackage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/kde/kdeconnect/NetworkPackage.java b/src/org/kde/kdeconnect/NetworkPackage.java index 42f06869..b27a1385 100644 --- a/src/org/kde/kdeconnect/NetworkPackage.java +++ b/src/org/kde/kdeconnect/NetworkPackage.java @@ -108,6 +108,7 @@ public class NetworkPackage { public ArrayList getStringList(String key) { JSONArray jsonArray = mBody.optJSONArray(key); + if (jsonArray == null) return null; ArrayList list = new ArrayList<>(); int length = jsonArray.length(); for (int i = 0; i < length; i++) { From d860b67ba92f4400ccc93ba401b814e270dbd435 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 8 Sep 2015 01:12:20 -0700 Subject: [PATCH 8/9] Prettier message --- res/layout/activity_device.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml index 16d8acd0..c8c7c765 100644 --- a/res/layout/activity_device.xml +++ b/res/layout/activity_device.xml @@ -74,9 +74,10 @@ android:id="@+id/unpair_message" android:visibility="gone" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:text="@string/unreachable_description" - /> + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center" /> Date: Mon, 7 Sep 2015 16:00:13 -0700 Subject: [PATCH 9/9] Don't show buttons that can't be clicked --- src/org/kde/kdeconnect/UserInterface/PluginPreference.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/kde/kdeconnect/UserInterface/PluginPreference.java b/src/org/kde/kdeconnect/UserInterface/PluginPreference.java index 6b995b80..e1ad7d24 100644 --- a/src/org/kde/kdeconnect/UserInterface/PluginPreference.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginPreference.java @@ -28,7 +28,8 @@ public class PluginPreference extends CheckBoxPreference { setSummary(info.getDescription()); setChecked(device.isPluginEnabled(pluginKey)); - if (info.hasSettings()) { + Plugin plugin = device.getPlugin(pluginKey, true); + if (info.hasSettings() && plugin != null) { this.listener = new View.OnClickListener() { @Override public void onClick(View v) {