dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update main activity to clean up intents

This commit is contained in:
n8fr8 2017-10-16 23:37:15 -04:00
parent a5015dc691
commit 1e2074c818
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/torproject/android/OrbotMainActivity.java
View File

@ -543,6 +543,7 @@ public class OrbotMainActivity extends AppCompatActivity
try try
{ {
String aboutText = readFromAssets(this,"LICENSE"); String aboutText = readFromAssets(this,"LICENSE");
aboutText = aboutText.replace("\n","<br/>");
aboutOther.setText(Html.fromHtml(aboutText)); aboutOther.setText(Html.fromHtml(aboutText));
} }
catch (Exception e){} catch (Exception e){}
@ -747,7 +748,6 @@ public class OrbotMainActivity extends AppCompatActivity
// Get intent, action and MIME type // Get intent, action and MIME type
Intent intent = getIntent(); Intent intent = getIntent();
String action = intent.getAction(); String action = intent.getAction();
Log.d(TAG, "handleIntents " + action);
if (action == null) if (action == null)
return; return;
@ -797,21 +797,6 @@ public class OrbotMainActivity extends AppCompatActivity
startTor(); 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; break;
case Intent.ACTION_VIEW: case Intent.ACTION_VIEW: