Fire App Builder v1.0.2

AMZNMediaPlayerComponent/build.gradle

@@ -36,6 +36,9 @@ android {
             testCoverageEnabled true
         }
     }
+    packagingOptions {
+        pickFirst 'META-INF/LICENSE'
+    }
 }
 
 apply plugin: 'jacoco'

AMZNMediaPlayerComponent/src/main/AndroidManifest.xml

@@ -21,8 +21,7 @@ permissions and limitations under the License.
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
-            android:allowBackup="true"
-            android:label="@string/app_name">
+            android:allowBackup="true">
         <meta-data android:name="AMZNAP@AMZNPlayer"
                    android:value="[email protected]"/>
     </application>

AMZNMediaPlayerComponent/src/main/res/values/strings.xml

@@ -13,5 +13,4 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AMZNMediaPlayerComponent</string>
 </resources>

AdobepassAuthComponent/build.gradle

@@ -30,6 +30,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    packagingOptions {
+        pickFirst 'META-INF/LICENSE'
+    }
 }
 
 dependencies {

AdobepassAuthComponent/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@ permissions and limitations under the License.
     <application>
         <activity
                 android:name=".AdobeAuthenticationActivity"
-                android:label="@string/app_name"
                 android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"/>
 
         <meta-data android:name="AMZNAP@AdobepassAuthentication"

AdobepassAuthComponent/src/main/java/com/amazon/adobepass/auth/AdobeAuthenticationActivity.java

@@ -57,8 +57,22 @@ public void onSuccess(int statusCode, Header[] headers, JSONObject
 
                                 super.onSuccess(statusCode, headers, response);
                                 Log.i(TAG, "getAuthenticationTokenRequest succeeded");
-                                setResult(RESULT_OK);
                                 getSubmitButton().setEnabled(true);
+                                try {
+                                    String mvpd = response.getString(AuthenticationConstants.MVPD);
+                                    Log.d(TAG, "Logged in with the following provider: " + mvpd);
+                                    Intent intent = new Intent();
+                                    Bundle bundle = new Bundle();
+                                    bundle.putString(AuthenticationConstants.MVPD, mvpd);
+                                    setResult(RESULT_OK,
+                                              intent.putExtra(AuthenticationConstants.MVPD_BUNDLE,
+                                                              bundle));
+                                }
+                                catch (Exception e) {
+                                    Log.e(TAG, "There was an exception when getting mvpd name.", e);
+                                    setResult(RESULT_OK);
+                                }
+
                                 finish();
                             }
 
@@ -69,8 +83,7 @@ public void onFailure(int statusCode, Header[] headers, Throwable
 
                                 super.onFailure(statusCode, headers, throwable, errorResponse);
                                 Log.e(TAG, "There was an error authenticating the user on second " +
-                                              "screen. " +
-                                              "Status code: " + statusCode + " Error: " +
+                                              "screen. Status code: " + statusCode + " Error: " +
                                               errorResponse,
                                       throwable);
                                 getSubmitButton().setEnabled(true);
@@ -137,6 +150,7 @@ public void onFailure(int statusCode, Header[] headers, String
 
                     /**
                      * Actions to be performed on failure
+                     *
                      * @param statusCode status code of failure
                      * @param errorResponseMsg error message
                      * @param throwable throwable thrown
@@ -188,4 +202,4 @@ public void onPause() {
         AdobepassRestClient.cancelAllRequests();
     }
 
-}
+}

AdobepassAuthComponent/src/main/res/drawable/action_button_background.xml

@@ -24,4 +24,4 @@ permissions and limitations under the License.
     <item android:state_focused="true"
           android:drawable="@drawable/action_button_focused"/>
     <item android:drawable="@drawable/action_button_normal"/>
-</selector>
+</selector>

AdobepassAuthComponent/src/main/res/drawable/action_button_text_color_selector.xml

@@ -25,4 +25,4 @@ permissions and limitations under the License.
     <item
             android:color="@color/action_button_text_color"
             />
-</selector>
+</selector>

AdobepassAuthComponent/src/main/res/values-de/strings.xml

@@ -14,7 +14,6 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AdobepassAuthComponent</string>
     <string name="title_activity_adobe_authentication">Authentifizierung</string>
     <string name="adobepass_login_instruction_line_1">Gehen Sie zu Ihrem Computer oder Mobilgerät
     </string>

AdobepassAuthComponent/src/main/res/values-en/strings.xml

@@ -14,7 +14,6 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AdobepassAuthComponent</string>
     <string name="title_activity_adobe_authentication">Authentication</string>
     <string name="adobepass_login_instruction_line_1">Go to your computer or mobile device</string>
     <string name="adobepass_login_instruction_line_3">Enter the following case-sensitive code:

AdobepassAuthComponent/src/main/res/values-ja/strings.xml

@@ -14,7 +14,6 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AdobepassAuthComponent</string>
     <string name="title_activity_adobe_authentication">認証</string>
     <string name="adobepass_login_instruction_line_1">コンピューターまたはモバイル端末を使用します。</string>
     <string name="adobepass_login_instruction_line_3">以下のコード（大文字小文字を区別）を入力します。</string>

AdobepassAuthComponent/src/main/res/values/custom.xml

@@ -33,4 +33,4 @@ permissions and limitations under the License.
     <string name="adobepass_key_2">adobepass_random_key_2</string>
     <string name="adobepass_key_3">adobepass_random_key_3</string>
     <string name="adobepass_key_4">adobepass_random_key_4</string>
-</resources>
+</resources>

AdobepassAuthComponent/src/main/res/values/strings.xml

@@ -13,8 +13,6 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AdobepassAuthComponent</string>
-
     <string name="title_activity_adobe_authentication">Authentication</string>
     <string name="adobepass_login_instruction_line_1">Go to your computer or mobile device</string>
     <string name="adobepass_login_instruction_line_3">Enter the following case-sensitive code:

AdsInterface/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@ permissions and limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.amazon.ads">
-    <application android:allowBackup="true" android:label="@string/app_name">
+    <application android:allowBackup="true">
     </application>
 
 </manifest>

AdsInterface/src/main/res/values/strings.xml

@@ -13,5 +13,4 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AMZNAdsInterface</string>
 </resources>

AmazonInAppPurchaseComponent/build.gradle

@@ -31,6 +31,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    packagingOptions {
+        pickFirst  'META-INF/LICENSE'
+    }
 }
 
 dependencies {
@@ -74,4 +77,4 @@ dependencies {
     testCompile 'org.powermock:powermock-module-junit4-rule:1.6.2'
     testCompile 'org.powermock:powermock-api-mockito:1.6.2'
     testCompile 'org.powermock:powermock-classloading-xstream:1.6.2'
-}
+}

AmazonInAppPurchaseComponent/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@ permissions and limitations under the License.
 
     <application
             android:allowBackup="true"
-            android:label="@string/app_name"
             android:supportsRtl="true">
 
         <meta-data android:name="AMZNAP@AmazonInAppPurchase"

AmazonInAppPurchaseComponent/src/main/java/com/amazon/inapppurchase/AReceiptVerifier.java

@@ -56,4 +56,4 @@ public static AReceiptVerifier createInstance(Context context) {
      */
     public abstract String validateReceipt(Context context, String requestId, String sku, UserData
             userData, Receipt receipt, IPurchase.PurchaseListener listener);
-}
+}

AmazonInAppPurchaseComponent/src/main/res/values-de/strings.xml

@@ -14,5 +14,4 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AmazonInAppPurchaseComponent</string>
 </resources>

AmazonInAppPurchaseComponent/src/main/res/values-en/strings.xml

@@ -14,5 +14,4 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AmazonInAppPurchaseComponent</string>
 </resources>

AmazonInAppPurchaseComponent/src/main/res/values-ja/strings.xml

@@ -14,5 +14,4 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AmazonInAppPurchaseComponent</string>
 </resources>

AmazonInAppPurchaseComponent/src/main/res/values/custom.xml

@@ -17,4 +17,4 @@ permissions and limitations under the License.
     <string name="receipt_verification_service_iap">
         com.amazon.inapppurchase.DefaultReceiptVerificationService
     </string>
-</resources>
+</resources>

AmazonInAppPurchaseComponent/src/main/res/values/strings.xml

@@ -13,5 +13,4 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
 -->
 <resources>
-    <string name="app_name">AmazonInAppPurchaseComponent</string>
 </resources>

AmazonInAppPurchaseComponent/src/test/java/com/amazon/inapppurchase/AmazonInAppPurchaseTest.java

@@ -44,7 +44,7 @@
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.rule.PowerMockRule;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.content.Context;
@@ -66,8 +66,8 @@
 /**
  * Tests for {@link AmazonInAppPurchase}
  */
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 21)
+@RunWith(RobolectricTestRunner.class)
+@Config(constants = BuildConfig.class, sdk = 21, manifest = Config.NONE)
 @PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*", "org.json.*"})
 @PrepareForTest(PurchasingService.class)
 public class AmazonInAppPurchaseTest {

AnalyticsInterface/build.gradle

@@ -33,6 +33,9 @@ android {
             testCoverageEnabled true
         }
     }
+    packagingOptions {
+        pickFirst 'META-INF/LICENSE'
+    }
 }
 
 apply plugin: 'jacoco'
@@ -41,14 +44,13 @@ jacoco {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.1.1'
-
     // Set this dependency to use JUnit 4 rules
     androidTestCompile 'com.android.support.test:rules:0.4.1'
-
     androidTestCompile('com.android.support.test:runner:0.4.1') {
         exclude module: 'support-annotations'
     }
+    compile project(':Utils')
 }