summaryrefslogtreecommitdiff
path: root/src/se/leap/bitmaskclient/AboutActivity.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-03-26 12:15:09 +0100
committerParménides GV <parmegv@sdf.org>2014-03-26 12:15:09 +0100
commitc946bed3e63d9d271cd08d4c33e564a157908c36 (patch)
treee5869abb9eb941e340a7968b34225c7a58199161 /src/se/leap/bitmaskclient/AboutActivity.java
parent0323676ef98b12af3c7ce20bf4101bdc900ef654 (diff)
parent8a754e30011bf60ac9bff2cf987c3fa263b3d924 (diff)
Merge branch 'develop' into release-0.5
Diffstat (limited to 'src/se/leap/bitmaskclient/AboutActivity.java')
-rw-r--r--src/se/leap/bitmaskclient/AboutActivity.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/se/leap/bitmaskclient/AboutActivity.java b/src/se/leap/bitmaskclient/AboutActivity.java
index a3320c81..6d025422 100644
--- a/src/se/leap/bitmaskclient/AboutActivity.java
+++ b/src/se/leap/bitmaskclient/AboutActivity.java
@@ -18,7 +18,7 @@ public class AboutActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ super.onCreate(savedInstanceState);
setContentView(R.layout.about);
TextView ver = (TextView) findViewById(R.id.version);
@@ -34,15 +34,7 @@ public class AboutActivity extends Activity {
ver.setText(getString(R.string.version_info,name,version));
-
- TextView translation = (TextView) findViewById(R.id.translation);
-
- // Don't print a text for myself
- if ( getString(R.string.translationby).contains("Arne Schwabe"))
- translation.setVisibility(TextView.INVISIBLE);
- else
- translation.setText(R.string.translationby);
- setResult(VIEWED);
+ setResult(VIEWED);
}
}