From cd805ab6f8a0dd7e93f353ced5024c68b32fc87b Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Tue, 5 Sep 2017 18:59:05 +0300
Subject: [PATCH 1/3] Add last update in osm live

---
 OsmAnd/res/values/styles.xml                  | 14 ++++++---
 .../plus/liveupdates/OsmLiveActivity.java     | 31 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 00c50f503c..de7c7e272e 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -365,20 +365,24 @@
     <style name="Widget.Styled.ActionBarLight" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="background">@color/actionbar_light_color</item>
         <item name="android:background">@color/actionbar_light_color</item>
-        <item name="titleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
-        <item name="subtitleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
+        <item name="titleTextStyle">@style/Widget.Styled.LightActionBarTitle</item>
+        <item name="subtitleTextStyle">@style/Widget.Styled.LightActionBarSubtitle</item>
         <item name="actionBarWidgetTheme">@style/Theme.AppCompat</item>
 
-        <item name="android:titleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
-        <item name="android:subtitleTextStyle">@style/Widget.Styled.LightActionBarHeader</item>
+        <item name="android:titleTextStyle">@style/Widget.Styled.LightActionBarTitle</item>
+        <item name="android:subtitleTextStyle">@style/Widget.Styled.LightActionBarSubtitle</item>
         <item name="android:actionBarWidgetTheme">@style/Theme.AppCompat</item>
         <item name="elevation">0dp</item>
     </style>
 
-    <style name="Widget.Styled.LightActionBarHeader" parent="@android:style/TextAppearance">
+    <style name="Widget.Styled.LightActionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/color_white</item>
     </style>
 
+    <style name="Widget.Styled.LightActionBarSubtitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
+        <item name="android:textColor">@color/white_80_transparent</item>
+    </style>
+
     <style name="WhiteActionMode" parent="@style/Widget.AppCompat.ActionMode">
         <item name="titleTextStyle">@style/WhiteActionModeTitleTextStyle</item>
         <item name="android:titleTextStyle">@style/WhiteActionModeTitleTextStyle</item>
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
index 7acf7f6cd9..d920543a7c 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
@@ -2,14 +2,17 @@ package net.osmand.plus.liveupdates;
 
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 
+import net.osmand.AndroidNetworkUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
@@ -25,6 +28,7 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 	private LiveUpdatesFragmentPagerAdapter pagerAdapter;
 	private InAppHelper inAppHelper;
 	private boolean openSubscription;
+	private static final String URL = "http://builder.osmand.net/osmlive/.proc_timestamp";
 
 	public InAppHelper getInAppHelper() {
 		return inAppHelper;
@@ -43,6 +47,33 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 			inAppHelper = null;
 		}
 
+		new AsyncTask<Void, Void, String>() {
+
+			@Override
+			protected void onPreExecute() {
+			}
+
+			@Override
+			protected String doInBackground(Void... params) {
+				try {
+					return AndroidNetworkUtils.sendRequest(getMyApplication(), URL, null, "Requesting map updates info...", false, false);
+				} catch (Exception e) {
+					LOG.error("Error: " + "Requesting map updates info error", e);
+					return null;
+				}
+			}
+
+			@Override
+			protected void onPostExecute(String response) {
+				if (response != null) {
+					ActionBar actionBar = getSupportActionBar();
+					if (actionBar != null) {
+						actionBar.setSubtitle(response);
+					}
+				}
+			}
+		}.execute();
+
 		Intent intent = getIntent();
 		if (intent != null && intent.getExtras() != null) {
 			openSubscription = intent.getExtras().getBoolean(OPEN_SUBSCRIPTION_INTENT_PARAM, false);

From c7b994430be5ca0c42f9649e6d18c78b2aa690df Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 6 Sep 2017 13:24:34 +0300
Subject: [PATCH 2/3] Show time in current timezone

---
 .../plus/liveupdates/OsmLiveActivity.java       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
index d920543a7c..5b1713cc17 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
@@ -22,6 +22,12 @@ import net.osmand.plus.inapp.InAppHelper;
 
 import org.apache.commons.logging.Log;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
 public class OsmLiveActivity extends AbstractDownloadActivity implements DownloadIndexesThread.DownloadEvents {
 	private final static Log LOG = PlatformUtil.getLog(OsmLiveActivity.class);
 	public final static String OPEN_SUBSCRIPTION_INTENT_PARAM = "open_subscription_intent_param";
@@ -68,7 +74,16 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 				if (response != null) {
 					ActionBar actionBar = getSupportActionBar();
 					if (actionBar != null) {
-						actionBar.setSubtitle(response);
+						SimpleDateFormat source = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
+						source.setTimeZone(TimeZone.getTimeZone("UTC"));
+						SimpleDateFormat dest = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
+						dest.setTimeZone(TimeZone.getDefault());
+						try {
+							Date parsed = source.parse(response);
+							actionBar.setSubtitle(dest.format(parsed));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
 					}
 				}
 			}

From fe3700a460228801b7813c4301214cd2aad77f44 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 6 Sep 2017 13:30:56 +0300
Subject: [PATCH 3/3] Change url

---
 OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
index 5b1713cc17..0de509e747 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
@@ -34,7 +34,7 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 	private LiveUpdatesFragmentPagerAdapter pagerAdapter;
 	private InAppHelper inAppHelper;
 	private boolean openSubscription;
-	private static final String URL = "http://builder.osmand.net/osmlive/.proc_timestamp";
+	private static final String URL = "https://osmand.net/api/osmlive_status";
 
 	public InAppHelper getInAppHelper() {
 		return inAppHelper;