From 3bb40aa08ff43fe2d4e035fa1f147ea252173dff Mon Sep 17 00:00:00 2001 From: mttronc Date: Tue, 30 Jan 2018 20:10:24 +0100 Subject: [PATCH 1/3] Fix ID display in settings At compilation the default value in the xml file is handled as a float. This is a know issue. This commit circumvents it. Fixes #26 --- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/pref_server.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab2fba0d..66da9d62 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,6 +21,7 @@ Use custom server Server URL Custom Sender ID + 509878466986 Delete all notifications Re-register with server Advanced; for if you don\'t trust our server and/or you want to host it yourself diff --git a/app/src/main/res/xml/pref_server.xml b/app/src/main/res/xml/pref_server.xml index c8250125..4fc6e821 100644 --- a/app/src/main/res/xml/pref_server.xml +++ b/app/src/main/res/xml/pref_server.xml @@ -21,7 +21,7 @@ android:dependency="server_use_custom" android:key="server_custom_sender_id" android:title="@string/pref_server_custom_sender_id" - android:defaultValue="509878466986" + android:defaultValue="@string/pref_server_custom_sender_default" android:selectAllOnFocus="true" android:singleLine="true" android:inputType="number"/> From b44f0d270d1a27e68515a84e1974471d7a4e3f9a Mon Sep 17 00:00:00 2001 From: mttronc Date: Tue, 30 Jan 2018 20:17:12 +0100 Subject: [PATCH 2/3] Fix times in message list The Date object stores a UTC timestamp. It will automatically be converted to the correct local time. Fixes #27 --- app/src/main/java/io/Pushjet/api/PushListAdapter.java | 2 +- .../main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/io/Pushjet/api/PushListAdapter.java b/app/src/main/java/io/Pushjet/api/PushListAdapter.java index 92fe56d5..668a025e 100644 --- a/app/src/main/java/io/Pushjet/api/PushListAdapter.java +++ b/app/src/main/java/io/Pushjet/api/PushListAdapter.java @@ -70,7 +70,7 @@ public View getView(int position, View convertView, ViewGroup parent) { if (title.equals("")) title = entries.get(position).getService().getName(); String description = entries.get(position).getMessage(); - Date pushDate = entries.get(position).getLocalTimestamp(); + Date pushDate = entries.get(position).getTimestamp(); Bitmap icon = entries.get(position).getService().getIconBitmapOrDefault(context); dateText.setText(this.df.format(pushDate)); diff --git a/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java b/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java index bdc38674..187fe2e8 100644 --- a/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java +++ b/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java @@ -77,10 +77,6 @@ public void setTimestamp(Date timestamp) { this.timestamp = timestamp; } - public Date getLocalTimestamp() { - return new Date(timestamp.getTime() + TimeZone.getDefault().getOffset(System.currentTimeMillis())); - } - public String getTitleOrName() { String ret = title; if (ret.equals("")) From a49f85be864d0bc983d390d93ba0c2e72d461e2b Mon Sep 17 00:00:00 2001 From: mttronc Date: Tue, 6 Feb 2018 20:33:42 +0100 Subject: [PATCH 3/3] Update zxing-android and remove unnecessary dependencies New zxing-android-embedded version supports Android 6 permissions. zxing-android-integration got merged into -embedded and already brings com.google.zxing:core as a dependency. --- app/build.gradle | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c81209e3..08668afe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,22 +24,16 @@ android { } repositories { + jcenter() mavenCentral() - maven { url "http://dl.bintray.com/journeyapps/maven" } -// maven { url 'http://clinker.47deg.com/nexus/content/groups/public' } } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.android.gms:play-services:8.4.0' - compile 'com.google.zxing:core:2.2' - compile 'com.journeyapps:zxing-android-embedded:2.3.0@aar' - compile 'com.journeyapps:zxing-android-integration:2.3.0@aar' compile 'com.android.support:support-v4:24.0.0-alpha2' compile 'com.android.support:appcompat-v7:24.0.0-alpha2' - compile 'com.google.android.gms:play-services-ads:8.4.0' - compile 'com.google.android.gms:play-services-auth:8.4.0' compile 'com.google.android.gms:play-services-gcm:8.4.0' + compile 'com.journeyapps:zxing-android-embedded:3.4.0' } allprojects {