3 files changed, 71 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Offline.pm b/perllib/FixMyStreet/App/Controller/Offline.pm
index f5d895318..e65642899 100644
--- a/perllib/FixMyStreet/App/Controller/Offline.pm
+++ b/perllib/FixMyStreet/App/Controller/Offline.pm
@@ -1,5 +1,9 @@
 package FixMyStreet::App::Controller::Offline;
+
+use Image::Size;
+use JSON::MaybeXS;
 use Moose;
+use Path::Tiny;
 use namespace::autoclean;
 
 BEGIN { extends 'Catalyst::Controller'; }
@@ -10,19 +14,74 @@ FixMyStreet::App::Controller::Offline - Catalyst Controller
 
 =head1 DESCRIPTION
 
-Offline pages Catalyst Controller.
+Offline pages Catalyst Controller - service worker and appcache.
 
 =head1 METHODS
 
 =cut
 
+sub manifest: Path("/.well-known/manifest.webmanifest") {
+    my ($self, $c) = @_;
+    $c->res->content_type('application/manifest+json');
+
+    my $theme = $c->model('DB::ManifestTheme')->find({ cobrand => $c->cobrand->moniker });
+    unless ( $theme ) {
+        $theme = $c->model('DB::ManifestTheme')->new({
+            name => $c->stash->{site_name},
+            short_name => $c->stash->{site_name},
+            background_colour => '#ffffff',
+            theme_colour => '#ffd000',
+        });
+    }
+
+    my @icons;
+    my $uri = '/theme/' . $c->cobrand->moniker;
+    my $theme_path = path(FixMyStreet->path_to('web' . $uri));
+    $theme_path->visit(
+        sub {
+            my ($x, $y, $typ) = Image::Size::imgsize($_->stringify);
+            push @icons, {
+                src => join('/', $uri, $_->basename),
+                sizes => join('x', $x, $y),
+                type => $typ eq 'PNG' ? 'image/png' : $typ eq 'GIF' ? 'image/gif' : $typ eq 'JPG' ? 'image/jpeg' : '',
+            };
+        }
+    );
+
+    unless (@icons) {
+        push @icons,
+            { src => "/cobrands/fixmystreet/images/192.png", sizes => "192x192", type => "image/png" },
+            { src => "/cobrands/fixmystreet/images/512.png", sizes => "512x512", type => "image/png" };
+    }
+
+    my $data = {
+        name => $theme->name,
+        short_name => $theme->short_name,
+        background_color => $theme->background_colour,
+        theme_color => $theme->theme_colour,
+        icons => \@icons,
+        lang => $c->stash->{lang_code},
+        display => "minimal-ui",
+        start_url => "/?pwa",
+        scope => "/",
+    };
+    if ($c->cobrand->can('manifest')) {
+        $data = { %$data, %{$c->cobrand->manifest} };
+    }
+
+    my $json = encode_json($data);
+    $c->res->body($json);
+}
+
+# Old appcache functions below
+
 sub have_appcache : Private {
     my ($self, $c) = @_;
     return $c->user_exists && $c->user->has_body_permission_to('planned_reports')
         && !($c->user->is_superuser && FixMyStreet->staging_flag('enable_appcache', 0));
 }
 
-sub manifest : Path("/offline/appcache.manifest") {
+sub appcache_manifest : Path("/offline/appcache.manifest") {
     my ($self, $c) = @_;
     unless ($c->forward('have_appcache')) {
         $c->response->status(404);
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 8339ceede..ba82949c7 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -351,4 +351,13 @@ sub update_email_shortlisted_user {
     FixMyStreet::Cobrand::TfL::update_email_shortlisted_user($self, $update);
 }
 
+sub manifest {
+    return {
+        related_applications => [
+            { platform => 'play', url => 'https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet', id => 'org.mysociety.FixMyStreet' },
+            { platform => 'itunes', url => 'https://apps.apple.com/gb/app/fixmystreet/id297456545', id => 'id297456545' },
+        ],
+    };
+}
+
 1;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 5bb975104..1b7fba1bd 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -585,7 +585,7 @@ sub get_ok_json {
 
     # check that the content-type of response is correct
     croak "Response was not JSON"
-      unless $res->header('Content-Type') =~ m{^application/json\b};
+      unless $res->header('Content-Type') =~ m{^application/(?:[a-z]+\+)?json\b};
 
     return decode_json( $res->content );
 }