From ccbbc3c368f58c13aea5a9860e1f96d888b516af Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 25 Jan 2014 20:21:11 +0000
Subject: [PATCH] Added link from Log Activity to Logging settings
TODO: Fix link for Preference headers
---
TODO | 1 -
.../i2p/android/router/log/LogActivity.java | 34 +++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/TODO b/TODO
index 158f6cd6d..c937599b1 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,6 @@
- Change navbar first-open mechanics to match Android design docs
- Pull out internal I2P web browser, or disable it
- What will this require elsewhere?
-- Add link from Log Activity to Logging settings
# Short-term
diff --git a/src/net/i2p/android/router/log/LogActivity.java b/src/net/i2p/android/router/log/LogActivity.java
index 7b4d9a30b..2802a6918 100644
--- a/src/net/i2p/android/router/log/LogActivity.java
+++ b/src/net/i2p/android/router/log/LogActivity.java
@@ -2,9 +2,14 @@ package net.i2p.android.router.log;
import net.i2p.android.router.I2PActivityBase;
import net.i2p.android.router.R;
+import net.i2p.android.router.SettingsActivity;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.widget.ArrayAdapter;
import android.widget.SpinnerAdapter;
@@ -68,6 +73,35 @@ public class LogActivity extends I2PActivityBase implements
}
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.activity_main_actions, menu);
+ // Help menu not needed (yet), hide
+ menu.findItem(R.id.menu_help).setVisible(false);
+ return super.onCreateOptionsMenu(menu);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_settings:
+ Intent intent = new Intent(LogActivity.this, SettingsActivity.class);
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+ intent.setAction("net.i2p.android.router.PREFS_LOGGING");
+ } else { // TODO: Test if this works, fix if not
+ Bundle args = new Bundle();
+ args.putString("settings", "logging");
+ intent.putExtras(args);
+ }
+ startActivity(intent);
+ return true;
+
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
--
GitLab