From 60ece9d4d2716e70b04edb986780cba418939083 Mon Sep 17 00:00:00 2001
From: sponge-transport <sponge-transport@mail.i2p>
Date: Fri, 14 Dec 2012 02:07:22 +0000
Subject: [PATCH] fix honeycomb notification annoyance
---
.../i2p/android/router/activity/InitActivities.java | 3 +++
src/net/i2p/android/router/activity/MainActivity.java | 10 ++++++----
src/net/i2p/android/router/service/StatusBar.java | 4 +++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/net/i2p/android/router/activity/InitActivities.java b/src/net/i2p/android/router/activity/InitActivities.java
index 1f41704d8..c7bdf0697 100644
--- a/src/net/i2p/android/router/activity/InitActivities.java
+++ b/src/net/i2p/android/router/activity/InitActivities.java
@@ -126,6 +126,9 @@ class InitActivities {
}
}
unzipResourceToDir(R.raw.certificates_zip, "certificates");
+ //File netDBDir = new File(myDir, "netDB");
+ //netDBDir.mkdir();
+ //unzipResourceToDir(R.raw.netdb_zip, "netDB");
}
// Set up the locations so settings can find them
diff --git a/src/net/i2p/android/router/activity/MainActivity.java b/src/net/i2p/android/router/activity/MainActivity.java
index 20b98f606..52512a890 100644
--- a/src/net/i2p/android/router/activity/MainActivity.java
+++ b/src/net/i2p/android/router/activity/MainActivity.java
@@ -24,6 +24,7 @@ public class MainActivity extends I2PActivityBase {
private Runnable _updater;
private Runnable _oneShotUpdate;
private String _savedStatus;
+ private String _ourVersion;
private boolean _keep = true;
private boolean _startPressed = false;
protected static final String PROP_NEW_INSTALL = "i2p.newInstall";
@@ -38,6 +39,7 @@ public class MainActivity extends I2PActivityBase {
init.debugStuff();
init.initialize();
super.onPostCreate(savedInstanceState);
+ _ourVersion = Util.getOurVersion(this);
}
/**
@@ -316,7 +318,7 @@ public class MainActivity extends I2PActivityBase {
TextView tv = (TextView) findViewById(R.id.main_status_text);
if(!Util.isConnected(this)) {
- tv.setText("No Internet connection is available");
+ tv.setText("Router version: " + _ourVersion + "\nNo Internet connection is available");
tv.setVisibility(View.VISIBLE);
} else if(ctx != null) {
if(_startPressed) {
@@ -398,13 +400,13 @@ public class MainActivity extends I2PActivityBase {
+ "\nMsg Delay: " + msgDelay
+ "\nUptime: " + uptime;
- _savedStatus = status + participate + details;
+ _savedStatus = "Router version: " + _ourVersion + "\n" + status + participate + details;
tv.setText(_savedStatus);
tv.setVisibility(View.VISIBLE);
} else {
// network but no router context
- tv.setText("");
- tv.setVisibility(View.INVISIBLE);
+ tv.setText("Router version: " + _ourVersion + "\n");
+ //tv.setVisibility(View.INVISIBLE);
/**
* **
* RouterService svc = _routerService; String status = "connected? "
diff --git a/src/net/i2p/android/router/service/StatusBar.java b/src/net/i2p/android/router/service/StatusBar.java
index d7056efa9..27c24fe1b 100644
--- a/src/net/i2p/android/router/service/StatusBar.java
+++ b/src/net/i2p/android/router/service/StatusBar.java
@@ -35,7 +35,9 @@ class StatusBar {
String text = "Starting I2P";
long now = System.currentTimeMillis();
notif = new Notification(icon, text, now);
- notif.flags |= /* Notification.FLAG_ONGOING_EVENT | */ Notification.FLAG_NO_CLEAR;
+ notif.flags |= Notification.FLAG_ONLY_ALERT_ONCE;
+ // notif.flags |= Notification.FLAG_ONGOING_EVENT;
+ notif.flags |= Notification.FLAG_NO_CLEAR;
intent = new Intent(ctx, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
--
GitLab