[tor-commits] [orbot/master] amek sure wizard only is shown once on start (not twice!)

[n8fr8 at torproject.org]

commit 707bca4dafa4bb12b01d5e94638939863fc2cbfc
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Jun 6 08:56:32 2014 -0400

    amek sure wizard only is shown once on start (not twice!)
---
 src/org/torproject/android/Orbot.java                |    3 +--
 src/org/torproject/android/wizard/TipsAndTricks.java |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java
index 17b80b3..956171f 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -537,8 +537,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
 	@Override
 	protected void onNewIntent(Intent intent) {
 		
-		super.onNewIntent(intent);
-		
+		setIntent(intent);
 		handleIntents();
 	}
 
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index c6ee05b..222d950 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -200,7 +200,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			
 			public void onClick(View v) {
 				finish();
-				startActivityForResult(new Intent(TipsAndTricks.this, Orbot.class), 1);
+				startActivity(new Intent(TipsAndTricks.this, Orbot.class));
 			}
 		});
 	}