jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-05 23:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Info.plist:

Browse Source 
* AndroidManifest.xml: Android v1.0.9 / iOS v2.0.9

* ControlPage.xaml.cs: Warn if password or no workspaces
This commit is contained in:
Joel Wetzell
2019-07-22 07:05:16 -05:00
parent e97f9a7382
commit a2d96d2985
3 changed files with 59 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Properties/AndroidManifest.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="25" android:versionName="1.0.8" package="com.jwetzell.qlabcontroller">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="26" android:versionName="1.0.9" package="com.jwetzell.qlabcontroller">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
<uses-permission android:name="android.permission.INTERNET" />
<application android:label="qController" android:icon="@drawable/icon"></application>
iOS/Info.plist
+1 -1
View File
@@ -36,7 +36,7 @@
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>CFBundleShortVersionString</key>
<string>2.0.8</string>
<string>2.0.9</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>ITSAppUsesNonExemptEncryption</key>
qController.Standard/Pages/ControlPage.xaml.cs
+57 -11
View File
@@ -40,12 +40,43 @@ namespace qController
Console.WriteLine("ControlPage: MULTIPLE WORKSPACES ON SELECTED COMPUTER");
PromptForWorkspace(args.WorkspaceInfo);
}
else
else if (args.WorkspaceInfo.Count == 1)
{
Console.WriteLine("ControlPage: ONLY ONE WORKSPACE ON SELECTED COMPUTER");
qController.Connect(args.WorkspaceInfo[0].uniqueID);
Device.BeginInvokeOnMainThread(() => {
FinishUI();
Console.WriteLine("HasPasscode : " + args.WorkspaceInfo[0].hasPasscode);
if (!args.WorkspaceInfo[0].hasPasscode)
{
qController.Connect(args.WorkspaceInfo[0].uniqueID);
Device.BeginInvokeOnMainThread(() => {
FinishUI();
});
}
else
{
UserDialogs.Instance.Confirm(new ConfirmConfig
{
Message = "Woops....I haven't implemented password protected workspaces yet...",
OkText = "Disconnect",
OnAction = (resp) =>
{
if (resp)
Back();
}
});
}
}
else
{
UserDialogs.Instance.Confirm(new ConfirmConfig
{
Message = "QLab doesn't have any workspaces open?",
OkText = "Disconnect",
OnAction = (resp) =>
{
if (resp)
Back();
}
});
}
}
@@ -57,13 +88,30 @@ namespace qController
for (int i = 0; i < workspaces.Count; i++)
{
QWorkspaceInfo workspace = workspaces[i];
config.Add(workspace.displayName, new Action(() => {
config.Add(workspace.displayName, new Action(() => {
Console.WriteLine("ControlPage: Workspace Selected " + workspace.displayName);
qController.Connect(workspace.uniqueID);
Device.BeginInvokeOnMainThread(() =>
if (!workspace.hasPasscode)
{
FinishUI();
});
qController.Connect(workspace.uniqueID);
Device.BeginInvokeOnMainThread(() =>
{
FinishUI();
});
}
else
{
UserDialogs.Instance.Confirm(new ConfirmConfig
{
Message = "Woops....I haven't implemented password protected workspaces yet...",
OkText = "Disconnect",
OnAction = (resp) =>
{
if (resp)
Back();
}
});
}
}));
}
UserDialogs.Instance.ActionSheet(config);
@@ -184,7 +232,6 @@ namespace qController
void Back()
{
qController.Disconnect();
qController.Kill();
App.rootPage.MenuItemSelected -= OnMenuItemSelected;
Device.BeginInvokeOnMainThread(() =>
@@ -346,7 +393,6 @@ namespace qController
protected override bool OnBackButtonPressed()
{
qController.Disconnect();
qController.Kill();
App.rootPage.MenuItemSelected -= OnMenuItemSelected;
Device.BeginInvokeOnMainThread(() =>