remove google+ and readability sharing support since they're dead

bower.json

@@ -1,38 +1,37 @@
 {
-  "name": "commafeed",
+    "name": "commafeed",
-  "version": "2.0.0",
+    "version": "2.0.0",
-  "dependencies": {
+    "dependencies": {
-    "jquery": "2.1.3",
+        "jquery": "2.1.3",
-    "jquery-ui": "1.10.3",
+        "jquery-ui": "1.10.3",
-    "jquery-mousewheel": "3.1.12",
+        "jquery-mousewheel": "3.1.12",
-    "lodash": "3.4.0",
+        "lodash": "3.4.0",
-    "bootstrap": "3.3.2",
+        "bootstrap": "3.3.2",
-    "font-awesome": "3.2.1",
+        "font-awesome": "3.2.1",
-    "angular": "1.3.14",
+        "angular": "1.3.14",
-    "angular-resource": "1.3.14",
+        "angular-resource": "1.3.14",
-    "angular-route": "1.3.14",
+        "angular-route": "1.3.14",
-    "angular-sanitize": "1.3.14",
+        "angular-sanitize": "1.3.14",
-    "angular-touch": "1.3.14",
+        "angular-touch": "1.3.14",
-    "angular-animate": "1.3.14",
+        "angular-animate": "1.3.14",
-    "angular-ui-router": "0.2.13",
+        "angular-ui-router": "0.2.13",
-    "angular-ui-utils": "0.1.0",
+        "angular-ui-utils": "0.1.0",
-    "angular-ui-select2": "0.0.5",
+        "angular-ui-select2": "0.0.5",
-    "angular-bootstrap": "0.2.0",
+        "angular-bootstrap": "0.2.0",
-    "angular-loading-bar": "0.6.0",
+        "angular-loading-bar": "0.6.0",
-    "angular-translate": "2.6.1",
+        "angular-translate": "2.6.1",
-    "angular-translate-loader-static-files": "2.6.1",
+        "angular-translate-loader-static-files": "2.6.1",
-    "ngInfiniteScroll": "1.0.0",
+        "ngInfiniteScroll": "1.0.0",
-    "ng-grid": "2.0.6",
+        "ng-grid": "2.0.6",
-    "mousetrap": "1.4.6",
+        "mousetrap": "1.4.6",
-    "momentjs": "2.9.0",
+        "momentjs": "2.9.0",
-    "devicejs": "0.2.4",
+        "devicejs": "0.2.4",
-    "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
+        "zocial-less": "1.0.0",
-    "zocial-less": "1.0.0",
+        "swagger-ui": "2.1.0",
-    "swagger-ui": "2.1.0",
+        "tinycon": "0.6.5"
-    "tinycon": "0.6.5"
+    },
-  },
+    "resolutions": {
-  "resolutions": {
+        "angular": "1.3.14",
-    "angular": "1.3.14",
+        "angular-translate": "2.6.1"
-    "angular-translate": "2.6.1"
+    }
-  }
 }

src/main/app/templates/feeds.view.html

@@ -161,14 +161,6 @@
                         >
                             <i class="icon-twitter"></i>
                         </a>
-                        <a
-                            href="https://plus.google.com/share?url={{entry.url|escape}}"
-                            title="Google+"
-                            popup
-                            ng-if="settingsService.settings.googleplus"
-                        >
-                            <i class="icon-google-plus"></i>
-                        </a>
                         <a
                             href="http://www.tumblr.com/share/link?url={{entry.url|escape}}&name={{entry.title|escape}}"
                             title="Tumblr"
@@ -201,14 +193,6 @@
                         >
                             <i class="icon-buffer"></i>
                         </a>
-                        <a
-                            href="http://www.readability.com/save?url={{entry.url|escape}}"
-                            title="Readability"
-                            popup
-                            ng-if="settingsService.settings.readability"
-                        >
-                            <i class="icon-couch"></i>
-                        </a>
                     </span>
 
                     <span class="tags-panel">

src/main/app/templates/settings.html

@@ -75,13 +75,6 @@
                                         Twitter
                                     </label>
                                 </div>
-                                <div>
-                                    <label>
-                                        <input type="checkbox" name="googleplus" ng-model="settings.googleplus" />
-                                        <i class="icon-google-plus"></i>
-                                        Google+
-                                    </label>
-                                </div>
                                 <div>
                                     <label>
                                         <input type="checkbox" name="tumblr" ng-model="settings.tumblr" />
@@ -110,13 +103,6 @@
                                         Buffer
                                     </label>
                                 </div>
-                                <div>
-                                    <label>
-                                        <input type="checkbox" name="readability" ng-model="settings.readability" />
-                                        <i class="icon-couch"></i>
-                                        Readability
-                                    </label>
-                                </div>
                             </div>
                         </div>
                     </div>

src/main/java/com/commafeed/backend/model/UserSettings.java

@@ -71,11 +71,9 @@ public class UserSettings extends AbstractModel {
 	private boolean gmail;
 	private boolean facebook;
 	private boolean twitter;
-	private boolean googleplus;
 	private boolean tumblr;
 	private boolean pocket;
 	private boolean instapaper;
 	private boolean buffer;
-	private boolean readability;
 
 }

src/main/java/com/commafeed/frontend/model/Settings.java

@@ -50,9 +50,6 @@ public class Settings implements Serializable {
 	@ApiModelProperty(required = true)
 	private boolean twitter;
 
-	@ApiModelProperty(required = true)
-	private boolean googleplus;
-
 	@ApiModelProperty(required = true)
 	private boolean tumblr;
 
@@ -64,8 +61,4 @@ public class Settings implements Serializable {
 
 	@ApiModelProperty(required = true)
 	private boolean buffer;
-
-	@ApiModelProperty(required = true)
-	private boolean readability;
-
 }

src/main/java/com/commafeed/frontend/resource/UserREST.java

@@ -96,12 +96,10 @@ public class UserREST {
 			s.setGmail(settings.isGmail());
 			s.setFacebook(settings.isFacebook());
 			s.setTwitter(settings.isTwitter());
-			s.setGoogleplus(settings.isGoogleplus());
 			s.setTumblr(settings.isTumblr());
 			s.setPocket(settings.isPocket());
 			s.setInstapaper(settings.isInstapaper());
 			s.setBuffer(settings.isBuffer());
-			s.setReadability(settings.isReadability());
 
 			s.setScrollMarks(settings.isScrollMarks());
 			s.setTheme(settings.getTheme());
@@ -119,12 +117,10 @@ public class UserREST {
 			s.setGmail(true);
 			s.setFacebook(true);
 			s.setTwitter(true);
-			s.setGoogleplus(true);
 			s.setTumblr(true);
 			s.setPocket(true);
 			s.setInstapaper(true);
 			s.setBuffer(true);
-			s.setReadability(true);
 
 			s.setScrollMarks(true);
 			s.setLanguage("en");
@@ -160,12 +156,10 @@ public class UserREST {
 		s.setGmail(settings.isGmail());
 		s.setFacebook(settings.isFacebook());
 		s.setTwitter(settings.isTwitter());
-		s.setGoogleplus(settings.isGoogleplus());
 		s.setTumblr(settings.isTumblr());
 		s.setPocket(settings.isPocket());
 		s.setInstapaper(settings.isInstapaper());
 		s.setBuffer(settings.isBuffer());
-		s.setReadability(settings.isReadability());
 
 		userSettingsDAO.saveOrUpdate(s);
 		return Response.ok().build();
@@ -235,7 +229,9 @@ public class UserREST {
 			sessionHelper.setLoggedInUser(registeredUser);
 			return Response.ok().build();
 		} catch (final IllegalArgumentException e) {
-			return Response.status(422).entity(new ValidationErrorMessage(ImmutableList.of(e.getMessage()))).type(MediaType.TEXT_PLAIN)
+			return Response.status(422)
+					.entity(new ValidationErrorMessage(ImmutableList.of(e.getMessage())))
+					.type(MediaType.TEXT_PLAIN)
 					.build();
 		}
 	}
@@ -273,8 +269,10 @@ public class UserREST {
 			return Response.ok().build();
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
-			return Response.status(Status.INTERNAL_SERVER_ERROR).entity("could not send email: " + e.getMessage())
+			return Response.status(Status.INTERNAL_SERVER_ERROR)
-					.type(MediaType.TEXT_PLAIN).build();
+					.entity("could not send email: " + e.getMessage())
+					.type(MediaType.TEXT_PLAIN)
+					.build();
 		}
 	}
 
@@ -287,8 +285,11 @@ public class UserREST {
 	}
 
 	private String callbackUrl(User user, String publicUrl) throws Exception {
-		return new URIBuilder(publicUrl).addParameter("email", user.getEmail()).addParameter("token", user.getRecoverPasswordToken())
+		return new URIBuilder(publicUrl).addParameter("email", user.getEmail())
-				.build().toURL().toString();
+				.addParameter("token", user.getRecoverPasswordToken())
+				.build()
+				.toURL()
+				.toString();
 	}
 
 	@Path("/passwordResetCallback")

src/main/resources/changelogs/db.changelog-2.6.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+	<changeSet id="remove-googleplus-readability" author="athou">
+		<dropColumn tableName="USERSETTINGS" columnName="googleplus" />
+		<dropColumn tableName="USERSETTINGS" columnName="readability" />
+	</changeSet>
+
+</databaseChangeLog>

src/main/resources/migrations.xml

@@ -16,5 +16,6 @@
 	<include file="changelogs/db.changelog-1.5.xml" />
 	<include file="changelogs/db.changelog-2.1.xml" />
 	<include file="changelogs/db.changelog-2.2.xml" />
+	<include file="changelogs/db.changelog-2.6.xml" />
 	
 </databaseChangeLog>