mirror of
https://github.com/jwetzell/qController.git
synced 2026-08-20 22:49:24 +00:00
* Info.plist:
* AndroidManifest.xml: Android v1.0.9 / iOS v2.0.9 * ControlPage.xaml.cs: Warn if password or no workspaces
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<application android:label="qController" android:icon="@drawable/icon"></application>
|
<application android:label="qController" android:icon="@drawable/icon"></application>
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@
|
|||||||
<key>XSAppIconAssets</key>
|
<key>XSAppIconAssets</key>
|
||||||
<string>Assets.xcassets/AppIcon.appiconset</string>
|
<string>Assets.xcassets/AppIcon.appiconset</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>2.0.8</string>
|
<string>2.0.9</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1.0</string>
|
<string>1.0</string>
|
||||||
<key>ITSAppUsesNonExemptEncryption</key>
|
<key>ITSAppUsesNonExemptEncryption</key>
|
||||||
|
|||||||
@@ -40,12 +40,43 @@ namespace qController
|
|||||||
Console.WriteLine("ControlPage: MULTIPLE WORKSPACES ON SELECTED COMPUTER");
|
Console.WriteLine("ControlPage: MULTIPLE WORKSPACES ON SELECTED COMPUTER");
|
||||||
PromptForWorkspace(args.WorkspaceInfo);
|
PromptForWorkspace(args.WorkspaceInfo);
|
||||||
}
|
}
|
||||||
else
|
else if (args.WorkspaceInfo.Count == 1)
|
||||||
{
|
{
|
||||||
Console.WriteLine("ControlPage: ONLY ONE WORKSPACE ON SELECTED COMPUTER");
|
Console.WriteLine("ControlPage: ONLY ONE WORKSPACE ON SELECTED COMPUTER");
|
||||||
qController.Connect(args.WorkspaceInfo[0].uniqueID);
|
Console.WriteLine("HasPasscode : " + args.WorkspaceInfo[0].hasPasscode);
|
||||||
Device.BeginInvokeOnMainThread(() => {
|
if (!args.WorkspaceInfo[0].hasPasscode)
|
||||||
FinishUI();
|
{
|
||||||
|
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++)
|
for (int i = 0; i < workspaces.Count; i++)
|
||||||
{
|
{
|
||||||
QWorkspaceInfo workspace = workspaces[i];
|
QWorkspaceInfo workspace = workspaces[i];
|
||||||
config.Add(workspace.displayName, new Action(() => {
|
config.Add(workspace.displayName, new Action(() => {
|
||||||
Console.WriteLine("ControlPage: Workspace Selected " + workspace.displayName);
|
Console.WriteLine("ControlPage: Workspace Selected " + workspace.displayName);
|
||||||
qController.Connect(workspace.uniqueID);
|
if (!workspace.hasPasscode)
|
||||||
Device.BeginInvokeOnMainThread(() =>
|
|
||||||
{
|
{
|
||||||
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);
|
UserDialogs.Instance.ActionSheet(config);
|
||||||
@@ -184,7 +232,6 @@ namespace qController
|
|||||||
|
|
||||||
void Back()
|
void Back()
|
||||||
{
|
{
|
||||||
qController.Disconnect();
|
|
||||||
qController.Kill();
|
qController.Kill();
|
||||||
App.rootPage.MenuItemSelected -= OnMenuItemSelected;
|
App.rootPage.MenuItemSelected -= OnMenuItemSelected;
|
||||||
Device.BeginInvokeOnMainThread(() =>
|
Device.BeginInvokeOnMainThread(() =>
|
||||||
@@ -346,7 +393,6 @@ namespace qController
|
|||||||
|
|
||||||
protected override bool OnBackButtonPressed()
|
protected override bool OnBackButtonPressed()
|
||||||
{
|
{
|
||||||
qController.Disconnect();
|
|
||||||
qController.Kill();
|
qController.Kill();
|
||||||
App.rootPage.MenuItemSelected -= OnMenuItemSelected;
|
App.rootPage.MenuItemSelected -= OnMenuItemSelected;
|
||||||
Device.BeginInvokeOnMainThread(() =>
|
Device.BeginInvokeOnMainThread(() =>
|
||||||
|
|||||||
Reference in New Issue
Block a user