gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-11 23:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #292

Browse Source
This commit is contained in:
Mario Danic 2018-09-06 20:30:01 +02:00
parent 37a4043302
commit 3e6b5f8382
10 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/misc.xml
View File

@ -5,11 +5,12 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables"> <option name="myNullables">
<value> <value>
<list size="4"> <list size="5">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list> </list>
</value> </value>
</option> </option>
@ -30,7 +31,4 @@
<component name="ProjectType"> <component name="ProjectType">
<option name="id" value="Android" /> <option name="id" value="Android" />
</component> </component>
<component name="SvnBranchConfigurationManager">
<option name="mySupportsUserInfoFilter" value="true" />
</component>
</project> </project>

2
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -156,7 +156,7 @@ public class CallNotificationController extends BaseController {
this.originalBundle = args; this.originalBundle = args;
credentials = ApiUtils.getCredentials(userBeingCalled.getUserId(), userBeingCalled.getToken()); credentials = ApiUtils.getCredentials(userBeingCalled.getUsername(), userBeingCalled.getToken());
} }
@Override @Override

2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -200,7 +200,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
if (conversationUser.getUserId().equals("?")) { if (conversationUser.getUserId().equals("?")) {
credentials = null; credentials = null;
} else { } else {
credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken()); credentials = ApiUtils.getCredentials(conversationUser.getUsername(), conversationUser.getToken());
} }
if (args.containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { if (args.containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {

2
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -208,7 +208,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
currentUser = userUtils.getCurrentUser(); currentUser = userUtils.getCurrentUser();
if (currentUser != null) { if (currentUser != null) {
credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); credentials = ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken());
} }
if (adapter == null) { if (adapter == null) {

2
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -183,7 +183,7 @@ public class ConversationsListController extends BaseController implements Searc
currentUser = userUtils.getCurrentUser(); currentUser = userUtils.getCurrentUser();
if (currentUser != null) { if (currentUser != null) {
credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); credentials = ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken());
} }
if (currentUser != null) { if (currentUser != null) {

2
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -182,7 +182,7 @@ public class SettingsController extends BaseController {
private void getCurrentUser() { private void getCurrentUser() {
currentUser = userUtils.getCurrentUser(); currentUser = userUtils.getCurrentUser();
credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken()); credentials = ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken());
} }
@Override @Override

2
app/src/main/java/com/nextcloud/talk/jobs/AccountRemovalWorker.java
View File

@ -84,7 +84,7 @@ public class AccountRemovalWorker extends Worker {
PushConfigurationState.class); PushConfigurationState.class);
PushConfigurationState finalPushConfigurationState = pushConfigurationState; PushConfigurationState finalPushConfigurationState = pushConfigurationState;
credentials = ApiUtils.getCredentials(userEntity.getUserId(), userEntity.getToken()); credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new
JavaNetCookieJar(new CookieManager())).build()).build().create(NcApi.class); JavaNetCookieJar(new CookieManager())).build()).build().create(NcApi.class);

2
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -402,7 +402,7 @@ public class NotificationWorker extends Worker {
decryptedPushMessage = LoganSquare.parse(new String(decryptedSubject), decryptedPushMessage = LoganSquare.parse(new String(decryptedSubject),
DecryptedPushMessage.class); DecryptedPushMessage.class);
credentials = ApiUtils.getCredentials(signatureVerification.getUserEntity().getUserId(), credentials = ApiUtils.getCredentials(signatureVerification.getUserEntity().getUsername(),
signatureVerification.getUserEntity().getToken()); signatureVerification.getUserEntity().getToken());
ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new ncApi = retrofit.newBuilder().client(okHttpClient.newBuilder().cookieJar(new

2
app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
View File

@ -93,7 +93,7 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
if (!TextUtils.isEmpty(query)) { if (!TextUtils.isEmpty(query)) {
adapter.setFilter(query.toString()); adapter.setFilter(query.toString());
ncApi.getMentionAutocompleteSuggestions(ApiUtils.getCredentials(currentUser.getUserId(), currentUser ncApi.getMentionAutocompleteSuggestions(ApiUtils.getCredentials(currentUser.getUsername(), currentUser
.getToken()), ApiUtils.getUrlForMentionSuggestions(currentUser.getBaseUrl(), roomToken), .getToken()), ApiUtils.getUrlForMentionSuggestions(currentUser.getBaseUrl(), roomToken),
query.toString(), null) query.toString(), null)
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())

2
app/src/main/java/com/nextcloud/talk/utils/PushUtils.java
View File

@ -260,7 +260,7 @@ public class PushUtils {
queryMap.put("devicePublicKey", publicKey); queryMap.put("devicePublicKey", publicKey);
queryMap.put("proxyServer", proxyServer); queryMap.put("proxyServer", proxyServer);
credentials = ApiUtils.getCredentials(userEntity.getUserId(), userEntity.getToken()); credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
String finalCredentials = credentials; String finalCredentials = credentials;
ncApi.registerDeviceForNotificationsWithNextcloud( ncApi.registerDeviceForNotificationsWithNextcloud(