Fixing some exception messages and making copyright notices more cons…

…istent.

Summary: Adding "manage" to exception messages that include publish permissions, and making copyright notices more consistent.

Test Plan: builds.

Reviewers: mmarucheck, clang

Reviewed By: mmarucheck

CC: msdkexp@, platform-diffs@lists

Differential Revision: https://phabricator.fb.com/D655007

Task ID: 1939738

facebook/src/com/facebook/FacebookDialogException.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/FacebookException.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/GetTokenClient.java

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2012 Facebook
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.facebook;
 
 

facebook/src/com/facebook/Response.java

@@ -260,6 +260,7 @@ static FileLruCache getResponseCache() {
         return responseCache;
     }
 
+    @SuppressWarnings("resource")
     static List<Response> fromHttpConnection(HttpURLConnection connection, RequestBatch requests) {
         InputStream stream = null;
 

facebook/src/com/facebook/Session.java

@@ -389,7 +389,7 @@ public final List<String> getPermissions() {
      *
      * @param openRequest the open request, can be null only if the Session is in the
      *                    {@link SessionState#CREATED_TOKEN_LOADED CREATED_TOKEN_LOADED} state
-     * @throws FacebookException if any publish permissions are requested
+     * @throws FacebookException if any publish or manage permissions are requested
      */
     public final void openForRead(OpenRequest openRequest) {
         open(openRequest, SessionAuthorizationType.READ);
@@ -408,7 +408,7 @@ public final void openForRead(OpenRequest openRequest) {
      * </p>
      * <p>
      * The permissions associated with the openRequest passed to this method must
-     * be publish permissions only and must be non-empty. Any read permissions
+     * be publish or manage permissions only and must be non-empty. Any read permissions
      * will result in a warning, and may fail during server-side authorization.
      * </p>
      * <p>
@@ -493,15 +493,15 @@ public final void requestNewReadPermissions(NewPermissionsRequest newPermissions
 
     /**
      * <p>
-     * Issues a request to add new publish permissions to the Session.
+     * Issues a request to add new publish or manage permissions to the Session.
      * </p>
      * <p>
      * If successful, this will update the set of permissions on this session to
      * match the newPermissions. If this fails, the Session remains unchanged.
      * </p>
      * <p>
      * The permissions associated with the newPermissionsRequest passed to this method must
-     * be publish permissions only and must be non-empty. Any read permissions
+     * be publish or manage permissions only and must be non-empty. Any read permissions
      * will result in a warning, and may fail during server-side authorization.
      * </p>
      *
@@ -1024,7 +1024,7 @@ private void validateLoginBehavior(AuthorizationRequest request) {
     private void validatePermissions(AuthorizationRequest request, SessionAuthorizationType authType) {
         if (request == null || Utility.isNullOrEmpty(request.getPermissions())) {
             if (SessionAuthorizationType.PUBLISH.equals(authType)) {
-                throw new FacebookException("Cannot request publish authorization with no permissions.");
+                throw new FacebookException("Cannot request publish or manage authorization with no permissions.");
             }
             return; // nothing to check
         }
@@ -1033,14 +1033,14 @@ private void validatePermissions(AuthorizationRequest request, SessionAuthorizat
                 if (SessionAuthorizationType.READ.equals(authType)) {
                     throw new FacebookException(
                             String.format(
-                                    "Cannot pass a publish permission (%s) to a request for read authorization",
+                                    "Cannot pass a publish or manage permission (%s) to a request for read authorization",
                                     permission));
                 }
             } else {
                 if (SessionAuthorizationType.PUBLISH.equals(authType)) {
                     Log.w(TAG,
                             String.format(
-                                    "Should not pass a read permission (%s) to a request for publish authorization",
+                                    "Should not pass a read permission (%s) to a request for publish or manage authorization",
                                     permission));
                 }
             }

facebook/src/com/facebook/SharedPreferencesTokenCachingStrategy.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -390,7 +390,7 @@ private void deserializeKey(String key, Bundle bundle)
         } else if (valueType.equals(TYPE_ENUM)) {
             try {
                 String enumType = json.getString(JSON_VALUE_ENUM_TYPE);
-                @SuppressWarnings({ "unchecked", "rawTypes" })
+                @SuppressWarnings({ "unchecked", "rawtypes" })
                 Class<? extends Enum> enumClass = (Class<? extends Enum>) Class.forName(enumType);
                 @SuppressWarnings("unchecked")
                 Enum<?> enumValue = Enum.valueOf(enumClass, json.getString(JSON_VALUE));

facebook/src/com/facebook/TokenCachingStrategy.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/UiLifecycleHelper.java

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2012 Facebook
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.facebook;
 
 import android.app.Activity;

facebook/src/com/facebook/android/AsyncFacebookRunner.java

@@ -1,5 +1,5 @@
-/*
- * Copyright 2010 Facebook, Inc.
+/**
+ * Copyright 2010-present Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/android/DialogError.java

@@ -1,5 +1,5 @@
-/*
- * Copyright 2010 Facebook, Inc.
+/**
+ * Copyright 2010-present Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/android/Facebook.java

@@ -1,5 +1,5 @@
-/*
- * Copyright 2010 Facebook, Inc.
+/**
+ * Copyright 2010-present Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/android/FacebookError.java

@@ -1,5 +1,5 @@
-/*
- * Copyright 2010 Facebook, Inc.
+/**
+ * Copyright 2010-present Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/android/FbDialog.java

@@ -1,5 +1,5 @@
-/*
- * Copyright 2010 Facebook, Inc.
+/**
+ * Copyright 2010-present Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/android/Util.java

@@ -1,5 +1,5 @@
-/*
- * Copyright 2010 Facebook, Inc.
+/**
+ * Copyright 2010-present Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/internal/CacheableRequestBatch.java

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2012 Facebook
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.facebook.internal;
 
 import com.facebook.Request;

facebook/src/com/facebook/internal/FileLruCache.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/internal/SessionAuthorizationType.java

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2012 Facebook
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.facebook.internal;
 
 /**

facebook/src/com/facebook/model/GraphLocation.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/model/GraphMultiResult.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/model/GraphObject.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/model/GraphObjectList.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/model/GraphPlace.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/model/GraphUser.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/model/JsonUtil.java

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2012 Facebook
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.facebook.model;
 
 import android.annotation.SuppressLint;

facebook/src/com/facebook/model/OpenGraphAction.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/widget/ImageResponseCache.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/widget/LoginButton.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.facebook.widget;
 
 import android.app.Activity;

facebook/src/com/facebook/widget/ProfilePictureView.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/src/com/facebook/widget/UserSettingsFragment.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.facebook.widget;
 
 import android.graphics.Bitmap;

facebook/tests/src/com/facebook/AsyncRequestTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.facebook;
 
 import android.graphics.Bitmap;

facebook/tests/src/com/facebook/BatchRequestTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.facebook;
 
 import android.graphics.Bitmap;

facebook/tests/src/com/facebook/GraphRequestTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.facebook;
 
 import android.test.suitebuilder.annotation.LargeTest;

facebook/tests/src/com/facebook/RequestTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.facebook;
 
 import android.graphics.Bitmap;

facebook/tests/src/com/facebook/model/GraphObjectFactoryTests.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facebook/tests/src/com/facebook/model/JsonUtilTests.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 Facebook, Inc.
+ * Copyright 2012 Facebook
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.