From c41ab845fde70f2ef1a16b1b48dd39bab9c9c4fc Mon Sep 17 00:00:00 2001 From: 6543 <6543@noreply.gitea.io> Date: Tue, 28 Apr 2020 13:47:25 +0000 Subject: [PATCH] Refactor Context (#469) Merge branch 'master' into fix-refactor-context reorder + space fix R E F A C T O R set ctx and appCtx in LoginActivity Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/469 Reviewed-by: M M Arif Reviewed-by: opyale --- .../AddCollaboratorToRepositoryActivity.java | 17 ++-- .../AddRemoveAssigneesActivity.java | 26 +++--- .../activities/AddRemoveLabelsActivity.java | 27 +++--- .../activities/AdminGetUsersActivity.java | 14 +-- .../gitnex/activities/CommitsActivity.java | 7 +- .../gitnex/activities/CreateFileActivity.java | 34 ++++---- .../activities/CreateIssueActivity.java | 51 +++++------ .../activities/CreateLabelActivity.java | 59 +++++++------ .../activities/CreateMilestoneActivity.java | 29 ++++--- .../activities/CreateNewUserActivity.java | 26 +++--- .../CreateOrganizationActivity.java | 35 ++++---- .../activities/CreateReleaseActivity.java | 28 +++--- .../gitnex/activities/CreateRepoActivity.java | 43 +++++----- .../activities/CreateTeamByOrgActivity.java | 35 ++++---- .../gitnex/activities/CreditsActivity.java | 4 +- .../gitnex/activities/EditIssueActivity.java | 42 ++++----- .../gitnex/activities/FileDiffActivity.java | 19 ++-- .../gitnex/activities/FileViewActivity.java | 17 ++-- .../activities/IssueDetailActivity.java | 67 ++++++++------- .../mian/gitnex/activities/LoginActivity.java | 86 ++++++++++--------- .../mian/gitnex/activities/MainActivity.java | 23 ++--- .../activities/MergePullRequestActivity.java | 26 +++--- .../activities/OpenRepoInBrowserActivity.java | 5 +- .../OrganizationDetailActivity.java | 20 +++-- .../OrganizationTeamMembersActivity.java | 16 ++-- .../activities/ProfileEmailActivity.java | 27 +++--- .../activities/ReplyToIssueActivity.java | 28 +++--- .../gitnex/activities/RepoDetailActivity.java | 39 +++++---- .../activities/RepoStargazersActivity.java | 16 ++-- .../activities/RepoWatchersActivity.java | 16 ++-- .../SettingsAppearanceActivity.java | 21 ++--- .../SettingsFileViewerActivity.java | 13 +-- .../activities/SettingsReportsActivity.java | 11 +-- .../activities/SettingsSecurityActivity.java | 13 +-- .../SettingsTranslationActivity.java | 9 +- .../gitnex/activities/SponsorsActivity.java | 6 +- 36 files changed, 529 insertions(+), 426 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java index 76fa64a3..4810697e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java @@ -34,6 +34,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { private View.OnClickListener onClickListener; final Context ctx = this; + private Context appCtx; private TextView addCollaboratorSearch; private TextView noData; private ProgressBar mProgressBar; @@ -47,11 +48,13 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -76,7 +79,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEND) { if(!addCollaboratorSearch.getText().toString().equals("")) { - loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), getApplicationContext(), loginUid); + loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid); } } return false; @@ -85,12 +88,12 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { } - public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, final Context context, String loginUid) { + public void loadUserSearchList(String instanceUrl, String token, String searchKeyword, String loginUid) { Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getUserBySearch(Authorization.returnAuthentication(getApplicationContext(), loginUid, token), searchKeyword, 10); + .getUserBySearch(Authorization.returnAuthentication(ctx, loginUid, token), searchKeyword, 10); call.enqueue(new Callback() { @@ -99,7 +102,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { if (response.isSuccessful()) { assert response.body() != null; - getUsersList(response.body().getData(), context); + getUsersList(response.body().getData(), ctx); } else { Log.i("onResponse", String.valueOf(response.code())); } @@ -119,7 +122,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity { UserSearchAdapter adapter = new UserSearchAdapter(dataList, context); mRecyclerView.setHasFixedSize(true); - mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx)); DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL); mRecyclerView.addItemDecoration(dividerItemDecoration); diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java index a973b2a7..d87dcc80 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java @@ -34,6 +34,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity { private Boolean assigneesFlag = false; private MultiSelectDialog multiSelectDialogAssignees; final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -44,11 +45,12 @@ public class AddRemoveAssigneesActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); //supportRequestWindowFeature(Window.FEATURE_NO_TITLE); getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT)); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -64,12 +66,12 @@ public class AddRemoveAssigneesActivity extends BaseActivity { private void getAssignees(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -92,9 +94,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity { // get current issue assignees Call callSingleIssueAssignees = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex); + .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex); callSingleIssueAssignees.enqueue(new Callback() { @@ -141,7 +143,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity { Log.i("selectedNames", String.valueOf(selectedNames)); - updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames); + updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames); tinyDb.putBoolean("singleIssueUpdate", true); CloseActivity(); } @@ -167,7 +169,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity { @Override public void onSelected(ArrayList selectedIds, ArrayList selectedNames, String dataString) { - updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames); + updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, loginUid, issueIndex, selectedNames); tinyDb.putBoolean("singleIssueUpdate", true); CloseActivity(); @@ -215,7 +217,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity { } else { - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } } @@ -241,9 +243,9 @@ public class AddRemoveAssigneesActivity extends BaseActivity { Call call3; call3 = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .patchIssueAssignees(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson); + .patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson); call3.enqueue(new Callback() { @@ -275,7 +277,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity { } else { - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java index 62fa57e1..d074eb4f 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java @@ -32,6 +32,7 @@ public class AddRemoveLabelsActivity extends BaseActivity { private Boolean labelsFlag = false; private MultiSelectDialog multiSelectDialogLabels; final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -40,12 +41,14 @@ public class AddRemoveLabelsActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); //supportRequestWindowFeature(Window.FEATURE_NO_TITLE); getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT)); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -61,12 +64,12 @@ public class AddRemoveLabelsActivity extends BaseActivity { private void getLabels(final String instanceUrl, final String instanceToken, final String repoOwner, final String repoName, final int issueIndex, final String loginUid) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -89,9 +92,9 @@ public class AddRemoveLabelsActivity extends BaseActivity { // get current issue labels Call> callSingleIssueLabels = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex); + .getIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex); callSingleIssueLabels.enqueue(new Callback>() { @@ -142,7 +145,7 @@ public class AddRemoveLabelsActivity extends BaseActivity { integers = new int[0]; } - updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid); + updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid); tinyDb.putBoolean("singleIssueUpdate", true); CloseActivity(); } @@ -183,7 +186,7 @@ public class AddRemoveLabelsActivity extends BaseActivity { integers = new int[0]; } - updateIssueLabels(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid); + updateIssueLabels(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, integers, loginUid); tinyDb.putBoolean("singleIssueUpdate", true); CloseActivity(); @@ -231,7 +234,7 @@ public class AddRemoveLabelsActivity extends BaseActivity { } else { - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } } @@ -251,9 +254,9 @@ public class AddRemoveLabelsActivity extends BaseActivity { Labels patchIssueLabels = new Labels(issueLabels); Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .updateIssueLabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels); + .updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels); call.enqueue(new Callback() { @@ -285,7 +288,7 @@ public class AddRemoveLabelsActivity extends BaseActivity { } else { - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java index 14ed6509..2a2ace34 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java @@ -38,6 +38,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd private View.OnClickListener onClickListener; final Context ctx = this; + private Context appCtx; private AdminGetUsersAdapter adapter; private RecyclerView mRecyclerView; private TextView noDataUsers; @@ -52,8 +53,9 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -71,7 +73,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd closeActivity.setOnClickListener(onClickListener); mRecyclerView.setHasFixedSize(true); - mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx)); DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL); @@ -84,13 +86,13 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd @Override public void run() { swipeRefresh.setRefreshing(false); - AdminGetUsersViewModel.loadUsersList(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken)); + AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken)); } }, 500); } }); - fetchDataAsync(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken)); + fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken)); } @@ -101,7 +103,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, new Observer>() { @Override public void onChanged(@Nullable List usersListMain) { - adapter = new AdminGetUsersAdapter(getApplicationContext(), usersListMain); + adapter = new AdminGetUsersAdapter(ctx, usersListMain); if(adapter.getItemCount() > 0) { mRecyclerView.setVisibility(View.VISIBLE); mRecyclerView.setAdapter(adapter); @@ -130,7 +132,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd public void run() { if(searchFilter) { - boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getApplicationContext())); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); inflater.inflate(R.menu.search_menu, menu); diff --git a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java index b8617db6..fc46f954 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java @@ -40,7 +40,8 @@ import retrofit2.Response; public class CommitsActivity extends BaseActivity { - private Context ctx; + final Context ctx = this; + private Context appCtx; private View.OnClickListener onClickListener; private TextView noData; private ProgressBar progressBar; @@ -63,11 +64,11 @@ public class CommitsActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - ctx = this; - TinyDB tinyDb = new TinyDB(ctx); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java index c5e6f385..26449efa 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java @@ -46,6 +46,7 @@ public class CreateFileActivity extends BaseActivity { private EditText newFileCommitMessage; private Spinner newFileBranchesSpinner; final Context ctx = this; + private Context appCtx; List branchesList = new ArrayList<>(); @@ -58,12 +59,13 @@ public class CreateFileActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -144,9 +146,9 @@ public class CreateFileActivity extends BaseActivity { private void processNewFile() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -164,14 +166,14 @@ public class CreateFileActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFields)); + Toasty.info(ctx, getString(R.string.newFileRequiredFields)); return; } @@ -179,13 +181,13 @@ public class CreateFileActivity extends BaseActivity { if(currentBranch.toString().equals("No branch")) { if(newFileBranchName_.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFieldNewBranchName)); + Toasty.info(ctx, getString(R.string.newFileRequiredFieldNewBranchName)); return; } else { if(!appUtil.checkStringsWithDash(newFileBranchName_)) { - Toasty.info(getApplicationContext(), getString(R.string.newFileInvalidBranchName)); + Toasty.info(ctx, getString(R.string.newFileInvalidBranchName)); return; } @@ -195,13 +197,13 @@ public class CreateFileActivity extends BaseActivity { if(appUtil.charactersLength(newFileCommitMessage_) > 255) { - Toasty.info(getApplicationContext(), getString(R.string.newFileCommitMessageError)); + Toasty.info(ctx, getString(R.string.newFileCommitMessageError)); } else { disableProcessButton(); - createNewFile(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString()); + createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString()); } @@ -218,7 +220,7 @@ public class CreateFileActivity extends BaseActivity { } Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr); @@ -230,7 +232,7 @@ public class CreateFileActivity extends BaseActivity { if(response.code() == 201) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.newFileSuccessMessage)); + Toasty.info(ctx, getString(R.string.newFileSuccessMessage)); finish(); } @@ -247,11 +249,11 @@ public class CreateFileActivity extends BaseActivity { if(response.code() == 404) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.apiNotFound)); + Toasty.info(ctx, getString(R.string.apiNotFound)); } else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError)); + Toasty.info(ctx, getString(R.string.orgCreatedError)); } } @@ -270,9 +272,9 @@ public class CreateFileActivity extends BaseActivity { private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) { Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getBranches(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getBranches(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java index 2e5b7321..074133bf 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java @@ -61,6 +61,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis private boolean assigneesFlag; private boolean labelsFlag; final Context ctx = this; + private Context appCtx; List milestonesList = new ArrayList<>(); ArrayList listOfAssignees = new ArrayList<>(); @@ -74,13 +75,15 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String loginFullName = tinyDb.getString("userFullname"); @@ -142,8 +145,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis private void processNewIssue() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -164,21 +167,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if (newIssueTitleForm.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty)); + Toasty.info(ctx, getString(R.string.issueTitleEmpty)); return; } /*if (newIssueDescriptionForm.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty)); + Toasty.info(ctx, getString(R.string.issueDescriptionEmpty)); return; }*/ @@ -217,7 +220,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis public void loadCollaboratorsList() { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -228,9 +231,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis final String repoName = parts[1]; Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -272,9 +275,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis Call call3; call3 = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .createNewIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createNewIssueJson); + .createNewIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createNewIssueJson); call3.enqueue(new Callback() { @@ -285,10 +288,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis if(response2.code() == 201) { //Log.i("isSuccessful1", String.valueOf(response2.body())); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("resumeIssues", true); - Toasty.info(getApplicationContext(), getString(R.string.issueCreated)); + Toasty.info(ctx, getString(R.string.issueCreated)); enableProcessButton(); finish(); @@ -306,7 +309,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis } else { - Toasty.info(getApplicationContext(), getString(R.string.issueCreatedError)); + Toasty.info(ctx, getString(R.string.issueCreatedError)); enableProcessButton(); //Log.i("isSuccessful2", String.valueOf(response2.body())); @@ -336,9 +339,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis String msState = "open"; Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState); + .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, msState); call.enqueue(new Callback>() { @@ -390,9 +393,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) { Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); listOfAssignees.add(new MultiSelectModel(-1, loginFullName)); @@ -462,9 +465,9 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis private void getLabels(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) { Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getlabels(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getlabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -530,7 +533,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog"); } else { - Toasty.info(getApplicationContext(), getResources().getString(R.string.noAssigneesFound)); + Toasty.info(ctx, getResources().getString(R.string.noAssigneesFound)); } } else if (v == newIssueLabels) { @@ -538,7 +541,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels"); } else { - Toasty.info(getApplicationContext(), getResources().getString(R.string.noLabelsFound)); + Toasty.info(ctx, getResources().getString(R.string.noLabelsFound)); } } else if (v == newIssueDueDate) { diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java index f2d8e02d..eb4faabb 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java @@ -41,6 +41,7 @@ public class CreateLabelActivity extends BaseActivity { private EditText labelName; private Button createLabelButton; final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -49,11 +50,13 @@ public class CreateLabelActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); final String repoOwner = parts[0]; @@ -70,7 +73,7 @@ public class CreateLabelActivity extends BaseActivity { } - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); ImageView closeActivity = findViewById(R.id.close); colorPicker = findViewById(R.id.colorPicker); @@ -150,8 +153,8 @@ public class CreateLabelActivity extends BaseActivity { private void processUpdateLabel() { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); @@ -173,21 +176,21 @@ public class CreateLabelActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(updateLabelName.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError)); + Toasty.info(ctx, getString(R.string.labelEmptyError)); return; } if(!appUtil.checkStrings(updateLabelName)) { - Toasty.info(getApplicationContext(), getString(R.string.labelNameError)); + Toasty.info(ctx, getString(R.string.labelNameError)); return; } @@ -199,9 +202,9 @@ public class CreateLabelActivity extends BaseActivity { private void processCreateLabel() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); final String repoOwner = parts[0]; @@ -213,7 +216,7 @@ public class CreateLabelActivity extends BaseActivity { String newLabelName = labelName.getText().toString(); String newLabelColor; if(tinyDb.getString("labelColor").isEmpty()) { - newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(getApplicationContext(), R.color.releasePre))); + newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre))); } else { newLabelColor = tinyDb.getString("labelColor"); @@ -221,21 +224,21 @@ public class CreateLabelActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newLabelName.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.labelEmptyError)); + Toasty.info(ctx, getString(R.string.labelEmptyError)); return; } if(!appUtil.checkStrings(newLabelName)) { - Toasty.info(getApplicationContext(), getString(R.string.labelNameError)); + Toasty.info(ctx, getString(R.string.labelNameError)); return; } @@ -248,14 +251,14 @@ public class CreateLabelActivity extends BaseActivity { private void createNewLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String newLabelName, String newLabelColor, String loginUid) { CreateLabel createLabelFunc = new CreateLabel(newLabelName, newLabelColor); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .createLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createLabelFunc); + .createLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, createLabelFunc); call.enqueue(new Callback() { @@ -264,7 +267,7 @@ public class CreateLabelActivity extends BaseActivity { if(response.code() == 201) { - Toasty.info(getApplicationContext(), getString(R.string.labelCreated)); + Toasty.info(ctx, getString(R.string.labelCreated)); tinyDb.putString("labelColor", ""); tinyDb.putBoolean("labelsRefresh", true); finish(); @@ -283,7 +286,7 @@ public class CreateLabelActivity extends BaseActivity { enableProcessButton(); tinyDb.putString("labelColor", ""); - Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError)); + Toasty.info(ctx, getString(R.string.labelGeneralError)); } @@ -302,14 +305,14 @@ public class CreateLabelActivity extends BaseActivity { private void patchLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId, String loginUid) { CreateLabel createLabelFunc = new CreateLabel(updateLabelName, updateLabelColor); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .patchLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc); + .patchLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc); call.enqueue(new Callback() { @@ -319,7 +322,7 @@ public class CreateLabelActivity extends BaseActivity { if(response.isSuccessful()) { if(response.code() == 200) { - Toasty.info(getApplicationContext(), getString(R.string.labelUpdated)); + Toasty.info(ctx, getString(R.string.labelUpdated)); tinyDb.putString("labelColor", ""); tinyDb.putBoolean("labelsRefresh", true); tinyDb.putString("labelColorDefault", ""); @@ -345,7 +348,7 @@ public class CreateLabelActivity extends BaseActivity { enableProcessButton(); tinyDb.putString("labelColor", ""); tinyDb.putString("labelColorDefault", ""); - Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError)); + Toasty.info(ctx, getString(R.string.labelGeneralError)); } @@ -380,9 +383,9 @@ public class CreateLabelActivity extends BaseActivity { Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .deleteLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId); + .deleteLabel(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, labelId); call.enqueue(new Callback() { @@ -392,8 +395,8 @@ public class CreateLabelActivity extends BaseActivity { if(response.isSuccessful()) { if(response.code() == 204) { - Toasty.info(getApplicationContext(), getString(R.string.labelDeleteText)); - LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()); + Toasty.info(ctx, getString(R.string.labelDeleteText)); + LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, ctx); getIntent().removeExtra("labelAction"); getIntent().removeExtra("labelId"); @@ -409,7 +412,7 @@ public class CreateLabelActivity extends BaseActivity { } else { - Toasty.info(getApplicationContext(), getString(R.string.labelDeleteErrorText)); + Toasty.info(ctx, getString(R.string.labelDeleteErrorText)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java index a60fd739..dfada6b8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java @@ -37,6 +37,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic private EditText milestoneDescription; private Button createNewMilestoneButton; final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -45,9 +46,11 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -89,9 +92,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic private void processNewMilestone() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); final String repoOwner = parts[0]; @@ -107,14 +110,14 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newMilestoneTitle.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.milestoneNameErrorEmpty)); + Toasty.info(ctx, getString(R.string.milestoneNameErrorEmpty)); return; } @@ -122,7 +125,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic if(!newMilestoneDescription.equals("")) { if (appUtil.charactersLength(newMilestoneDescription) > 255) { - Toasty.info(getApplicationContext(), getString(R.string.milestoneDescError)); + Toasty.info(ctx, getString(R.string.milestoneDescError)); return; } @@ -133,12 +136,12 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate))); } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) { // if Gitea version is less than 1.10.0 DueDate is required - Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty)); + Toasty.info(ctx, getString(R.string.milestoneDateEmpty)); return; } disableProcessButton(); - createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate); + createNewMilestone(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate); } @@ -149,7 +152,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createMilestone(token, repoOwner, repoName, createMilestone); @@ -161,9 +164,9 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic if(response.isSuccessful()) { if(response.code() == 201) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("milestoneCreated", true); - Toasty.info(getApplicationContext(), getString(R.string.milestoneCreated)); + Toasty.info(ctx, getString(R.string.milestoneCreated)); enableProcessButton(); finish(); @@ -181,7 +184,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.milestoneCreatedError)); + Toasty.info(ctx, getString(R.string.milestoneCreatedError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java index 987d19b1..7f9135fc 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java @@ -35,6 +35,7 @@ public class CreateNewUserActivity extends BaseActivity { private EditText userPassword; private Button createUserButton; final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -45,8 +46,9 @@ public class CreateNewUserActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -78,9 +80,9 @@ public class CreateNewUserActivity extends BaseActivity { private void processCreateNewUser() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -92,41 +94,41 @@ public class CreateNewUserActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.emptyFields)); + Toasty.info(ctx, getString(R.string.emptyFields)); return; } if(!appUtil.checkStrings(newFullName)) { - Toasty.info(getApplicationContext(), getString(R.string.userInvalidFullName)); + Toasty.info(ctx, getString(R.string.userInvalidFullName)); return; } if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) { - Toasty.info(getApplicationContext(), getString(R.string.userInvalidUserName)); + Toasty.info(ctx, getString(R.string.userInvalidUserName)); return; } if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) { - Toasty.info(getApplicationContext(), getString(R.string.userInvalidEmail)); + Toasty.info(ctx, getString(R.string.userInvalidEmail)); return; } disableProcessButton(); - createNewUser(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword); + createNewUser(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword); } @@ -137,7 +139,7 @@ public class CreateNewUserActivity extends BaseActivity { Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewUser(instanceToken, createUser); @@ -148,7 +150,7 @@ public class CreateNewUserActivity extends BaseActivity { if(response.code() == 201) { - Toasty.info(getApplicationContext(), getString(R.string.userCreatedText)); + Toasty.info(ctx, getString(R.string.userCreatedText)); enableProcessButton(); finish(); @@ -183,7 +185,7 @@ public class CreateNewUserActivity extends BaseActivity { else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java index 80fa16de..2fabfc2c 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java @@ -34,6 +34,7 @@ public class CreateOrganizationActivity extends BaseActivity { private EditText orgName; private EditText orgDesc; final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -42,9 +43,11 @@ public class CreateOrganizationActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -94,9 +97,9 @@ public class CreateOrganizationActivity extends BaseActivity { private void processNewOrganization() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -106,7 +109,7 @@ public class CreateOrganizationActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } @@ -114,7 +117,7 @@ public class CreateOrganizationActivity extends BaseActivity { if(!newOrgDesc.equals("")) { if (appUtil.charactersLength(newOrgDesc) > 255) { - Toasty.info(getApplicationContext(), getString(R.string.orgDescError)); + Toasty.info(ctx, getString(R.string.orgDescError)); return; } @@ -122,18 +125,18 @@ public class CreateOrganizationActivity extends BaseActivity { if(newOrgName.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorEmpty)); + Toasty.info(ctx, getString(R.string.orgNameErrorEmpty)); } else if(!appUtil.checkStrings(newOrgName)) { - Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorInvalid)); + Toasty.info(ctx, getString(R.string.orgNameErrorInvalid)); } else { disableProcessButton(); - createNewOrganization(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newOrgName, newOrgDesc); + createNewOrganization(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newOrgName, newOrgDesc); } @@ -144,7 +147,7 @@ public class CreateOrganizationActivity extends BaseActivity { UserOrganizations createOrganization = new UserOrganizations(orgName, null, orgDesc, null, null); Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewOrganization(token, createOrganization); @@ -155,10 +158,10 @@ public class CreateOrganizationActivity extends BaseActivity { if(response.code() == 201) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("orgCreated", true); enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.orgCreated)); + Toasty.info(ctx, getString(R.string.orgCreated)); finish(); } @@ -174,24 +177,24 @@ public class CreateOrganizationActivity extends BaseActivity { else if(response.code() == 409) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.orgExistsError)); + Toasty.info(ctx, getString(R.string.orgExistsError)); } else if(response.code() == 422) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.orgExistsError)); + Toasty.info(ctx, getString(R.string.orgExistsError)); } else { if(response.code() == 404) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.apiNotFound)); + Toasty.info(ctx, getString(R.string.apiNotFound)); } else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError)); + Toasty.info(ctx, getString(R.string.orgCreatedError)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java index 301cee6b..2f674879 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java @@ -45,6 +45,7 @@ public class CreateReleaseActivity extends BaseActivity { private CheckBox releaseDraft; private Button createNewRelease; final Context ctx = this; + private Context appCtx; List branchesList = new ArrayList<>(); @@ -57,12 +58,13 @@ public class CreateReleaseActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -87,7 +89,7 @@ public class CreateReleaseActivity extends BaseActivity { releaseBranch = findViewById(R.id.releaseBranch); releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP); - getBranches(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -123,9 +125,9 @@ public class CreateReleaseActivity extends BaseActivity { private void processNewRelease() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -143,27 +145,27 @@ public class CreateReleaseActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newReleaseTagName.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.tagNameErrorEmpty)); + Toasty.info(ctx, getString(R.string.tagNameErrorEmpty)); return; } if(newReleaseTitle.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.titleErrorEmpty)); + Toasty.info(ctx, getString(R.string.titleErrorEmpty)); return; } disableProcessButton(); - createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft); + createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft); } @@ -174,7 +176,7 @@ public class CreateReleaseActivity extends BaseActivity { Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewRelease(token, repoOwner, repoName, createReleaseJson); @@ -185,9 +187,9 @@ public class CreateReleaseActivity extends BaseActivity { if (response.code() == 201) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("updateReleases", true); - Toasty.info(getApplicationContext(), getString(R.string.releaseCreatedText)); + Toasty.info(ctx, getString(R.string.releaseCreatedText)); enableProcessButton(); finish(); @@ -234,7 +236,7 @@ public class CreateReleaseActivity extends BaseActivity { private void getBranches(String instanceUrl, String instanceToken, final String repoOwner, final String repoName) { Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getBranches(instanceToken, repoOwner, repoName); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java index 15eaf223..81a883f2 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java @@ -45,6 +45,7 @@ public class CreateRepoActivity extends BaseActivity { private EditText repoDesc; private CheckBox repoAccess; final Context ctx = this; + private Context appCtx; List organizationsList = new ArrayList<>(); @@ -59,11 +60,13 @@ public class CreateRepoActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(ctx); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String userLogin = tinyDb.getString("userLogin"); @@ -85,7 +88,7 @@ public class CreateRepoActivity extends BaseActivity { spinner = findViewById(R.id.ownerSpinner); spinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP); - getOrganizations(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin); + getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin); spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -121,9 +124,9 @@ public class CreateRepoActivity extends BaseActivity { private void processNewRepo() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); AppUtil appUtil = new AppUtil(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -135,7 +138,7 @@ public class CreateRepoActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } @@ -143,7 +146,7 @@ public class CreateRepoActivity extends BaseActivity { if(!newRepoDesc.equals("")) { if (appUtil.charactersLength(newRepoDesc) > 255) { - Toasty.info(getApplicationContext(), getString(R.string.repoDescError)); + Toasty.info(ctx, getString(R.string.repoDescError)); return; } @@ -151,28 +154,28 @@ public class CreateRepoActivity extends BaseActivity { if(newRepoName.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorEmpty)); + Toasty.info(ctx, getString(R.string.repoNameErrorEmpty)); } else if(!appUtil.checkStrings(newRepoName)) { - Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorInvalid)); + Toasty.info(ctx, getString(R.string.repoNameErrorInvalid)); } else if (reservedRepoNames.contains(newRepoName)) { - Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedName)); + Toasty.info(ctx, getString(R.string.repoNameErrorReservedName)); } else if (reservedRepoPatterns.matcher(newRepoName).find()) { - Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedPatterns)); + Toasty.info(ctx, getString(R.string.repoNameErrorReservedPatterns)); } else { disableProcessButton(); - createNewRepository(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess); + createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess); } } @@ -185,7 +188,7 @@ public class CreateRepoActivity extends BaseActivity { if(repoOwner.equals(loginUid)) { call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewUserRepository(token, createRepository); @@ -193,7 +196,7 @@ public class CreateRepoActivity extends BaseActivity { else { call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewUserOrgRepository(token, repoOwner, createRepository); @@ -206,9 +209,9 @@ public class CreateRepoActivity extends BaseActivity { if(response.code() == 201) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("repoCreated", true); - Toasty.info(getApplicationContext(), getString(R.string.repoCreated)); + Toasty.info(ctx, getString(R.string.repoCreated)); enableProcessButton(); finish(); } @@ -224,13 +227,13 @@ public class CreateRepoActivity extends BaseActivity { else if(response.code() == 409) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.repoExistsError)); + Toasty.info(ctx, getString(R.string.repoExistsError)); } else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.repoCreatedError)); + Toasty.info(ctx, getString(R.string.repoCreatedError)); } @@ -246,10 +249,10 @@ public class CreateRepoActivity extends BaseActivity { private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getOrgOwners(instanceToken); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java index 66862be0..01bf62e2 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java @@ -33,6 +33,7 @@ import android.util.Log; public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener { final Context ctx = CreateTeamByOrgActivity.this; + private Context appCtx; private View.OnClickListener onClickListener; private TextView teamName; private TextView teamDesc; @@ -73,9 +74,11 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -247,13 +250,13 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic private void processCreateTeam() { AppUtil appUtil = new AppUtil(); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); final String orgName = tinyDb.getString("orgName");; - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); String newTeamName = teamName.getText().toString(); String newTeamDesc = teamDesc.getText().toString(); String newTeamPermission = teamPermission.getText().toString().toLowerCase(); @@ -261,21 +264,21 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if (newTeamName.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.teamNameEmpty)); + Toasty.info(ctx, getString(R.string.teamNameEmpty)); return; } if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) { - Toasty.info(getApplicationContext(), getString(R.string.teamNameError)); + Toasty.info(ctx, getString(R.string.teamNameError)); return; } @@ -283,12 +286,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic if(!newTeamDesc.equals("")) { if(!appUtil.checkStrings(newTeamDesc)) { - Toasty.info(getApplicationContext(), getString(R.string.teamDescError)); + Toasty.info(ctx, getString(R.string.teamDescError)); return; } if(newTeamDesc.length() > 100) { - Toasty.info(getApplicationContext(), getString(R.string.teamDescLimit)); + Toasty.info(ctx, getString(R.string.teamDescLimit)); return; } @@ -296,7 +299,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic if (newTeamPermission.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.teamPermissionEmpty)); + Toasty.info(ctx, getString(R.string.teamPermissionEmpty)); return; } @@ -318,9 +321,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic Call call3; call3 = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .createTeamsByOrg(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), orgName, createNewTeamJson); + .createTeamsByOrg(Authorization.returnAuthentication(ctx, loginUid, instanceToken), orgName, createNewTeamJson); call3.enqueue(new Callback() { @@ -330,10 +333,10 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic if(response2.isSuccessful()) { if(response2.code() == 201) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("resumeTeams", true); - Toasty.info(getApplicationContext(), getString(R.string.teamCreated)); + Toasty.info(ctx, getString(R.string.teamCreated)); finish(); } @@ -341,7 +344,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic } else if(response2.code() == 404) { - Toasty.info(getApplicationContext(), getString(R.string.apiNotFound)); + Toasty.info(ctx, getString(R.string.apiNotFound)); } else if(response2.code() == 401) { @@ -354,7 +357,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic } else { - Toasty.info(getApplicationContext(), getString(R.string.teamCreatedError)); + Toasty.info(ctx, getString(R.string.teamCreatedError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java index 695113c0..a31f3795 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java @@ -3,6 +3,7 @@ package org.mian.gitnex.activities; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import android.content.Context; import android.content.res.Resources; import android.os.Bundle; import android.view.View; @@ -20,6 +21,7 @@ import java.util.List; public class CreditsActivity extends BaseActivity { private View.OnClickListener onClickListener; + final Context ctx = this; @Override protected int getLayoutResourceId(){ @@ -44,7 +46,7 @@ public class CreditsActivity extends BaseActivity { RecyclerView mRecyclerView = findViewById(R.id.recyclerView); mRecyclerView.setHasFixedSize(true); - mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx)); DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL); diff --git a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java index 68a335d5..4c7f84c4 100644 --- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java @@ -48,6 +48,7 @@ import java.util.List; public class EditIssueActivity extends BaseActivity implements View.OnClickListener { final Context ctx = this; + private Context appCtx; private View.OnClickListener onClickListener; private EditText editIssueTitle; @@ -70,10 +71,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -127,7 +129,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe public void loadCollaboratorsList() { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -138,9 +140,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe final String repoName = parts[1]; Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -186,8 +188,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe private void processEditIssue() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -207,21 +209,21 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if (editIssueTitleForm.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.issueTitleEmpty)); + Toasty.info(ctx, getString(R.string.issueTitleEmpty)); return; } /*if (editIssueDescriptionForm.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.issueDescriptionEmpty)); + Toasty.info(ctx, getString(R.string.issueDescriptionEmpty)); return; }*/ @@ -240,14 +242,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int editIssueMilestoneId) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId); Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .patchIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData); + .patchIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueData); call.enqueue(new Callback() { @@ -257,10 +259,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe if(response.code() == 201) { if(tinyDb.getString("issueType").equals("pr")) { - Toasty.info(getApplicationContext(), getString(R.string.editPrSuccessMessage)); + Toasty.info(ctx, getString(R.string.editPrSuccessMessage)); } else { - Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage)); + Toasty.info(ctx, getString(R.string.editIssueSuccessMessage)); } tinyDb.putBoolean("issueEdited", true); @@ -280,7 +282,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } @@ -329,9 +331,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe private void getIssue(final String instanceUrl, final String instanceToken, final String loginUid, final String repoOwner, final String repoName, int issueIndex) { Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex); + .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex); call.enqueue(new Callback() { @@ -353,9 +355,9 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe if(response.body().getId() > 0) { Call> call_ = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, msState); + .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, msState); final int finalMsId = msId; @@ -432,7 +434,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe } else { - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java index bb8ddeee..e855a8f9 100644 --- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java @@ -1,5 +1,6 @@ package org.mian.gitnex.activities; +import android.content.Context; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -35,6 +36,8 @@ public class FileDiffActivity extends BaseActivity { private TextView toolbar_title; private ListView mListView; private ProgressBar mProgressBar; + final Context ctx = this; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -45,10 +48,12 @@ public class FileDiffActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); final String repoOwner = parts[0]; @@ -79,7 +84,7 @@ public class FileDiffActivity extends BaseActivity { private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) { Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getWebInterface() .getPullDiffContent(owner, repo, filename); @@ -159,7 +164,7 @@ public class FileDiffActivity extends BaseActivity { toolbar_title.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount))); } - FilesDiffAdapter adapter = new FilesDiffAdapter(FileDiffActivity.this, fileContentsArray); + FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray); mListView.setAdapter(adapter); mProgressBar.setVisibility(View.GONE); @@ -171,7 +176,7 @@ public class FileDiffActivity extends BaseActivity { } else if(response.code() == 401) { - AlertDialogs.authorizationTokenRevokedDialog(getApplicationContext(), getResources().getString(R.string.alertDialogTokenRevokedTitle), + AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton)); @@ -179,17 +184,17 @@ public class FileDiffActivity extends BaseActivity { } else if(response.code() == 403) { - Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.authorizeError)); + Toasty.info(ctx, ctx.getString(R.string.authorizeError)); } else if(response.code() == 404) { - Toasty.info(getApplicationContext(), getApplicationContext().getString(R.string.apiNotFound)); + Toasty.info(ctx, ctx.getString(R.string.apiNotFound)); } else { - Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError)); + Toasty.info(ctx, getString(R.string.labelGeneralError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java index 3d914566..366170b2 100644 --- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java @@ -60,6 +60,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie private HighlightJsView singleCodeContents; private PhotoView imageView; final Context ctx = this; + private Context appCtx; private ProgressBar mProgressBar; private byte[] imageData; private PDFView pdfView; @@ -78,10 +79,12 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); final String repoOwner = parts[0]; @@ -131,9 +134,9 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); - Call call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getSingleFileContents(token, owner, repo, filename); + Call call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getSingleFileContents(token, owner, repo, filename); call.enqueue(new Callback() { @@ -257,7 +260,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie } else { - Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError)); + Toasty.info(ctx, getString(R.string.labelGeneralError)); } @@ -324,7 +327,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie private void requestFileDownload() { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); if(!tinyDb.getString("downloadFileContents").isEmpty()) { @@ -340,7 +343,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie Objects.requireNonNull(fileOutputStream).write(pdfAsBytes); fileOutputStream.flush(); fileOutputStream.close(); - Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved)); + Toasty.info(ctx, getString(R.string.downloadFileSaved)); } catch(IOException e) { @@ -349,7 +352,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie } else { - Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile)); + Toasty.error(ctx, getString(R.string.waitLoadingDownloadFile)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index 98a2e2c3..26ef29bb 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -98,6 +98,7 @@ public class IssueDetailActivity extends BaseActivity { private TextView issueModified; private ImageView createNewComment; final Context ctx = this; + private Context appCtx; private LinearLayout labelsLayout; private LinearLayout assigneesLayout; @@ -110,8 +111,9 @@ public class IssueDetailActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -148,7 +150,7 @@ public class IssueDetailActivity extends BaseActivity { mRecyclerView = findViewById(R.id.recyclerView); mRecyclerView.setHasFixedSize(true); mRecyclerView.setNestedScrollingEnabled(false); - mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx)); DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL); mRecyclerView.addItemDecoration(dividerItemDecoration); @@ -181,7 +183,7 @@ public class IssueDetailActivity extends BaseActivity { swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> { swipeRefresh.setRefreshing(false); - IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext()); + IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, ctx); }, 500)); @@ -190,15 +192,15 @@ public class IssueDetailActivity extends BaseActivity { switch(tinyDb.getInt("customFontId", -1)) { case 1: - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(ctx).getAssets(), "fonts/manroperegular.ttf"); break; case 2: - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(ctx).getAssets(), "fonts/sourcecodeproregular.ttf"); break; default: - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(ctx).getAssets(), "fonts/roboto.ttf"); break; } @@ -240,7 +242,7 @@ public class IssueDetailActivity extends BaseActivity { @Override public void onResume() { super.onResume(); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -254,7 +256,7 @@ public class IssueDetailActivity extends BaseActivity { scrollViewComments.post(new Runnable() { @Override public void run() { - IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext()); + IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, ctx); new Handler().postDelayed(new Runnable() { @Override @@ -272,7 +274,7 @@ public class IssueDetailActivity extends BaseActivity { scrollViewComments.post(new Runnable() { @Override public void run() { - IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext()); + IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, ctx); tinyDb.putBoolean("commentEdited", false); } }); @@ -312,10 +314,10 @@ public class IssueDetailActivity extends BaseActivity { IssueCommentsViewModel issueCommentsModel = new ViewModelProvider(this).get(IssueCommentsViewModel.class); - issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), owner, repo, index, getApplicationContext()).observe(this, new Observer>() { + issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), owner, repo, index, ctx).observe(this, new Observer>() { @Override public void onChanged(@Nullable List issueCommentsMain) { - adapter = new IssueCommentsAdapter(getApplicationContext(), issueCommentsMain); + adapter = new IssueCommentsAdapter(ctx, issueCommentsMain); mRecyclerView.setAdapter(adapter); } }); @@ -324,11 +326,11 @@ public class IssueDetailActivity extends BaseActivity { private void getSingleIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex); + .getIssueByIndex(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex); call.enqueue(new Callback() { @@ -341,7 +343,7 @@ public class IssueDetailActivity extends BaseActivity { Issues singleIssue = response.body(); assert singleIssue != null; - final Markwon markwon = Markwon.builder(Objects.requireNonNull(getApplicationContext())) + final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)) .usePlugin(CorePlugin.create()) .usePlugin(ImagesPlugin.create(plugin -> { plugin.addSchemeHandler(new SchemeHandler() { @@ -349,12 +351,12 @@ public class IssueDetailActivity extends BaseActivity { @Override public ImageItem handle(@NonNull String raw, @NonNull Uri uri) { - final int resourceId = getApplicationContext().getResources().getIdentifier( + final int resourceId = ctx.getResources().getIdentifier( raw.substring("drawable://".length()), "drawable", - getApplicationContext().getPackageName()); + ctx.getPackageName()); - final Drawable drawable = getApplicationContext().getDrawable(resourceId); + final Drawable drawable = ctx.getDrawable(resourceId); assert drawable != null; return ImageItem.withResult(drawable); @@ -368,9 +370,9 @@ public class IssueDetailActivity extends BaseActivity { }); plugin.placeholderProvider(drawable -> null); plugin.addMediaDecoder(GifMediaDecoder.create(false)); - plugin.addMediaDecoder(SvgMediaDecoder.create(getApplicationContext().getResources())); + plugin.addMediaDecoder(SvgMediaDecoder.create(ctx.getResources())); plugin.addMediaDecoder(SvgMediaDecoder.create()); - plugin.defaultMediaDecoder(DefaultMediaDecoder.create(getApplicationContext().getResources())); + plugin.defaultMediaDecoder(DefaultMediaDecoder.create(ctx.getResources())); plugin.defaultMediaDecoder(DefaultMediaDecoder.create()); })) @@ -383,25 +385,26 @@ public class IssueDetailActivity extends BaseActivity { .linkColor(getResources().getColor(R.color.lightBlue)); } }) - .usePlugin(TablePlugin.create(getApplicationContext())) - .usePlugin(TaskListPlugin.create(getApplicationContext())) + .usePlugin(TablePlugin.create(ctx)) + .usePlugin(TaskListPlugin.create(ctx)) .usePlugin(HtmlPlugin.create()) .usePlugin(StrikethroughPlugin.create()) .usePlugin(LinkifyPlugin.create()) .build(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String locale = tinyDb.getString("locale"); final String timeFormat = tinyDb.getString("dateFormat"); tinyDb.putString("issueState", singleIssue.getState()); tinyDb.putString("issueTitle", singleIssue.getTitle()); PicassoService.getInstance(ctx).get().load(singleIssue.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar); - String issueNumber_ = "" + getApplicationContext().getResources().getString(R.string.hash) + singleIssue.getNumber() + ""; + String issueNumber_ = "" + appCtx.getResources().getString(R.string.hash) + singleIssue.getNumber() + + ""; issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle())); String cleanIssueDescription = singleIssue.getBody().trim(); Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription)); - markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(getApplicationContext(), bodyWithMD, cleanIssueDescription)); + markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(ctx, bodyWithMD, cleanIssueDescription)); RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams)issueDescription.getLayoutParams(); @@ -412,16 +415,16 @@ public class IssueDetailActivity extends BaseActivity { assigneesScrollView.setVisibility(View.VISIBLE); for (int i = 0; i < singleIssue.getAssignees().size(); i++) { - ImageView assigneesView = new ImageView(getApplicationContext()); + ImageView assigneesView = new ImageView(ctx); PicassoService.getInstance(ctx).get().load(singleIssue.getAssignees().get(i).getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop().into(assigneesView); assigneesLayout.addView(assigneesView); assigneesView.setLayoutParams(params1); if (!singleIssue.getAssignees().get(i).getFull_name().equals("")) { - assigneesView.setOnClickListener(new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getFull_name()), getApplicationContext())); + assigneesView.setOnClickListener(new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getFull_name()), ctx)); } else { - assigneesView.setOnClickListener(new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getLogin()), getApplicationContext())); + assigneesView.setOnClickListener(new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getLogin()), ctx)); } } @@ -442,7 +445,7 @@ public class IssueDetailActivity extends BaseActivity { String labelName = singleIssue.getLabels().get(i).getName(); int color = Color.parseColor("#" + labelColor); - ImageView labelsView = new ImageView(getApplicationContext()); + ImageView labelsView = new ImageView(ctx); labelsLayout.setOrientation(LinearLayout.HORIZONTAL); labelsLayout.setGravity(Gravity.START | Gravity.TOP); labelsView.setLayoutParams(params); @@ -472,7 +475,7 @@ public class IssueDetailActivity extends BaseActivity { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale)); String dueDate = formatter.format(singleIssue.getDue_date()); issueDueDate.setText(getString(R.string.dueDate, dueDate)); - issueDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getDue_date()), getApplicationContext())); + issueDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getDue_date()), ctx)); } else if (timeFormat.equals("normal1")) { DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale)); String dueDate = formatter.format(singleIssue.getDue_date()); @@ -529,9 +532,9 @@ public class IssueDetailActivity extends BaseActivity { } if (!singleIssue.getUser().getFull_name().equals("")) { - assigneeAvatar.setOnClickListener(new ClickListener(getApplicationContext().getResources().getString(R.string.issueCreator) + singleIssue.getUser().getFull_name(), getApplicationContext())); + assigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getFull_name(), ctx)); } else { - assigneeAvatar.setOnClickListener(new ClickListener(getApplicationContext().getResources().getString(R.string.issueCreator) + singleIssue.getUser().getLogin(), getApplicationContext())); + assigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getLogin(), ctx)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index 0350fb89..30be44c5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -53,6 +53,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener private TextView otpInfo; private RadioGroup loginMethod; final Context ctx = this; + private Context appCtx; private String device_id = "token"; private ScrollView layoutView; @@ -65,8 +66,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); NetworkObserver networkMonitor = new NetworkObserver(this); loginButton = findViewById(R.id.login_button); @@ -82,7 +84,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener loginTokenCode = findViewById(R.id.loginTokenCode); layoutView = findViewById(R.id.loginForm); - viewTextAppVersion.setText(AppUtil.getAppVersion(getApplicationContext())); + viewTextAppVersion.setText(AppUtil.getAppVersion(appCtx)); Resources res = getResources(); String[] allProtocols = res.getStringArray(R.array.protocolValues); @@ -99,7 +101,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener String value = getResources().getStringArray(R.array.protocolValues)[pos]; if(value.toLowerCase().equals("http")) { - SnackBar.warning(getApplicationContext(), layoutView,getResources().getString(R.string.protocolError)); + SnackBar.warning(ctx, layoutView,getResources().getString(R.string.protocolError)); } } @@ -161,11 +163,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if(isAvailable) { enableProcessButton(); - SnackBar.success(getApplicationContext(), layoutView, getResources().getString(R.string.netConnectionIsBack)); + SnackBar.success(ctx, layoutView, getResources().getString(R.string.netConnectionIsBack)); } else { disableProcessButton(); - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); } }); @@ -230,7 +232,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @SuppressLint("ResourceAsColor") private void login() { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); AppUtil appUtil = new AppUtil(); boolean connToInternet = AppUtil.haveNetworkConnection(LoginActivity.this); @@ -294,7 +296,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if(instanceUrlET.getText().toString().equals("")) { - SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldURL)); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); enableProcessButton(); loginButton.setText(R.string.btnLogin); return; @@ -302,7 +304,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } if(loginUid.equals("")) { - SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldUsername)); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldUsername)); enableProcessButton(); loginButton.setText(R.string.btnLogin); return; @@ -310,7 +312,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } if(loginPassword.getText().toString().equals("")) { - SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldPassword)); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldPassword)); enableProcessButton(); loginButton.setText(R.string.btnLogin); return; @@ -326,7 +328,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else { - SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.loginOTPTypeError)); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginOTPTypeError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); return; @@ -340,7 +342,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); } @@ -384,7 +386,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if (instanceUrlET.getText().toString().equals("")) { - SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldURL)); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); enableProcessButton(); loginButton.setText(R.string.btnLogin); return; @@ -392,7 +394,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } if (loginToken_.equals("")) { - SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.loginTokenError)); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginTokenError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); return; @@ -403,7 +405,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); } @@ -416,7 +418,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener Call callVersion; if (!loginToken_.isEmpty()) { callVersion = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getGiteaVersionWithToken(loginToken_); } @@ -424,13 +426,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); if (loginOTP != 0) { callVersion = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getGiteaVersionWithOTP(credential,loginOTP); } else { callVersion = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getGiteaVersionWithBasic(credential); } @@ -450,7 +452,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener switch (vt) { case UNSUPPORTED_NEW: - //SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.versionUnsupportedNew)); + //SnackBar.warning(ctx, layoutView, getResources().getString(R.string.versionUnsupportedNew)); case SUPPORTED_LATEST: case SUPPORTED_OLD: case DEVELOPMENT: @@ -483,7 +485,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener alertDialog.show(); return; default: // UNKNOWN - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.versionUnknow)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.versionUnknow)); enableProcessButton(); } @@ -511,7 +513,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onFailure(@NonNull Call callVersion, Throwable t) { Log.e("onFailure-version", t.toString()); - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.errorOnLogin)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.errorOnLogin)); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -523,10 +525,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener private void letTheUserInViaToken(String instanceUrl, final String loginToken_) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getUserInfo("token " + loginToken_); @@ -557,14 +559,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else if(response.code() == 401) { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); } else { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -576,7 +578,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onFailure(@NonNull Call call, @NonNull Throwable t) { Log.e("onFailure", t.toString()); - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericError)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -593,7 +595,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if(loginOTP != 0) { call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getUserTokensWithOTP(credential, loginOTP, loginUid); @@ -601,7 +603,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener else { call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getUserTokens(credential, loginUid); @@ -613,7 +615,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onResponse(@NonNull Call> call, @NonNull retrofit2.Response> response) { List userTokens = response.body(); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final AppUtil appUtil = new AppUtil(); //Headers responseHeaders = response.headers(); @@ -659,7 +661,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if(loginOTP != 0) { callCreateToken = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken); @@ -667,7 +669,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener else { callCreateToken = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .createNewToken(credential, loginUid, createUserToken); @@ -689,7 +691,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener if (!newToken.getSha1().equals("")) { Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getUserInfo("token " + newToken.getSha1()); @@ -719,14 +721,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else if(response.code() == 401) { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); } else { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -738,7 +740,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onFailure(@NonNull Call call, @NonNull Throwable t) { Log.e("onFailure", t.toString()); - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericError)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -752,7 +754,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else if(responseCreate.code() == 500) { - SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + responseCreate.code()); + SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + responseCreate.code()); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -774,7 +776,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); Call callGetUsername = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .getUserInfo(instanceToken); @@ -801,14 +803,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else if(response.code() == 401) { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); } else { - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -820,7 +822,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onFailure(@NonNull Call call, @NonNull Throwable t) { Log.e("onFailure", t.toString()); - SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericError)); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -834,14 +836,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener } else if(response.code() == 500) { - SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); + SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); enableProcessButton(); loginButton.setText(R.string.btnLogin); } else { - SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); + SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); enableProcessButton(); loginButton.setText(R.string.btnLogin); @@ -853,7 +855,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener public void onFailure(@NonNull Call> call, @NonNull Throwable t) { Log.e("onFailure-login", t.toString()); - SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.malformedJson)); + SnackBar.error(ctx, layoutView,getResources().getString(R.string.malformedJson)); enableProcessButton(); loginButton.setText(R.string.btnLogin); diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 801b9930..e56c1d7f 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -60,6 +60,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig private ImageView userAvatar; private TextView toolbarTitle; final Context ctx = this; + private Context appCtx; private Typeface myTypeface; @Override @@ -72,7 +73,9 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + appCtx = getApplicationContext(); + + final TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putBoolean("noConnection", false); //userAvatar = findViewById(R.id.userAvatar); @@ -97,7 +100,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig tinyDb.putInt("homeScreenId", 0); } - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); if(!tinyDb.getBoolean("loggedInMode")) { logout(this, ctx); @@ -173,7 +176,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig public void onDrawerOpened(@NonNull View drawerView) { if(tinyDb.getBoolean("noConnection")) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); tinyDb.putBoolean("noConnection", false); } @@ -258,7 +261,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig if(!connToInternet) { if(!tinyDb.getBoolean("noConnection")) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); } tinyDb.putBoolean("noConnection", true); @@ -275,7 +278,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig // Changelog popup int versionCode = 0; try { - PackageInfo packageInfo = getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0); + PackageInfo packageInfo = appCtx.getPackageManager().getPackageInfo(appCtx.getPackageName(), 0); versionCode = packageInfo.versionCode; } catch(PackageManager.NameNotFoundException e) { @@ -386,11 +389,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig private void giteaVersion(final String instanceUrl) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token"); - Call callVersion = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getGiteaVersionWithToken(token); + Call callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(token); callVersion.enqueue(new Callback() { @@ -421,9 +424,9 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig private void displayUserInfo(String instanceUrl, String token, String loginUid) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); - Call call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getUserInfo(Authorization.returnAuthentication(getApplicationContext(), loginUid, token)); + Call call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo(Authorization.returnAuthentication(ctx, loginUid, token)); NavigationView navigationView = findViewById(R.id.nav_view); final View hView = navigationView.getHeaderView(0); @@ -509,7 +512,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig else { String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(response.code()); - Toasty.info(getApplicationContext(), toastError); + Toasty.info(ctx, toastError); } diff --git a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java index bf262967..0505362c 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java @@ -46,6 +46,7 @@ public class MergePullRequestActivity extends BaseActivity { private View.OnClickListener onClickListener; final Context ctx = this; + private Context appCtx; private SocialAutoCompleteTextView mergeDescription; private EditText mergeTitle; @@ -65,9 +66,10 @@ public class MergePullRequestActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); + TinyDB tinyDb = new TinyDB(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -131,7 +133,7 @@ public class MergePullRequestActivity extends BaseActivity { private void setMergeAdapter() { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); ArrayList mergeList = new ArrayList<>(); @@ -151,7 +153,7 @@ public class MergePullRequestActivity extends BaseActivity { public void loadCollaboratorsList() { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -161,7 +163,7 @@ public class MergePullRequestActivity extends BaseActivity { final String repoOwner = parts[0]; final String repoName = parts[1]; - Call> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + Call> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -209,11 +211,11 @@ public class MergePullRequestActivity extends BaseActivity { String mergePRDesc = mergeDescription.getText().toString(); String mergePRTitle = mergeTitle.getText().toString(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } @@ -225,7 +227,7 @@ public class MergePullRequestActivity extends BaseActivity { private void mergeFunction(String Do, String mergePRDT, String mergeTitle) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -238,7 +240,7 @@ public class MergePullRequestActivity extends BaseActivity { MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle); - Call call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR); + Call call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR); call.enqueue(new Callback() { @@ -247,7 +249,7 @@ public class MergePullRequestActivity extends BaseActivity { if(response.code() == 200) { - Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg)); + Toasty.info(ctx, getString(R.string.mergePRSuccessMsg)); tinyDb.putBoolean("prMerged", true); tinyDb.putBoolean("resumePullRequests", true); finish(); @@ -262,13 +264,13 @@ public class MergePullRequestActivity extends BaseActivity { else if(response.code() == 404) { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.mergePR404ErrorMsg)); + Toasty.info(ctx, getString(R.string.mergePR404ErrorMsg)); } else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.genericError)); + Toasty.info(ctx, getString(R.string.genericError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java index 36379be7..283283d8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java @@ -1,5 +1,6 @@ package org.mian.gitnex.activities; +import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -12,13 +13,15 @@ import org.mian.gitnex.util.TinyDB; public class OpenRepoInBrowserActivity extends AppCompatActivity { + private Context appCtx; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw"); if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) { instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol"); diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java index af4f3161..ee0db289 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java @@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; +import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; @@ -31,6 +32,9 @@ import java.util.Objects; public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener { + final Context ctx = this; + private Context appCtx; + @Override protected int getLayoutResourceId(){ return R.layout.activity_org_detail; @@ -38,9 +42,11 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); String orgName = tinyDb.getString("orgName"); Toolbar toolbar = findViewById(R.id.toolbar); @@ -62,15 +68,15 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh switch(tinyDb.getInt("customFontId", -1)) { case 0: - myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf"); + myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf"); break; case 2: - myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf"); + myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf"); break; default: - myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf"); + myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf"); break; } @@ -126,7 +132,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh @Override public void onButtonClicked(String text) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); switch (text) { case "repository": @@ -151,7 +157,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh @Override public Fragment getItem(int position) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); String orgName; if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) { orgName = getIntent().getStringExtra("orgName"); diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java index 24b4078f..293c626c 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java @@ -3,6 +3,7 @@ package org.mian.gitnex.activities; import androidx.annotation.Nullable; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import android.content.Context; import android.os.Bundle; import android.view.View; import android.widget.GridView; @@ -28,6 +29,9 @@ public class OrganizationTeamMembersActivity extends BaseActivity { private TeamMembersByOrgAdapter adapter; private GridView mGridView; + final Context ctx = this; + private Context appCtx; + @Override protected int getLayoutResourceId(){ return R.layout.activity_org_team_members; @@ -35,9 +39,11 @@ public class OrganizationTeamMembersActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -69,7 +75,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity { //Log.i("teamId", getIntent().getStringExtra("teamId")); assert teamId != null; - fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId)); + fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.valueOf(teamId)); } @@ -77,10 +83,10 @@ public class OrganizationTeamMembersActivity extends BaseActivity { TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class); - teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, getApplicationContext()).observe(this, new Observer>() { + teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, ctx).observe(this, new Observer>() { @Override public void onChanged(@Nullable List teamMembersListMain) { - adapter = new TeamMembersByOrgAdapter(getApplicationContext(), teamMembersListMain); + adapter = new TeamMembersByOrgAdapter(ctx, teamMembersListMain); if(adapter.getCount() > 0) { mGridView.setAdapter(adapter); noDataMembers.setVisibility(View.GONE); diff --git a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java index 9ccac63f..5cec96de 100644 --- a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java @@ -35,6 +35,7 @@ public class ProfileEmailActivity extends BaseActivity { private View.OnClickListener onClickListener; private EditText userEmail; final Context ctx = this; + private Context appCtx; private Button addEmailButton; @Override @@ -44,9 +45,11 @@ public class ProfileEmailActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -81,8 +84,8 @@ public class ProfileEmailActivity extends BaseActivity { private void processAddNewEmail() { - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -91,20 +94,20 @@ public class ProfileEmailActivity extends BaseActivity { if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newUserEmail.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.emailErrorEmpty)); + Toasty.info(ctx, getString(R.string.emailErrorEmpty)); return; } else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) { - Toasty.info(getApplicationContext(), getString(R.string.emailErrorInvalid)); + Toasty.info(ctx, getString(R.string.emailErrorInvalid)); return; } @@ -112,19 +115,19 @@ public class ProfileEmailActivity extends BaseActivity { List newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(","))); disableProcessButton(); - addNewEmail(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), newEmailList); + addNewEmail(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newEmailList); } private void addNewEmail(final String instanceUrl, final String token, List newUserEmail) { AddEmail addEmailFunc = new AddEmail(newUserEmail); - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); Call call; call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() .addNewEmail(token, addEmailFunc); @@ -135,7 +138,7 @@ public class ProfileEmailActivity extends BaseActivity { if(response.code() == 201) { - Toasty.info(getApplicationContext(), getString(R.string.emailAddedText)); + Toasty.info(ctx, getString(R.string.emailAddedText)); tinyDb.putBoolean("emailsRefresh", true); enableProcessButton(); finish(); @@ -171,7 +174,7 @@ public class ProfileEmailActivity extends BaseActivity { else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError)); + Toasty.info(ctx, getString(R.string.labelGeneralError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java index 7e2314f7..6146bcea 100644 --- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java @@ -39,6 +39,7 @@ public class ReplyToIssueActivity extends BaseActivity { private View.OnClickListener onClickListener; final Context ctx = this; + private Context appCtx; private SocialAutoCompleteTextView addComment; private ArrayAdapter defaultMentionAdapter; @@ -53,11 +54,12 @@ public class ReplyToIssueActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); + TinyDB tinyDb = new TinyDB(appCtx); addComment = findViewById(R.id.addComment); addComment.setShowSoftInputOnFocus(true); @@ -123,7 +125,7 @@ public class ReplyToIssueActivity extends BaseActivity { public void loadCollaboratorsList() { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -134,9 +136,9 @@ public class ReplyToIssueActivity extends BaseActivity { final String repoName = parts[1]; Call> call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); call.enqueue(new Callback>() { @@ -189,18 +191,18 @@ public class ReplyToIssueActivity extends BaseActivity { private void processNewCommentReply() { String newReplyDT = addComment.getText().toString(); - boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); + boolean connToInternet = AppUtil.haveNetworkConnection(appCtx); if(!connToInternet) { - Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection)); + Toasty.info(ctx, getResources().getString(R.string.checkNetConnection)); return; } if(newReplyDT.equals("")) { - Toasty.info(getApplicationContext(), getString(R.string.commentEmptyError)); + Toasty.info(ctx, getString(R.string.commentEmptyError)); } else { @@ -214,7 +216,7 @@ public class ReplyToIssueActivity extends BaseActivity { private void replyComment(String newReplyDT) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); @@ -228,9 +230,9 @@ public class ReplyToIssueActivity extends BaseActivity { Issues issueComment = new Issues(newReplyDT); Call call = RetrofitClient - .getInstance(instanceUrl, getApplicationContext()) + .getInstance(instanceUrl, ctx) .getApiInterface() - .replyCommentToIssue(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment); + .replyCommentToIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment); call.enqueue(new Callback() { @@ -239,7 +241,7 @@ public class ReplyToIssueActivity extends BaseActivity { if(response.code() == 201) { - Toasty.info(getApplicationContext(), getString(R.string.commentSuccess)); + Toasty.info(ctx, getString(R.string.commentSuccess)); tinyDb.putBoolean("commentPosted", true); tinyDb.putBoolean("resumeIssues", true); tinyDb.putBoolean("resumePullRequests", true); @@ -258,7 +260,7 @@ public class ReplyToIssueActivity extends BaseActivity { else { enableProcessButton(); - Toasty.info(getApplicationContext(), getString(R.string.commentError)); + Toasty.info(ctx, getString(R.string.commentError)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index efb4b43f..8a8b7ddf 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -1,6 +1,7 @@ package org.mian.gitnex.activities; import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.Typeface; @@ -59,6 +60,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF private FragmentRefreshListener fragmentRefreshListener; private FragmentRefreshListenerPr fragmentRefreshListenerPr; + final Context ctx = this; + private Context appCtx; + // issues interface public FragmentRefreshListener getFragmentRefreshListener() { @@ -103,8 +107,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); String repoName1 = parts[1]; @@ -139,15 +144,15 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF switch(tinyDb.getInt("customFontId", -1)) { case 0: - myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf"); + myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf"); break; case 2: - myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf"); + myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf"); break; default: - myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf"); + myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf"); break; } @@ -195,7 +200,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF textViewBadgePull.setVisibility(View.GONE); textViewBadgeRelease.setVisibility(View.GONE); - getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1); + getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1); ColorStateList textColor = tabLayout.getTabTextColors(); // issue count @@ -228,8 +233,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF } } - checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1); - checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1); + checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1); + checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1); } @@ -237,7 +242,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF public void onResume() { super.onResume(); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); String repoFullName = tinyDb.getString("repoFullName"); @@ -247,7 +252,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); if(tinyDb.getBoolean("enableCounterIssueBadge")) { - getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); } } @@ -291,7 +296,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF @Override public void onButtonClicked(String text) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); switch(text) { case "label": @@ -358,7 +363,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF @Override public Fragment getItem(int position) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); String repoFullName = tinyDb.getString("repoFullName"); String[] parts = repoFullName.split("/"); String repoOwner = parts[0]; @@ -401,9 +406,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); - Call call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getUserRepository(token, owner, repo); + Call call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserRepository(token, owner, repo); call.enqueue(new Callback() { @@ -458,14 +463,14 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF Call call; - call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().checkRepoStarStatus(instanceToken, owner, repo); + call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoStarStatus(instanceToken, owner, repo); call.enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); tinyDb.putInt("repositoryStarStatus", response.code()); } @@ -483,14 +488,14 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF Call call; - call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().checkRepoWatchStatus(instanceToken, owner, repo); + call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoWatchStatus(instanceToken, owner, repo); call.enqueue(new Callback() { @Override public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { - TinyDB tinyDb = new TinyDB(getApplicationContext()); + TinyDB tinyDb = new TinyDB(appCtx); if(response.code() == 200) { assert response.body() != null; diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java index f70f2eac..4ba17520 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java @@ -1,5 +1,6 @@ package org.mian.gitnex.activities; +import android.content.Context; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.lifecycle.Observer; @@ -29,6 +30,9 @@ public class RepoStargazersActivity extends BaseActivity { private GridView mGridView; private ProgressBar mProgressBar; + final Context ctx = this; + private Context appCtx; + @Override protected int getLayoutResourceId(){ return R.layout.activity_repo_stargazers; @@ -36,9 +40,11 @@ public class RepoStargazersActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -59,7 +65,7 @@ public class RepoStargazersActivity extends BaseActivity { toolbarTitle.setText(R.string.repoStargazersInMenu); - fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); } @@ -67,10 +73,10 @@ public class RepoStargazersActivity extends BaseActivity { RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class); - repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer>() { + repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer>() { @Override public void onChanged(@Nullable List stargazersListMain) { - adapter = new RepoStargazersAdapter(getApplicationContext(), stargazersListMain); + adapter = new RepoStargazersAdapter(ctx, stargazersListMain); if(adapter.getCount() > 0) { mGridView.setAdapter(adapter); noDataStargazers.setVisibility(View.GONE); diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java index a1f44076..33ecac28 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java @@ -1,5 +1,6 @@ package org.mian.gitnex.activities; +import android.content.Context; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.lifecycle.Observer; @@ -29,6 +30,9 @@ public class RepoWatchersActivity extends BaseActivity { private GridView mGridView; private ProgressBar mProgressBar; + final Context ctx = this; + private Context appCtx; + @Override protected int getLayoutResourceId(){ return R.layout.activity_repo_watchers; @@ -36,9 +40,11 @@ public class RepoWatchersActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - TinyDB tinyDb = new TinyDB(getApplicationContext()); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); final String instanceUrl = tinyDb.getString("instanceUrl"); final String loginUid = tinyDb.getString("loginUid"); final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); @@ -59,7 +65,7 @@ public class RepoWatchersActivity extends BaseActivity { toolbarTitle.setText(R.string.repoWatchersInMenu); - fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName); + fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName); } @@ -67,10 +73,10 @@ public class RepoWatchersActivity extends BaseActivity { RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class); - repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, getApplicationContext()).observe(this, new Observer>() { + repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer>() { @Override public void onChanged(@Nullable List watchersListMain) { - adapter = new RepoWatchersAdapter(getApplicationContext(), watchersListMain); + adapter = new RepoWatchersAdapter(ctx, watchersListMain); if(adapter.getCount() > 0) { mGridView.setAdapter(adapter); noDataWatchers.setVisibility(View.GONE); diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java index cd556524..18e319cd 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java @@ -18,7 +18,7 @@ import org.mian.gitnex.util.TinyDB; public class SettingsAppearanceActivity extends BaseActivity { - private Context ctx; + private Context appCtx; private View.OnClickListener onClickListener; private static String[] timeList = {"Pretty", "Normal"}; @@ -46,8 +46,9 @@ public class SettingsAppearanceActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.ctx = getApplicationContext(); - final TinyDB tinyDb = new TinyDB(ctx); + appCtx = getApplicationContext(); + + final TinyDB tinyDb = new TinyDB(appCtx); ImageView closeActivity = findViewById(R.id.close); @@ -120,11 +121,11 @@ public class SettingsAppearanceActivity extends BaseActivity { if (isChecked) { tinyDb.putBoolean("enableCounterBadges", true); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); } else { tinyDb.putBoolean("enableCounterBadges", false); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); } }); @@ -153,7 +154,7 @@ public class SettingsAppearanceActivity extends BaseActivity { this.recreate(); this.overridePendingTransition(0, 0); dialogInterfaceTheme.dismiss(); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); }); @@ -186,7 +187,7 @@ public class SettingsAppearanceActivity extends BaseActivity { this.recreate(); this.overridePendingTransition(0, 0); dialogInterfaceCustomFont.dismiss(); - Toasty.info(ctx, ctx.getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, appCtx.getResources().getString(R.string.settingsSave)); }); @@ -216,7 +217,7 @@ public class SettingsAppearanceActivity extends BaseActivity { tinyDb.putInt("homeScreenId", i); dialogInterfaceHomeScreen.dismiss(); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); }); @@ -269,7 +270,7 @@ public class SettingsAppearanceActivity extends BaseActivity { } dialogInterfaceCodeBlock.dismiss(); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); }); @@ -306,7 +307,7 @@ public class SettingsAppearanceActivity extends BaseActivity { } dialogInterfaceTime.dismiss(); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); }); diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java index 6435871b..2344fa54 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java @@ -18,7 +18,7 @@ import org.mian.gitnex.util.TinyDB; public class SettingsFileViewerActivity extends BaseActivity { - private Context ctx; + private Context appCtx; private View.OnClickListener onClickListener; private static String[] fileveiwerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"}; @@ -34,8 +34,9 @@ public class SettingsFileViewerActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.ctx = getApplicationContext(); - final TinyDB tinyDb = new TinyDB(ctx); + appCtx = getApplicationContext(); + + final TinyDB tinyDb = new TinyDB(appCtx); ImageView closeActivity = findViewById(R.id.close); @@ -84,7 +85,7 @@ public class SettingsFileViewerActivity extends BaseActivity { tinyDb.putInt("fileviewerSourceCodeThemeId", i); dialogInterfaceTheme.dismiss(); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); }); @@ -99,12 +100,12 @@ public class SettingsFileViewerActivity extends BaseActivity { if(isChecked) { tinyDb.putBoolean("enablePdfMode", true); tinyDb.putString("enablePdfModeInit", "yes"); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); } else { tinyDb.putBoolean("enablePdfMode", false); tinyDb.putString("enablePdfModeInit", "yes"); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); } }); diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java index 4d357f40..761bf0ea 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java @@ -15,7 +15,7 @@ import org.mian.gitnex.util.TinyDB; public class SettingsReportsActivity extends BaseActivity { - private Context ctx; + private Context appCtx; private View.OnClickListener onClickListener; @Override @@ -28,8 +28,9 @@ public class SettingsReportsActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.ctx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(ctx); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); ImageView closeActivity = findViewById(R.id.close); @@ -50,11 +51,11 @@ public class SettingsReportsActivity extends BaseActivity { if(isChecked) { tinyDb.putBoolean("crashReportingEnabled", true); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); } else { tinyDb.putBoolean("crashReportingEnabled", false); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); } }); diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java index 4d45a2a8..1dff9548 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java @@ -17,7 +17,7 @@ import org.mian.gitnex.util.TinyDB; public class SettingsSecurityActivity extends BaseActivity { - private Context ctx; + private Context appCtx; private View.OnClickListener onClickListener; @Override @@ -30,8 +30,9 @@ public class SettingsSecurityActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.ctx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(ctx); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); ImageView closeActivity = findViewById(R.id.close); @@ -49,16 +50,16 @@ public class SettingsSecurityActivity extends BaseActivity { builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage)); builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> { - ctx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply(); + appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply(); tinyDb.putBoolean("loggedInMode", false); tinyDb.remove("basicAuthPassword"); tinyDb.putBoolean("basicAuthFlag", false); //tinyDb.clear(); - Intent loginActivityIntent = new Intent().setClass(ctx, LoginActivity.class); + Intent loginActivityIntent = new Intent().setClass(appCtx, LoginActivity.class); loginActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - ctx.startActivity(loginActivityIntent); + appCtx.startActivity(loginActivityIntent); }); diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java index 9301175f..604446eb 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java @@ -19,7 +19,7 @@ import org.mian.gitnex.util.TinyDB; public class SettingsTranslationActivity extends BaseActivity { - private Context ctx; + private Context appCtx; private View.OnClickListener onClickListener; private static String[] langList = {"English", "Arabic", "Chinese", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", @@ -36,8 +36,9 @@ public class SettingsTranslationActivity extends BaseActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.ctx = getApplicationContext(); - TinyDB tinyDb = new TinyDB(ctx); + appCtx = getApplicationContext(); + + TinyDB tinyDb = new TinyDB(appCtx); ImageView closeActivity = findViewById(R.id.close); @@ -142,7 +143,7 @@ public class SettingsTranslationActivity extends BaseActivity { this.recreate(); this.overridePendingTransition(0, 0); dialogInterface.dismiss(); - Toasty.info(ctx, getResources().getString(R.string.settingsSave)); + Toasty.info(appCtx, getResources().getString(R.string.settingsSave)); }); diff --git a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java index 84d0b357..25110ba9 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java @@ -3,6 +3,7 @@ package org.mian.gitnex.activities; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import android.content.Context; import android.content.res.Resources; import android.os.Bundle; import android.view.View; @@ -20,6 +21,7 @@ import java.util.List; public class SponsorsActivity extends BaseActivity { private View.OnClickListener onClickListener; + private Context appCtx; @Override protected int getLayoutResourceId(){ @@ -28,7 +30,9 @@ public class SponsorsActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); ImageView closeActivity = findViewById(R.id.close); @@ -43,7 +47,7 @@ public class SponsorsActivity extends BaseActivity { RecyclerView mRecyclerView = findViewById(R.id.recyclerView); mRecyclerView.setHasFixedSize(true); - mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + mRecyclerView.setLayoutManager(new LinearLayoutManager(appCtx)); DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);