From bb58bdeec92f97d4f609a24065f4f4ad883e9e8a Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 14 Apr 2016 18:00:44 +0600
Subject: [PATCH] enable steamcmd, fix steam mobile

---
 AndroidManifest.xml                                 | 6 +-----
 {unused => src}/in/celest/xash3d/SteamActivity.java | 0
 {unused => src}/in/celest/xash3d/SteamService.java  | 3 ++-
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename {unused => src}/in/celest/xash3d/SteamActivity.java (100%)
 rename {unused => src}/in/celest/xash3d/SteamService.java (99%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 902189a6..3382397a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,8 +23,7 @@
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
-		
-		<!--
+	
 		<activity android:name="in.celest.xash3d.SteamActivity"
 			android:label="Steam"
 			android:windowSoftInputMode="adjustResize"
@@ -37,7 +36,6 @@
 			</intent-filter>
 		
 		</activity>
-		-->
 		
 		<activity android:name="in.celest.xash3d.ShortcutActivity" 
 			android:label="@string/text_shortcut" 
@@ -80,9 +78,7 @@
 				<data android:scheme="package" />
 			</intent-filter>
 		</receiver>
-		<!--
 		<service android:name="in.celest.xash3d.SteamService" />
-		-->
 	</application>
 
 	<!-- Some devices with Android 2.2 should support native activity, it was in unstable hidden API -->
diff --git a/unused/in/celest/xash3d/SteamActivity.java b/src/in/celest/xash3d/SteamActivity.java
similarity index 100%
rename from unused/in/celest/xash3d/SteamActivity.java
rename to src/in/celest/xash3d/SteamActivity.java
diff --git a/unused/in/celest/xash3d/SteamService.java b/src/in/celest/xash3d/SteamService.java
similarity index 99%
rename from unused/in/celest/xash3d/SteamService.java
rename to src/in/celest/xash3d/SteamService.java
index 322a80f8..9b615075 100644
--- a/unused/in/celest/xash3d/SteamService.java
+++ b/src/in/celest/xash3d/SteamService.java
@@ -480,6 +480,7 @@ public class SteamService extends Service
 		// called on every char in line until return true
 		private boolean processPartial( String str ) throws CancelException, IOException
 		{
+			//printText(str);
 			{
 				if( str.contains( "Steam>" ) )
 				{
@@ -529,7 +530,7 @@ public class SteamService extends Service
 						processInput.write( (passwd + '\n').getBytes() );
 					return true;
 				}
-				if( str.startsWith("Steam Guard code:" ))
+				if( str.startsWith("Steam Guard code:" )|| str.startsWith("Two-factor code:") )
 				{
 					String passwd = promptDialog("Steam Guard code", "Please enter your SteamGuard code", true);
 					if( passwd == null )