Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delay auto resolve skippable dialog #219

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+71 −44
Open

Delay auto resolve skippable dialog #219

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
980c0e5
add AutoResolutionDelay
Thaina May 18, 2019
d1de42e
Delay auto resolve dialog
Thaina May 18, 2019
b3e3c73
Update PlayServicesResolver.cs
Thaina May 21, 2019
e18f3bb
Update PlayServicesResolver.cs
Thaina May 21, 2019
4f15dd7
cleanup 30 sec maximum delay
Thaina May 18, 2019
49d90f4
Merge branch 'master' of https://github.com/Thaina/unity-jar-resolver
Thaina May 22, 2019
d2974b3
Merge branch 'master' into master
Thaina May 23, 2019
57572e0
Merge branch 'master' of https://github.com/googlesamples/unity-jar-r…
Thaina Jun 30, 2019
e9820d3
fix to use progressbardialog for countdown instead
Thaina Jun 30, 2019
450d7bb
Merge branch 'master' of https://github.com/googlesamples/unity-jar-r…
Thaina Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 64 additions & 31 deletions source/PlayServicesResolver/src/PlayServicesResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="PlayServicesResolver.cs" company="Google Inc.">
// <copyright file="PlayServicesResolver.cs" company="Google Inc.">
// Copyright (C) 2015 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -149,14 +149,12 @@ public static DependencyState ReadFromFile() {
return true;
} else if (elementName == "package" &&
parentElementName == "packages") {
if (isStart && reader.Read() &&
reader.NodeType == XmlNodeType.Text) {
if (reader.Read() && reader.NodeType == XmlNodeType.Text) {
packages.Add(reader.ReadContentAsString());
}
return true;
} else if (elementName == "file" && parentElementName == "files") {
if (isStart && reader.Read() &&
reader.NodeType == XmlNodeType.Text) {
if (reader.Read() && reader.NodeType == XmlNodeType.Text) {
files.Add(reader.ReadContentAsString());
}
return true;
Expand Down Expand Up @@ -928,32 +926,69 @@ private static void OnPostProcessScene() {
/// Defaults to 1 second.</param>
private static void ScheduleAutoResolve(double delayInMilliseconds = 1000.0) {
lock (typeof(PlayServicesResolver)) {
if (!autoResolving) {
RunOnMainThread.Cancel(autoResolveJobId);
autoResolveJobId = RunOnMainThread.Schedule(
() => {
lock (typeof(PlayServicesResolver)) {
autoResolving = true;
}
RunOnMainThread.PollOnUpdateUntilComplete(() => {
if (EditorApplication.isCompiling) return false;
// Only run AutoResolve() if we have a valid autoResolveJobId.
// If autoResolveJobId is 0, ScheduleResolve()
// has already been run and we should not run AutoResolve()
// again.
if (autoResolveJobId != 0) {
AutoResolve(() => {
lock (typeof(PlayServicesResolver)) {
autoResolving = false;
autoResolveJobId = 0;
if (autoResolving)
return;
Thaina marked this conversation as resolved.
Show resolved Hide resolved

RunOnMainThread.Cancel(autoResolveJobId);
Thaina marked this conversation as resolved.
Show resolved Hide resolved
autoResolveJobId = RunOnMainThread.Schedule(() => {
lock (typeof(PlayServicesResolver)) {
autoResolving = true;
}

DateTimeOffset delay = DateTimeOffset.Now.AddSeconds(Math.Min(30,GooglePlayServices.SettingsDialog.AutoResolutionDelay));
Thaina marked this conversation as resolved.
Show resolved Hide resolved
Thaina marked this conversation as resolved.
Show resolved Hide resolved
bool shouldResolve = true;
AlertModal alert = null;
RunOnMainThread.PollOnUpdateUntilComplete(() => {
stewartmiles marked this conversation as resolved.
Show resolved Hide resolved
if(delay > DateTimeOffset.Now)
Thaina marked this conversation as resolved.
Show resolved Hide resolved
Thaina marked this conversation as resolved.
Show resolved Hide resolved
{
if(alert == null)
{
alert = new AlertModal {
Title = "Resolve or Skip dependency?",
Message = "Auto Resolve Dependency in : " + (delay - DateTimeOffset.Now).TotalSeconds,
Ok = new AlertModal.LabeledAction {
Label = "Resolve",
DelegateAction = () => {
delay = DateTimeOffset.Now;
shouldResolve = true;
}
},
Cancel = new AlertModal.LabeledAction {
Label = "Skip",
DelegateAction = () => {
delay = DateTimeOffset.Now;
shouldResolve = false;
}
});
}
};

alert.Display();
}

if(alert != null)
{
alert.Message = "Auto Resolve Dependency in : " + (delay - DateTimeOffset.Now).TotalSeconds;
return false;
}
}

if (EditorApplication.isCompiling) return false;
// Only run AutoResolve() if we have a valid autoResolveJobId.
// If autoResolveJobId is 0, ScheduleResolve()
// has already been run and we should not run AutoResolve()
// again.

if (shouldResolve && autoResolveJobId != 0) {
AutoResolve(() => {
lock (typeof(PlayServicesResolver)) {
autoResolving = false;
autoResolveJobId = 0;
}
return true;
});
},
delayInMilliseconds);
}
}
return true;
});
},delayInMilliseconds);
}
}

Expand Down Expand Up @@ -1397,9 +1432,7 @@ private static void ScheduleResolve(bool forceResolution,
RunOnMainThread.Cancel(autoResolveJobId);
autoResolveJobId = 0;
// Remove any enqueued auto-resolve jobs.
resolutionJobs.RemoveAll((jobInfo) => {
return jobInfo != null && jobInfo.IsAutoResolveJob;
});
resolutionJobs.RemoveAll((jobInfo) => jobInfo == null || jobInfo.IsAutoResolveJob);
firstJob = resolutionJobs.Count == 0;

resolutionJobs.Add(
Expand Down
27 changes: 18 additions & 9 deletions source/PlayServicesResolver/src/SettingsDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private class Settings {
internal bool verboseLogging;
internal bool autoResolutionDisabledWarning;
internal bool promptBeforeAutoResolution;
internal int autoResolutionDelay;
internal bool useProjectSettings;

/// <summary>
Expand All @@ -55,6 +56,7 @@ internal Settings() {
verboseLogging = SettingsDialog.VerboseLogging;
autoResolutionDisabledWarning = SettingsDialog.AutoResolutionDisabledWarning;
promptBeforeAutoResolution = SettingsDialog.PromptBeforeAutoResolution;
autoResolutionDelay = Math.Min(Math.Max(0,SettingsDialog.AutoResolutionDelay),30);
Thaina marked this conversation as resolved.
Show resolved Hide resolved
useProjectSettings = SettingsDialog.UseProjectSettings;
}

Expand All @@ -72,6 +74,7 @@ internal void Save() {
SettingsDialog.VerboseLogging = verboseLogging;
SettingsDialog.AutoResolutionDisabledWarning = autoResolutionDisabledWarning;
SettingsDialog.PromptBeforeAutoResolution = promptBeforeAutoResolution;
SettingsDialog.AutoResolutionDelay = autoResolutionDelay;
SettingsDialog.UseProjectSettings = useProjectSettings;
}
}
Expand All @@ -84,10 +87,9 @@ internal void Save() {
private const string ExplodeAarsKey = Namespace + "ExplodeAars";
private const string PatchAndroidManifestKey = Namespace + "PatchAndroidManifest";
private const string VerboseLoggingKey = Namespace + "VerboseLogging";
private const string AutoResolutionDisabledWarningKey =
Namespace + "AutoResolutionDisabledWarning";
private const string PromptBeforeAutoResolutionKey =
Namespace + "PromptBeforeAutoResolution";
private const string AutoResolutionDisabledWarningKey = Namespace + "AutoResolutionDisabledWarning";
private const string PromptBeforeAutoResolutionKey = Namespace + "PromptBeforeAutoResolution";
private const string AutoResolutionDelayKey = Namespace + "AutoResolutionDelay";
private const string UseGradleDaemonKey = Namespace + "UseGradleDaemon";

// List of preference keys, used to restore default settings.
Expand Down Expand Up @@ -177,12 +179,15 @@ internal static bool AutoResolutionDisabledWarning {
/// display a prompt.
/// </summary>
internal static bool PromptBeforeAutoResolution {
set {
projectSettings.SetBool(PromptBeforeAutoResolutionKey, value);
}
set { projectSettings.SetBool(PromptBeforeAutoResolutionKey, value); }
get { return projectSettings.GetBool(PromptBeforeAutoResolutionKey, true); }
}

internal static int AutoResolutionDelay {
set { projectSettings.SetInt(AutoResolutionDelayKey, value); }
get { return projectSettings.GetInt(AutoResolutionDelayKey,0); }
}

internal static bool UseProjectSettings {
get { return projectSettings.UseProjectSettings; }
set { projectSettings.UseProjectSettings = value; }
Expand Down Expand Up @@ -351,8 +356,12 @@ public void OnGUI() {
EditorGUI.BeginDisabledGroup(!settings.enableAutoResolution);
GUILayout.BeginHorizontal();
GUILayout.Label("Prompt Before Auto-Resolution", EditorStyles.boldLabel);
settings.promptBeforeAutoResolution =
EditorGUILayout.Toggle(settings.promptBeforeAutoResolution);
settings.promptBeforeAutoResolution = EditorGUILayout.Toggle(settings.promptBeforeAutoResolution);
GUILayout.EndHorizontal();

GUILayout.BeginHorizontal();
GUILayout.Label("Auto Resolution Delay", EditorStyles.boldLabel);
settings.autoResolutionDelay = Math.Min(Math.Max(0,EditorGUILayout.IntField(settings.autoResolutionDelay),30));
GUILayout.EndHorizontal();
EditorGUI.EndDisabledGroup();

Expand Down