Merge branch 'release/v8.1.2.0'

Aptoide · Feb 15, 2017 · 5f7b6d6 · 5f7b6d6
2 parents e10ca96 + ccb4bd1
commit 5f7b6d6
Show file tree

Hide file tree

Showing 778 changed files with 15,741 additions and 13,163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@ proguard/
 ### Aptoide team custom excludes
 *.iml
 .idea/*
-!.idea/codeStyleSettings.xml
+#.idea/codeStyleSettings.xml
 .DS_Store
 captures/
 

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/aptoide_accountmanager/build.gradle b/aptoide_accountmanager/build.gradle
@@ -19,6 +19,9 @@ android {
 
     buildConfigField "String", "GMS_SERVER_ID", "\"" + project.GMS_SERVER_ID + "\""
     resValue "string", "facebook_app_id", "\"" + project.FACEBOOK_APP_ID + "\""
+
+    buildConfigField "String", "BACKUP_SIGNATURE", "\"" + project.BACKUP_SIGNATURE + "\""
+    buildConfigField "String", "UPLOADER_SIGNATURE", "\"" + project.UPLOADER_SIGNATURE + "\""
   }
 
   lintOptions {
@@ -43,7 +46,6 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
-
 }
 
 dependencies {

diff --git a/aptoide_accountmanager/src/main/AndroidManifest.xml b/aptoide_accountmanager/src/main/AndroidManifest.xml
@@ -8,8 +8,8 @@
   <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
   <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.CAMERA"/>
 
   <uses-feature
       android:name="android.hardware.camera"
@@ -45,9 +45,9 @@
 
     <activity
         android:name=".CreateStoreActivity"
+        android:configChanges="orientation|screenSize"
         android:exported="true"
         android:screenOrientation="nosensor"
-        android:configChanges="orientation|screenSize"
         android:windowSoftInputMode="stateHidden"
         />
 

diff --git a/aptoide_accountmanager/src/main/java/cm/aptoide/accountmanager/AccountAuthenticator.java b/aptoide_accountmanager/src/main/java/cm/aptoide/accountmanager/AccountAuthenticator.java
@@ -25,6 +25,23 @@ public AccountAuthenticator(Context context) {
     super(context);
   }
 
+  @Override
+  public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+    return null;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
+      String authTokenType, String[] requiredFeatures, Bundle options)
+      throws NetworkErrorException {
+    Logger.d(TAG, "Adding account: type=" + accountType);
+
+    return createAuthActivityIntentBundle(response, accountType, requiredFeatures, authTokenType,
+        null, options);
+  }
+
   protected Bundle createAuthActivityIntentBundle(AccountAuthenticatorResponse response,
       String accountType, String[] requiredFeatures, String authTokenType, String password,
       Bundle options) {
@@ -48,23 +65,6 @@ protected Intent createAuthActivityIntent(AccountAuthenticatorResponse response,
     return intent;
   }
 
-  @Override
-  public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-    return null;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
-      String authTokenType, String[] requiredFeatures, Bundle options)
-      throws NetworkErrorException {
-    Logger.d(TAG, "Adding account: type=" + accountType);
-
-    return createAuthActivityIntentBundle(response, accountType, requiredFeatures, authTokenType,
-        null, options);
-  }
-
   @Override public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
       Bundle options) throws NetworkErrorException {
     return null;