owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove repeating logging code from MastodonAPIController

Browse Source
This commit is contained in:
Grishka
2023-10-10 23:47:36 +03:00
parent 89042113a5
commit 2df1b7dd61
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
View File

@@ -92,7 +92,7 @@ public class MastodonAPIController{
} }
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq); Log.d(TAG, logTag(session)+"Sending request: "+hreq);
call.enqueue(new Callback(){ call.enqueue(new Callback(){
@Override @Override
@@ -100,7 +100,7 @@ public class MastodonAPIController{
if(req.canceled) if(req.canceled)
return; return;
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed", e); Log.w(TAG, logTag(session)+""+hreq+" failed", e);
synchronized(req){ synchronized(req){
req.okhttpCall=null; req.okhttpCall=null;
} }
@@ -112,7 +112,7 @@ public class MastodonAPIController{
if(req.canceled) if(req.canceled)
return; return;
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" received response: "+response); Log.d(TAG, logTag(session)+hreq+" received response: "+response);
synchronized(req){ synchronized(req){
req.okhttpCall=null; req.okhttpCall=null;
} }
@@ -123,7 +123,7 @@ public class MastodonAPIController{
try{ try{
if(BuildConfig.DEBUG){ if(BuildConfig.DEBUG){
JsonElement respJson=JsonParser.parseReader(reader); JsonElement respJson=JsonParser.parseReader(reader);
Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] response body: "+respJson); Log.d(TAG, logTag(session)+"response body: "+respJson);
if(req.respTypeToken!=null) if(req.respTypeToken!=null)
respObj=gson.fromJson(respJson, req.respTypeToken.getType()); respObj=gson.fromJson(respJson, req.respTypeToken.getType());
else if(req.respClass!=null) else if(req.respClass!=null)
@@ -140,7 +140,7 @@ public class MastodonAPIController{
} }
}catch(JsonIOException|JsonSyntaxException x){ }catch(JsonIOException|JsonSyntaxException x){
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error parsing or reading body", x); Log.w(TAG, logTag(session)+response+" error parsing or reading body", x);
req.onError(x.getLocalizedMessage(), response.code(), x); req.onError(x.getLocalizedMessage(), response.code(), x);
return; return;
} }
@@ -149,19 +149,19 @@ public class MastodonAPIController{
req.validateAndPostprocessResponse(respObj, response); req.validateAndPostprocessResponse(respObj, response);
}catch(IOException x){ }catch(IOException x){
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" error post-processing or validating response", x); Log.w(TAG, logTag(session)+response+" error post-processing or validating response", x);
req.onError(x.getLocalizedMessage(), response.code(), x); req.onError(x.getLocalizedMessage(), response.code(), x);
return; return;
} }
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" parsed successfully: "+respObj); Log.d(TAG, logTag(session)+response+" parsed successfully: "+respObj);
req.onSuccess(respObj); req.onSuccess(respObj);
}else{ }else{
try{ try{
JsonObject error=JsonParser.parseReader(reader).getAsJsonObject(); JsonObject error=JsonParser.parseReader(reader).getAsJsonObject();
Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+response+" received error: "+error); Log.w(TAG, logTag(session)+response+" received error: "+error);
if(error.has("details")){ if(error.has("details")){
MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code(), null); MastodonDetailedErrorResponse err=new MastodonDetailedErrorResponse(error.get("error").getAsString(), response.code(), null);
HashMap<String, List<MastodonDetailedErrorResponse.FieldError>> details=new HashMap<>(); HashMap<String, List<MastodonDetailedErrorResponse.FieldError>> details=new HashMap<>();
@@ -196,7 +196,7 @@ public class MastodonAPIController{
}); });
}catch(Exception x){ }catch(Exception x){
if(BuildConfig.DEBUG) if(BuildConfig.DEBUG)
Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] error creating and sending http request", x); Log.w(TAG, logTag(session)+"error creating and sending http request", x);
req.onError(x.getLocalizedMessage(), 0, x); req.onError(x.getLocalizedMessage(), 0, x);
} }
}, 0); }, 0);
@@ -209,4 +209,8 @@ public class MastodonAPIController{
public static OkHttpClient getHttpClient(){ public static OkHttpClient getHttpClient(){
return httpClient; return httpClient;
} }
private static String logTag(AccountSession session){
return "["+(session==null ? "no-auth" : session.getID())+"] ";
}
} }