Skip to content

Commit e6eba91

Browse files
committed
Added quit option
Added setting to not start at boot
1 parent 51750ff commit e6eba91

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+55
-36
lines changed

bin/Techinc-Notify.apk

-831 Bytes
Binary file not shown.

bin/classes.dex

352 Bytes
Binary file not shown.
98 Bytes
Binary file not shown.
Binary file not shown.
-120 Bytes
Binary file not shown.
Binary file not shown.
10 Bytes
Binary file not shown.
Binary file not shown.
77 Bytes
Binary file not shown.
33 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
98 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
7 Bytes
Binary file not shown.
993 Bytes

bin/res/drawable-hdpi/ic_launcher.png

-8.98 KB
Binary file not shown.
1.7 KB
601 Bytes

bin/res/drawable-ldpi/ic_launcher.png

-2.6 KB
Binary file not shown.
1.16 KB
764 Bytes
929 Bytes
1.18 KB
1.43 KB

bin/resources.ap_

-1.28 KB
Binary file not shown.

gen/nl/techinc/notify/R.java

+30-24
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@ public static final class attr {
1212
}
1313
public static final class drawable {
1414
public static final int closed=0x7f020000;
15-
public static final int ic_launcher=0x7f020001;
16-
public static final int ic_menu_refresh=0x7f020002;
17-
public static final int ic_menu_settings=0x7f020003;
18-
public static final int open=0x7f020004;
19-
public static final int techinclogo=0x7f020005;
20-
public static final int techinclogo_mono=0x7f020006;
21-
public static final int techinclogo_white=0x7f020007;
15+
public static final int ic_action_refresh=0x7f020001;
16+
public static final int ic_launcher=0x7f020002;
17+
public static final int ic_menu_quit=0x7f020003;
18+
public static final int ic_menu_refresh=0x7f020004;
19+
public static final int ic_menu_settings=0x7f020005;
20+
public static final int open=0x7f020006;
21+
public static final int techinclogo=0x7f020007;
22+
public static final int techinclogo_mono=0x7f020008;
23+
public static final int techinclogo_white=0x7f020009;
2224
}
2325
public static final class id {
2426
public static final int label_text=0x7f070000;
27+
public static final int menu_quit=0x7f070008;
2528
public static final int menu_refresh=0x7f070006;
2629
public static final int menu_settings=0x7f070007;
2730
public static final int monitoring=0x7f070003;
@@ -39,40 +42,43 @@ public static final class menu {
3942
}
4043
public static final class string {
4144
public static final int app_name=0x7f050000;
45+
public static final int boot_label=0x7f05001c;
46+
public static final int boot_summary=0x7f05001d;
4247
public static final int button_refresh=0x7f05000a;
4348
public static final int closed=0x7f050008;
44-
public static final int debug_label=0x7f05001b;
45-
public static final int debug_summary=0x7f05001c;
46-
public static final int dialog_message=0x7f050022;
49+
public static final int debug_label=0x7f05001e;
50+
public static final int debug_summary=0x7f05001f;
51+
public static final int dialog_message=0x7f050025;
4752
public static final int disable=0x7f05000e;
4853
public static final int enable=0x7f05000f;
4954
public static final int main_text=0x7f050005;
5055
public static final int menu_settings=0x7f050011;
51-
public static final int monitor_label=0x7f050019;
52-
public static final int monitor_summary=0x7f05001a;
56+
public static final int monitor_label=0x7f05001a;
57+
public static final int monitor_summary=0x7f05001b;
5358
public static final int monitoring_disabled=0x7f05000c;
5459
public static final int monitoring_enabled=0x7f05000b;
5560
public static final int monitoring_unsupported=0x7f05000d;
56-
public static final int no=0x7f050021;
61+
public static final int no=0x7f050024;
5762
public static final int notify_closed=0x7f050002;
5863
public static final int notify_open=0x7f050001;
5964
public static final int open=0x7f050007;
60-
public static final int ringtone_label=0x7f050017;
61-
public static final int ringtone_summary=0x7f050018;
65+
public static final int quit=0x7f050012;
66+
public static final int ringtone_label=0x7f050018;
67+
public static final int ringtone_summary=0x7f050019;
6268
public static final int status=0x7f050006;
63-
public static final int suppress_label=0x7f050013;
64-
public static final int suppress_summary=0x7f050014;
69+
public static final int suppress_label=0x7f050014;
70+
public static final int suppress_summary=0x7f050015;
6571
public static final int ticker_closed=0x7f050004;
6672
public static final int ticker_open=0x7f050003;
6773
public static final int unknown=0x7f050009;
6874
public static final int updating=0x7f050010;
69-
public static final int url_desc=0x7f05001f;
70-
public static final int url_label=0x7f05001d;
71-
public static final int url_summary=0x7f05001e;
72-
public static final int vibrate_label=0x7f050015;
73-
public static final int vibrate_summary=0x7f050016;
74-
public static final int warning=0x7f050012;
75-
public static final int yes=0x7f050020;
75+
public static final int url_desc=0x7f050022;
76+
public static final int url_label=0x7f050020;
77+
public static final int url_summary=0x7f050021;
78+
public static final int vibrate_label=0x7f050016;
79+
public static final int vibrate_summary=0x7f050017;
80+
public static final int warning=0x7f050013;
81+
public static final int yes=0x7f050023;
7682
}
7783
public static final class xml {
7884
public static final int notify_appwidget_info=0x7f040000;
1.32 KB

res/drawable-hdpi/ic_launcher.png

-9.18 KB
Binary file not shown.

res/drawable-hdpi/ic_menu_quit.png

2.42 KB
686 Bytes

res/drawable-ldpi/ic_launcher.png

-2.67 KB
Binary file not shown.

res/drawable-ldpi/ic_menu_quit.png

1.21 KB
914 Bytes

res/drawable-mdpi/ic_menu_quit.png

1.26 KB
1.78 KB

res/drawable-xhdpi/ic_menu_quit.png

2.24 KB

res/menu/main.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<item android:id="@+id/menu_refresh"
44
android:title="@string/button_refresh"
55
android:showAsAction="ifRoom"
6-
android:icon="@drawable/ic_menu_refresh" />
6+
android:icon="@drawable/ic_action_refresh" />
77
<item android:id="@+id/menu_settings"
88
android:title="@string/menu_settings"
99
android:showAsAction="never"
1010
android:icon="@drawable/ic_menu_settings" />
11+
<item android:id="@+id/menu_quit" android:title="@string/quit" android:icon="@drawable/ic_menu_quit" android:showAsAction="never"></item>
1112
</menu>

res/values/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525
<string name="enable">Enable</string>
2626
<string name="updating">Updating…</string>
2727
<string name="menu_settings">Settings</string>
28+
<string name="quit">Quit</string>
2829

2930
<string name="warning">Warning</string>
3031
<string name="suppress_label">Suppress closed</string><string name="suppress_summary">Only notify when space opens</string>
3132
<string name="vibrate_label">Vibrate</string><string name="vibrate_summary">Vibrate device on notification</string>
3233
<string name="ringtone_label">Notification tone</string><string name="ringtone_summary">Select a sound to play with the notification</string>
3334
<string name="monitor_label">Monitor for changes</string><string name="monitor_summary">Register with the server to receive push updates</string>
35+
<string name="boot_label">Run at boot</string><string name="boot_summary">Register to receive updates when the device starts up</string>
3436
<string name="debug_label">Debug mode</string><string name="debug_summary">Enable debug mode.</string>
3537
<string name="url_label">Server URL</string><string name="url_summary">Change the server that the device registers with</string>
3638
<string name="url_desc">For debugging purposes only.\nDo not touch unless you know what you are doing.</string>

res/xml/preferences.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
33
<CheckBoxPreference android:title="@string/suppress_label" android:summary="@string/suppress_summary" android:key="suppress"/><CheckBoxPreference android:title="@string/vibrate_label" android:summary="@string/vibrate_summary" android:key="vibrate"/>
44
<RingtonePreference android:ringtoneType="notification" android:title="@string/ringtone_label" android:showDefault="true" android:summary="@string/ringtone_summary" android:showSilent="true" android:key="ringtone"/>
5-
<CheckBoxPreference android:key="gcm_enabled" android:title="@string/monitor_label" android:summary="@string/monitor_summary" android:enabled="true" android:defaultValue="true"/><CheckBoxPreference android:summary="@string/debug_summary" android:key="debug" android:title="@string/debug_label" /><EditTextPreference android:summary="@string/url_summary" android:title="@string/url_label" android:defaultValue="http://techinc.notefaction.jit.su" android:key="url" android:dialogMessage="@string/url_desc" android:dialogTitle="@string/warning" android:dependency="debug"/>
5+
<CheckBoxPreference android:key="gcm_enabled" android:title="@string/monitor_label" android:summary="@string/monitor_summary" android:enabled="true" android:defaultValue="true"/>
6+
<CheckBoxPreference android:key="boot" android:title="@string/boot_label" android:summary="@string/boot_summary" android:enabled="true" android:defaultValue="true"/>
7+
<CheckBoxPreference android:summary="@string/debug_summary" android:key="debug" android:title="@string/debug_label" /><EditTextPreference android:summary="@string/url_summary" android:title="@string/url_label" android:defaultValue="http://techinc.notefaction.jit.su" android:key="url" android:dialogMessage="@string/url_desc" android:dialogTitle="@string/warning" android:dependency="debug"/>
68
</PreferenceScreen>

src/nl/techinc/notify/BootClass.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class BootClass extends BroadcastReceiver {
1616
@Override
1717
public void onReceive(Context context, Intent intent) {
1818
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
19+
if(!sharedPreferences.getBoolean("boot", true))
20+
return;
1921
if(sharedPreferences.getBoolean("gcm_enabled", false))
2022
{
2123
final String regId = GCMRegistrar.getRegistrationId(context);
@@ -26,7 +28,8 @@ public void onReceive(Context context, Intent intent) {
2628
}
2729
return;
2830
}
29-
GCMRegistrar.unregister(context);
31+
if(GCMRegistrar.isRegistered(context))
32+
GCMRegistrar.unregister(context);
3033
}
3134

3235
}

src/nl/techinc/notify/GCMIntentService.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ protected void onMessage(Context context, Intent intent) {
5252
if(!stateStr.equals("closed") && !stateStr.equals("open"))
5353
return;
5454
boolean state;
55-
long msgTime;
56-
long curTime = System.currentTimeMillis() / 1000L;
57-
String timeStr = intent.getStringExtra("time").trim().replace(".", "");
58-
msgTime = Long.parseLong(timeStr) / 1000L;
55+
double msgTime;
56+
double curTime = System.currentTimeMillis() / 1000D;
57+
msgTime = Double.parseDouble(intent.getStringExtra("time").trim()) / 1000D;
5958
boolean changed = true;
6059
if(curTime - msgTime > 3600)
6160
{
@@ -141,6 +140,7 @@ public void run() {
141140
}
142141

143142
@Override
143+
144144
protected void onUnregistered(Context context, String regId) {
145145
if(key == null)
146146
{

src/nl/techinc/notify/NotifyActivity.java

+5
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public void run()
7777
SpaceState.updateState(context);
7878
}
7979
}).start();
80+
setMonitor();
8081
}
8182

8283
public void setMonitor()
@@ -123,6 +124,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
123124
case R.id.menu_settings:
124125
startActivity(new Intent(this, SettingsActivity.class));
125126
return true;
127+
case R.id.menu_quit:
128+
if(GCMRegistrar.isRegistered(this))
129+
GCMRegistrar.unregister(this);
130+
finish();
126131
default:
127132
return super.onOptionsItemSelected(item);
128133
}

src/nl/techinc/notify/NotifyApp.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public class NotifyApp extends Application {
66
private boolean spaceState;
77
private boolean updating;
8-
private long lastUpdated;
8+
private double lastUpdated;
99

1010
public boolean getSpaceState() {
1111
return spaceState;
@@ -23,11 +23,11 @@ public void setUpdating(boolean updating) {
2323
this.updating = updating;
2424
}
2525

26-
public long getLastUpdated() {
26+
public double getLastUpdated() {
2727
return lastUpdated;
2828
}
2929

30-
public void setLastUpdated(long lastUpdated) {
31-
this.lastUpdated = lastUpdated;
30+
public void setLastUpdated(double msgTime) {
31+
this.lastUpdated = msgTime;
3232
}
3333
}

src/nl/techinc/notify/SpaceState.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static boolean updateState(Context context)
2121
{
2222
NotifyApp application = (NotifyApp) context.getApplicationContext();
2323
boolean state = application.getSpaceState();
24-
long curTime = System.currentTimeMillis() / 1000L;
24+
double curTime = System.currentTimeMillis() / 1000D;
2525
if(curTime - application.getLastUpdated() > 60)
2626
{
2727
application.setLastUpdated(curTime);

0 commit comments

Comments
 (0)