Make connection to CodeGeneratorService lazy. #509
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,92 +5,87 @@ | |
| import android.content.Intent; | ||
| import android.content.ServiceConnection; | ||
| import android.os.IBinder; | ||
|
|
||
| import java.util.LinkedList; | ||
| import java.util.Queue; | ||
|
|
||
| /** | ||
| * Client Side class responsible for connecting to the {@link CodeGeneratorService}. | ||
| * | ||
| * A connection to the service is only made the first time code generation is requested. | ||
| */ | ||
| public class CodeGeneratorManager { | ||
| private static final String TAG = "CodeGeneratorManager"; | ||
|
|
||
| private final Context mContext; | ||
| private final Queue<CodeGenerationRequest> mStoredRequests; | ||
|
|
||
| private ServiceConnection mCodeGenerationConnection; | ||
| private CodeGeneratorService mGeneratorService; | ||
|
|
||
| public CodeGeneratorManager(Context context) { | ||
| this.mContext = context; | ||
| this.mStoredRequests = new LinkedList<>(); | ||
| } | ||
|
|
||
| /** | ||
| * Resumes the underlying code generation connection. | ||
| */ | ||
| public void onResume() { | ||
| Intent intent = new Intent(mContext, CodeGeneratorService.class); | ||
| if (mCodeGenerationConnection != null) { | ||
| mContext.bindService(intent, mCodeGenerationConnection, Context.BIND_AUTO_CREATE); | ||
|
There was a problem hiding this comment. To be clear, it is this bind that could be lazy, and is the point of issue #37. We should wait until the first There was a problem hiding this comment. That makes sense. I've made an update so that the bind is lazy (rather than creation of the connection). |
||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Pauses the underlying code generation connection. | ||
| */ | ||
| public void onPause() { | ||
| if (mCodeGenerationConnection != null) { | ||
| mContext.unbindService(mCodeGenerationConnection); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Calls the Service to request code generation for the workspace passed in. | ||
| * | ||
| * @param codeGenerationRequest the request to generate code. | ||
| */ | ||
| public void requestCodeGeneration(CodeGenerationRequest codeGenerationRequest) { | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. Nulls are already handled in the code, but I'll add a null check here so that that's clearer. |
||
| if (isBound()) { | ||
|
There was a problem hiding this comment. Add if(!mResumed) { Log.w(TAG, "Code generation called while paused. Request ignored."); return;} There was a problem hiding this comment. Check resumed state first. |
||
| executeCodeGenerationRequest(codeGenerationRequest); | ||
| } else { | ||
| mStoredRequests.add(codeGenerationRequest); | ||
| connectToService(); | ||
| } | ||
| } | ||
|
|
||
| private boolean isBound() { | ||
| return mGeneratorService != null; | ||
| } | ||
|
|
||
| private void connectToService() { | ||
| this.mCodeGenerationConnection = new ServiceConnection() { | ||
| @Override | ||
| public void onServiceConnected(ComponentName className, IBinder binder) { | ||
| mGeneratorService = ((CodeGeneratorService.CodeGeneratorBinder) binder).getService(); | ||
| while (!mStoredRequests.isEmpty()) { | ||
| executeCodeGenerationRequest(mStoredRequests.poll()); | ||
|
There was a problem hiding this comment. I've used There was a problem hiding this comment. I've used |
||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onServiceDisconnected(ComponentName arg0) { | ||
| mGeneratorService = null; | ||
| } | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| private void executeCodeGenerationRequest(CodeGenerationRequest request) { | ||
| if (request != null) { | ||
| mGeneratorService.requestCodeGeneration(request); | ||
| } | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because this is going to have merge conflicts with some upcoming changes, I've updated the PR to target the
toolbox-refactorbranch. I'd appreciate if I can have write access to this branch to fix the upcoming conflict.Thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I've done this, but let me know if there are still issues (the merge conflicts were all imports, so trivial to resolve).