Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ANON-Public
orbot
Commits
1e2074c8
Commit
1e2074c8
authored
Oct 16, 2017
by
n8fr8
Browse files
update main activity to clean up intents
parent
a5015dc6
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/torproject/android/OrbotMainActivity.java
View file @
1e2074c8
...
...
@@ -543,6 +543,7 @@ public class OrbotMainActivity extends AppCompatActivity
try
{
String
aboutText
=
readFromAssets
(
this
,
"LICENSE"
);
aboutText
=
aboutText
.
replace
(
"\n"
,
"<br/>"
);
aboutOther
.
setText
(
Html
.
fromHtml
(
aboutText
));
}
catch
(
Exception
e
){}
...
...
@@ -747,7 +748,6 @@ public class OrbotMainActivity extends AppCompatActivity
// Get intent, action and MIME type
Intent
intent
=
getIntent
();
String
action
=
intent
.
getAction
();
Log
.
d
(
TAG
,
"handleIntents "
+
action
);
if
(
action
==
null
)
return
;
...
...
@@ -797,21 +797,6 @@ public class OrbotMainActivity extends AppCompatActivity
startTor
();
//never allow backgrounds start from this type of intent start
//app devs who want background starts, can use the service intents
/**
if (Prefs.allowBackgroundStarts())
{
Intent resultIntent;
if (lastStatusIntent == null) {
resultIntent = new Intent(intent);
} else {
resultIntent = lastStatusIntent;
}
resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus);
setResult(RESULT_OK, resultIntent);
finish();
}*/
break
;
case
Intent
.
ACTION_VIEW
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment