Skip to content

Commit

Permalink
Merge branch 'release/0.1.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrer757 committed Jun 12, 2018
2 parents 0177eae + 78e78a6 commit 4dc0dbc
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 34 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ Gradle:
```gradle
dependencies {
/* Include all modules */
implementation 'com.massivedisaster.adal:adal:0.1.19'
implementation 'com.massivedisaster.adal:adal:0.1.20'
/* Specific modules */
implementation 'com.massivedisaster.adal:adal-accounts:0.1.19'
implementation 'com.massivedisaster.adal:adal-adapters:0.1.19'
implementation 'com.massivedisaster.adal:adal-alarm:0.1.19'
implementation 'com.massivedisaster.adal:adal-analytics:0.1.19'
implementation 'com.massivedisaster.adal:adal-application-state:0.1.19'
implementation 'com.massivedisaster.adal:adal-bus:0.1.19'
implementation 'com.massivedisaster.adal:adal-fragments:0.1.19'
implementation 'com.massivedisaster.adal:adal-location:0.1.19'
implementation 'com.massivedisaster.adal:adal-network:0.1.19'
implementation 'com.massivedisaster.adal:adal-permissions:0.1.19'
implementation 'com.massivedisaster.adal:adal-utils:0.1.19'
implementation 'com.massivedisaster.adal:adal-connectivity:0.1.19'
implementation 'com.massivedisaster.adal:adal-dialogs:0.1.19'
implementation 'com.massivedisaster.adal:adal-accounts:0.1.20'
implementation 'com.massivedisaster.adal:adal-adapters:0.1.20'
implementation 'com.massivedisaster.adal:adal-alarm:0.1.20'
implementation 'com.massivedisaster.adal:adal-analytics:0.1.20'
implementation 'com.massivedisaster.adal:adal-application-state:0.1.20'
implementation 'com.massivedisaster.adal:adal-bus:0.1.20'
implementation 'com.massivedisaster.adal:adal-fragments:0.1.20'
implementation 'com.massivedisaster.adal:adal-location:0.1.20'
implementation 'com.massivedisaster.adal:adal-network:0.1.20'
implementation 'com.massivedisaster.adal:adal-permissions:0.1.20'
implementation 'com.massivedisaster.adal:adal-utils:0.1.20'
implementation 'com.massivedisaster.adal:adal-connectivity:0.1.20'
implementation 'com.massivedisaster.adal:adal-dialogs:0.1.20'
}
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public static void addAccount(final Context context, final String name, final St
* @param password The account password.
* @param token The account token.
*/
@SuppressWarnings(MISSING_PERMISSION)
public static void onFinished(String name, Context context, String password, String token) {
Account account = new Account(name, context.getPackageName());

Expand Down Expand Up @@ -147,7 +146,6 @@ private static void removeAccounts(final OnAccountListener onAccountListener, fi
* @param context The application context.
* @return The current account or null if there is no account.
*/
@SuppressWarnings(MISSING_PERMISSION)
@Nullable
public static Account getCurrentAccount(Context context) {
validateAccountManager();
Expand All @@ -167,20 +165,29 @@ public static Account getCurrentAccount(Context context) {
* @param account The account.
* @return The user password.
*/
@SuppressWarnings(MISSING_PERMISSION)
public static String getAccountPassword(Account account) {
validateAccountManager();
return sManager.getPassword(account);
}

/**
* Change the account password.
*
* @param account The account.
* @param password The new password.
*/
public static void setAccountPassword(Account account, String password) {
validateAccountManager();
sManager.setPassword(account, password);
}

/**
* Retrieve the account token.
*
* @param account The account account to take the token.
* @param context The application context.
* @return The account token.
*/
@SuppressWarnings(MISSING_PERMISSION)
@Nullable
public static String getCurrentToken(@NonNull Account account, Context context) {
validateAccountManager();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AppCompatDialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -41,7 +41,7 @@
/**
* Base class for dialogs.
*/
public class BaseDialogFragment extends DialogFragment {
public class BaseDialogFragment extends AppCompatDialogFragment {

private static final int INVALID_RESOURCE_ID = -1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ private KeyboardUtils() {

}

/**
* Show the keyboard
*
* @param context the context
*/
private static void show(Context context) {
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, HIDE_SOFT_INPUT_FLAGS_NONE);
}

/**
* Hide keyboard
*
Expand Down
2 changes: 1 addition & 1 deletion deploy/configuration.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"basePath": "../",
"version": "0.1.19",
"version": "0.1.20",
"extraTasks": [
"updateReadme"
],
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-accounts:0.1.19'
implementation 'com.massivedisaster.adal:adal-accounts:0.1.20'
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/adal-adapters.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-adapters:0.1.19'
implementation 'com.massivedisaster.adal:adal-adapters:0.1.20'
}
```
### Usage
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-alarm.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-alarm:0.1.19'
implementation 'com.massivedisaster.adal:adal-alarm:0.1.20'
}
```
### Usage
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-analytics.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-analytics:0.1.19'
implementation 'com.massivedisaster.adal:adal-analytics:0.1.20'
}
// ADD THIS AT THE BOTTOM
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-application-state.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-application-state:0.1.19'
implementation 'com.massivedisaster.adal:adal-application-state:0.1.20'
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/adal-bus.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-bus:0.1.19'
implementation 'com.massivedisaster.adal:adal-bus:0.1.20'
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/adal-connectivity.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-connectivity:0.1.19'
implementation 'com.massivedisaster.adal:adal-connectivity:0.1.20'
}
```
### Usage
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-dialogs.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-dialogs:0.1.19'
implementation 'com.massivedisaster.adal:adal-dialogs:0.1.20'
}
```
### Usage
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-fragments.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-fragments:0.1.19'
implementation 'com.massivedisaster.adal:adal-fragments:0.1.20'
}
```
### Usage
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-location.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-location:0.1.19'
implementation 'com.massivedisaster.adal:adal-location:0.1.20'
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/adal-network.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-network:0.1.19'
implementation 'com.massivedisaster.adal:adal-network:0.1.20'
}
```
### Usage
Expand Down
2 changes: 1 addition & 1 deletion docs/adal-permissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-permissions:0.1.19'
implementation 'com.massivedisaster.adal:adal-permissions:0.1.20'
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/adal-utils.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gradle:

```gradle
dependencies {
implementation 'com.massivedisaster.adal:adal-utils:0.1.19'
implementation 'com.massivedisaster.adal:adal-utils:0.1.20'
}
```
### Usage
Expand Down

0 comments on commit 4dc0dbc

Please sign in to comment.