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

Fix an issue with favorites

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-23 11:34:43 +02:00
parent a299a230c6
commit 92951252b3
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
View File

@ -37,6 +37,7 @@ import com.nextcloud.talk.utils.ssl.MagicKeyManager;
import com.nextcloud.talk.utils.ssl.MagicTrustManager; import com.nextcloud.talk.utils.ssl.MagicTrustManager;
import com.nextcloud.talk.utils.ssl.SSLSocketFactoryCompat; import com.nextcloud.talk.utils.ssl.SSLSocketFactoryCompat;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.CookieManager; import java.net.CookieManager;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@ -46,8 +47,10 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException; import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.inject.Singleton;
import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509KeyManager;
@ -79,6 +82,7 @@ public class RestModule {
return retrofit.create(NcApi.class); return retrofit.create(NcApi.class);
} }
@Singleton
@Provides @Provides
Proxy provideProxy(AppPreferences appPreferences) { Proxy provideProxy(AppPreferences appPreferences) {
if (!TextUtils.isEmpty(appPreferences.getProxyType()) && !"No proxy".equals(appPreferences.getProxyType()) if (!TextUtils.isEmpty(appPreferences.getProxyType()) && !"No proxy".equals(appPreferences.getProxyType())
@ -109,11 +113,13 @@ public class RestModule {
return retrofitBuilder.build(); return retrofitBuilder.build();
} }
@Singleton
@Provides @Provides
MagicTrustManager provideMagicTrustManager() { MagicTrustManager provideMagicTrustManager() {
return new MagicTrustManager(); return new MagicTrustManager();
} }
@Singleton
@Provides @Provides
MagicKeyManager provideKeyManager(AppPreferences appPreferences, UserUtils userUtils) { MagicKeyManager provideKeyManager(AppPreferences appPreferences, UserUtils userUtils) {
KeyStore keyStore = null; KeyStore keyStore = null;
@ -139,6 +145,7 @@ public class RestModule {
return null; return null;
} }
@Singleton
@Provides @Provides
SSLSocketFactoryCompat provideSslSocketFactoryCompat(MagicKeyManager keyManager, MagicTrustManager SSLSocketFactoryCompat provideSslSocketFactoryCompat(MagicKeyManager keyManager, MagicTrustManager
magicTrustManager) { magicTrustManager) {
@ -151,11 +158,22 @@ public class RestModule {
} }
@Provides @Provides
Cache provideCache() { Cache provideCache(UserUtils userUtils) {
int cacheSize = 128 * 1024 * 1024; // 128 MB int cacheSize = 128 * 1024 * 1024; // 128 MB
return new Cache(NextcloudTalkApplication.getSharedApplication().getCacheDir(), cacheSize); String userId = "";
if (userUtils.getCurrentUser() != null) {
userId = Long.toString(userUtils.getCurrentUser().getId());
} else {
Random r = new Random( System.currentTimeMillis() );
userId = "nc-temp-" + (10000 + r.nextInt(20000));
}
return new Cache(new File(NextcloudTalkApplication.getSharedApplication().getCacheDir() + "/" +
userId), cacheSize);
} }
@Singleton
@Provides @Provides
Dispatcher provideDispatcher() { Dispatcher provideDispatcher() {
Dispatcher dispatcher = new Dispatcher(); Dispatcher dispatcher = new Dispatcher();
@ -265,7 +283,7 @@ public class RestModule {
private volatile Proxy proxy; private volatile Proxy proxy;
private AppPreferences appPreferences; private AppPreferences appPreferences;
public GetProxyRunnable(AppPreferences appPreferences) { GetProxyRunnable(AppPreferences appPreferences) {
this.appPreferences = appPreferences; this.appPreferences = appPreferences;
} }
@ -282,7 +300,7 @@ public class RestModule {
} }
} }
public Proxy getProxyValue() { Proxy getProxyValue() {
return proxy; return proxy;
} }
} }

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

@ -189,7 +189,7 @@ public class ApiUtils {
} }
public static String getUrlForConversationFavorites(String baseUrl, String roomToken) { public static String getUrlForConversationFavorites(String baseUrl, String roomToken) {
return baseUrl + ocsApiVersion + "/room/" + roomToken + "/favorite"; return baseUrl + ocsApiVersion + spreedApiVersion + "/room/" + roomToken + "/favorite";
} }
public static String getUrlForNotificationWithId(String baseUrl, String notificationId) { public static String getUrlForNotificationWithId(String baseUrl, String notificationId) {