gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

reformat code

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-10-26 13:26:53 +02:00
parent e5788016cf
commit 0e3c24b24a
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ public class RestModule {
@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())
&& !TextUtils.isEmpty(appPreferences.getProxyHost())) { && !TextUtils.isEmpty(appPreferences.getProxyHost())) {
GetProxyRunnable getProxyRunnable = new GetProxyRunnable(appPreferences); GetProxyRunnable getProxyRunnable = new GetProxyRunnable(appPreferences);
Thread getProxyThread = new Thread(getProxyRunnable); Thread getProxyThread = new Thread(getProxyRunnable);
getProxyThread.start(); getProxyThread.start();
@ -112,10 +112,10 @@ public class RestModule {
@Provides @Provides
Retrofit provideRetrofit(OkHttpClient httpClient) { Retrofit provideRetrofit(OkHttpClient httpClient) {
Retrofit.Builder retrofitBuilder = new Retrofit.Builder() Retrofit.Builder retrofitBuilder = new Retrofit.Builder()
.client(httpClient) .client(httpClient)
.baseUrl("https://nextcloud.com") .baseUrl("https://nextcloud.com")
.addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io())) .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
.addConverterFactory(LoganSquareConverterFactory.create()); .addConverterFactory(LoganSquareConverterFactory.create());
return retrofitBuilder.build(); return retrofitBuilder.build();
} }
@ -208,13 +208,13 @@ public class RestModule {
httpClient.proxy(proxy); httpClient.proxy(proxy);
if (appPreferences.getProxyCredentials() && if (appPreferences.getProxyCredentials() &&
!TextUtils.isEmpty(appPreferences.getProxyUsername()) && !TextUtils.isEmpty(appPreferences.getProxyUsername()) &&
!TextUtils.isEmpty(appPreferences.getProxyPassword())) { !TextUtils.isEmpty(appPreferences.getProxyPassword())) {
httpClient.proxyAuthenticator(new HttpAuthenticator( httpClient.proxyAuthenticator(new HttpAuthenticator(
Credentials.basic( Credentials.basic(
appPreferences.getProxyUsername(), appPreferences.getProxyUsername(),
appPreferences.getProxyPassword(), appPreferences.getProxyPassword(),
StandardCharsets.UTF_8), StandardCharsets.UTF_8),
"Proxy-Authorization")); "Proxy-Authorization"));
} }
} }
@ -229,7 +229,7 @@ public class RestModule {
httpClient.addInterceptor(loggingInterceptor); httpClient.addInterceptor(loggingInterceptor);
} else if (context.getResources().getBoolean(R.bool.nc_is_debug)) { } else if (context.getResources().getBoolean(R.bool.nc_is_debug)) {
HttpLoggingInterceptor.Logger fileLogger = HttpLoggingInterceptor.Logger fileLogger =
s -> LoggingUtils.INSTANCE.writeLogEntryToFile(context, s); s -> LoggingUtils.INSTANCE.writeLogEntryToFile(context, s);
HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(fileLogger); HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(fileLogger);
loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
loggingInterceptor.redactHeader("Authorization"); loggingInterceptor.redactHeader("Authorization");
@ -247,11 +247,11 @@ public class RestModule {
public Response intercept(@NonNull Chain chain) throws IOException { public Response intercept(@NonNull Chain chain) throws IOException {
Request original = chain.request(); Request original = chain.request();
Request request = original.newBuilder() Request request = original.newBuilder()
.header("User-Agent", ApiUtils.getUserAgent()) .header("User-Agent", ApiUtils.getUserAgent())
.header("Accept", "application/json") .header("Accept", "application/json")
.header("OCS-APIRequest", "true") .header("OCS-APIRequest", "true")
.method(original.method(), original.body()) .method(original.method(), original.body())
.build(); .build();
return chain.proceed(request); return chain.proceed(request);
} }
@ -286,8 +286,8 @@ public class RestModule {
} }
return response.request().newBuilder() return response.request().newBuilder()
.header(authenticatorType, credentials) .header(authenticatorType, credentials)
.build(); .build();
} }
} }
@ -303,12 +303,12 @@ public class RestModule {
public void run() { public void run() {
if (Proxy.Type.valueOf(appPreferences.getProxyType()) == Proxy.Type.SOCKS) { if (Proxy.Type.valueOf(appPreferences.getProxyType()) == Proxy.Type.SOCKS) {
proxy = new Proxy(Proxy.Type.valueOf(appPreferences.getProxyType()), proxy = new Proxy(Proxy.Type.valueOf(appPreferences.getProxyType()),
InetSocketAddress.createUnresolved(appPreferences.getProxyHost(), Integer.parseInt( InetSocketAddress.createUnresolved(appPreferences.getProxyHost(), Integer.parseInt(
appPreferences.getProxyPort()))); appPreferences.getProxyPort())));
} else { } else {
proxy = new Proxy(Proxy.Type.valueOf(appPreferences.getProxyType()), proxy = new Proxy(Proxy.Type.valueOf(appPreferences.getProxyType()),
new InetSocketAddress(appPreferences.getProxyHost(), new InetSocketAddress(appPreferences.getProxyHost(),
Integer.parseInt(appPreferences.getProxyPort()))); Integer.parseInt(appPreferences.getProxyPort())));
} }
} }

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

@ -61,8 +61,8 @@ public class ApiUtils {
} }
/** /**
* @deprecated This is only supported on API v1-3, in API v4+ please use {@link ApiUtils#getUrlForAttendees(int, * @deprecated This is only supported on API v1-3, in API v4+ please use
* String, String)} instead. * {@link ApiUtils#getUrlForAttendees(int, String, String)} instead.
*/ */
@Deprecated @Deprecated
public static String getUrlForRemovingParticipantFromConversation(String baseUrl, String roomToken, boolean isGuest) { public static String getUrlForRemovingParticipantFromConversation(String baseUrl, String roomToken, boolean isGuest) {