added final where possible
This commit is contained in:
@@ -42,12 +42,12 @@ public class MainActivity extends AppCompatActivity {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
//get intent parameters
|
||||
Intent myIntent = getIntent();
|
||||
String action = myIntent.getAction();
|
||||
String type = myIntent.getType();
|
||||
String meetingName = myIntent.getStringExtra("meetingName");
|
||||
final Intent myIntent = getIntent();
|
||||
final String action = myIntent.getAction();
|
||||
final String type = myIntent.getType();
|
||||
final String meetingName = myIntent.getStringExtra("meetingName");
|
||||
boolean joinImmediately = myIntent.getBooleanExtra("joinImmediately", false);
|
||||
//boolean testing = myIntent.getBooleanExtra("testing", false);
|
||||
//final boolean testing = myIntent.getBooleanExtra("testing", false);
|
||||
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
@@ -73,13 +73,13 @@ public class MainActivity extends AppCompatActivity {
|
||||
ShortcutIcon.setOnClickListener(v -> showCreateShortcutUI());
|
||||
|
||||
//show alert if meeting from shortcut not found
|
||||
int meetingIndex = meetingsController.searchMeetingInList(meetingsController.getMeetings(), meetingName);
|
||||
final int meetingIndex = meetingsController.searchMeetingInList(meetingsController.getMeetings(), meetingName);
|
||||
if (meetingIndex == -1) {
|
||||
if (meetingName != null) {
|
||||
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
|
||||
final AlertDialog.Builder dialog = new AlertDialog.Builder(this);
|
||||
dialog.setMessage(R.string.shortcutLaunchFailedText);
|
||||
dialog.setTitle(R.string.hint);
|
||||
AlertDialog alertDialog = dialog.create();
|
||||
final AlertDialog alertDialog = dialog.create();
|
||||
alertDialog.show();
|
||||
}
|
||||
joinImmediately = false;
|
||||
@@ -88,11 +88,11 @@ public class MainActivity extends AppCompatActivity {
|
||||
//adjust ui for meeting from shortcut
|
||||
if (meetingIndex <= meetingsController.getMeetings().size() && meetingIndex != -1) {
|
||||
meetingsController.setLastMeeting(meetingIndex);
|
||||
AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
|
||||
final AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
|
||||
textMeetingName.setEnabled(false);
|
||||
textMeetingName.setAdapter(null);
|
||||
trashIcon.setVisibility(View.GONE);
|
||||
TextInputLayout layoutMeetingName = findViewById(R.id.layoutMeetingName);
|
||||
final TextInputLayout layoutMeetingName = findViewById(R.id.layoutMeetingName);
|
||||
layoutMeetingName.setEndIconMode(TextInputLayout.END_ICON_NONE);
|
||||
}
|
||||
|
||||
@@ -104,10 +104,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
fillMeeting(meetingsController.getLastMeeting());
|
||||
scrollview.post(() -> scrollview.scrollTo(0, scrollview.getChildAt(0).getHeight()));
|
||||
} catch (IndexOutOfBoundsException e) {
|
||||
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
|
||||
final AlertDialog.Builder dialog = new AlertDialog.Builder(this);
|
||||
dialog.setMessage(R.string.resetDataText);
|
||||
dialog.setTitle(R.string.hint);
|
||||
AlertDialog alertDialog = dialog.create();
|
||||
final AlertDialog alertDialog = dialog.create();
|
||||
alertDialog.show();
|
||||
meetingsController.setLastMeeting(-1);
|
||||
meetingsController.saveMeetingList(new ArrayList<>());
|
||||
@@ -123,12 +123,12 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
//join meeting immediately, otherwise enable app updater
|
||||
if (joinImmediately) {
|
||||
Meeting currMeeting = meetingsController.getMeetings().get(meetingIndex);
|
||||
final Meeting currMeeting = meetingsController.getMeetings().get(meetingIndex);
|
||||
new ZoomLink(this, currMeeting).launch();
|
||||
} else {
|
||||
//TODO: updatetest.xml -> update.xml when finished testing
|
||||
AppUpdater appUpdater = new AppUpdater(this).setUpdateFrom(UpdateFrom.XML).setUpdateXML("https://baldaufwd.de/ZoomHelper/updatetest.xml");
|
||||
APKDownloader apkDownloader = new APKDownloader();
|
||||
final AppUpdater appUpdater = new AppUpdater(this).setUpdateFrom(UpdateFrom.XML).setUpdateXML("https://baldaufwd.de/ZoomHelper/updatetest.xml");
|
||||
final APKDownloader apkDownloader = new APKDownloader();
|
||||
appUpdater.setButtonUpdateClickListener((dialog, which) -> apkDownloader.downloadAPK(this, "ZoomHelper.apk", Uri.parse("https://baldaufwd.de/ZoomHelper/ZoomHelper.apk")));
|
||||
appUpdater.start();
|
||||
}
|
||||
@@ -147,7 +147,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
final LinearLayout layoutBegin = findViewById(R.id.layoutBegin);
|
||||
final ClipboardManager clipboard = (ClipboardManager) getApplicationContext().getSystemService(CLIPBOARD_SERVICE);
|
||||
|
||||
Snackbar snackbar = Snackbar.make(layoutBegin, R.string.foundImportableMeetingClipboard, Snackbar.LENGTH_INDEFINITE).setDuration(7000);
|
||||
final Snackbar snackbar = Snackbar.make(layoutBegin, R.string.foundImportableMeetingClipboard, Snackbar.LENGTH_INDEFINITE).setDuration(7000);
|
||||
snackbar.setAction(R.string.importMeeting, view -> {
|
||||
String text = clipboard.getPrimaryClip().getItemAt(0).getText().toString();
|
||||
handleSendText(text);
|
||||
@@ -156,7 +156,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
});
|
||||
|
||||
if (clipboard.hasPrimaryClip() && clipboard.getPrimaryClipDescription().hasMimeType(MIMETYPE_TEXT_PLAIN)) {
|
||||
String text = clipboard.getPrimaryClip().getItemAt(0).getText().toString();
|
||||
final String text = clipboard.getPrimaryClip().getItemAt(0).getText().toString();
|
||||
if (handleSendText(text, true)) {
|
||||
snackbar.show();
|
||||
}
|
||||
@@ -165,7 +165,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
private void handleSendText(Intent intent) {
|
||||
String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
|
||||
final String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
|
||||
handleSendText(sharedText);
|
||||
}
|
||||
|
||||
@@ -192,25 +192,25 @@ public class MainActivity extends AppCompatActivity {
|
||||
meetingName = Objects.requireNonNull(matcher.group(0)).trim();
|
||||
}
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle(R.string.app_name);
|
||||
builder.setMessage(R.string.meetingAlreadyExists);
|
||||
|
||||
if (meetingID.equals("")) {
|
||||
builder.setMessage(R.string.importError);
|
||||
builder.setPositiveButton(R.string.ok, (dialog, which) -> dialog.dismiss());
|
||||
AlertDialog alert = builder.create();
|
||||
final AlertDialog alert = builder.create();
|
||||
if (!checkOnly) alert.show();
|
||||
return false;
|
||||
} else {
|
||||
|
||||
Meeting mtgToImport = new Meeting(meetingName, meetingID, meetingPWD, "", "");
|
||||
final Meeting mtgToImport = new Meeting(meetingName, meetingID, meetingPWD, "", "");
|
||||
|
||||
if (meetingsController.searchMeetingInList(meetingsController.getMeetings(), mtgToImport.meetingName) == -1 && !checkOnly) {
|
||||
fillMeeting(mtgToImport);
|
||||
} else {
|
||||
builder.setPositiveButton(R.string.override, (dialog, which) -> {
|
||||
int found = meetingsController.searchMeetingInList(meetingsController.getMeetings(), mtgToImport.meetingName);
|
||||
final int found = meetingsController.searchMeetingInList(meetingsController.getMeetings(), mtgToImport.meetingName);
|
||||
importMeeting(mtgToImport, false);
|
||||
fillMeeting(found);
|
||||
dialog.dismiss();
|
||||
@@ -220,7 +220,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
fillMeeting(mtgToImport);
|
||||
dialog.dismiss();
|
||||
});
|
||||
AlertDialog alert = builder.create();
|
||||
final AlertDialog alert = builder.create();
|
||||
if (!checkOnly) alert.show();
|
||||
return true;
|
||||
}
|
||||
@@ -230,9 +230,9 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
private void showCreateShortcutUI() {
|
||||
int meeting = meetingsController.searchMeetingInList(meetingsController.getMeetings(), createCurrMeetingFromUI().meetingName);
|
||||
final int meeting = meetingsController.searchMeetingInList(meetingsController.getMeetings(), createCurrMeetingFromUI().meetingName);
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
|
||||
builder.setTitle(R.string.app_name);
|
||||
|
||||
@@ -257,12 +257,12 @@ public class MainActivity extends AppCompatActivity {
|
||||
createMeetingShortcut(meeting, false);
|
||||
});
|
||||
}
|
||||
AlertDialog alert = builder.create();
|
||||
final AlertDialog alert = builder.create();
|
||||
alert.show();
|
||||
}
|
||||
|
||||
private void createMeetingShortcut(int meetingIndex, boolean joinImmediately) {
|
||||
Meeting meeting = meetingsController.getMeetings().get(meetingIndex);
|
||||
final Meeting meeting = meetingsController.getMeetings().get(meetingIndex);
|
||||
|
||||
if (ShortcutManagerCompat.isRequestPinShortcutSupported(this)) {
|
||||
ShortcutInfoCompat shortcutInfo = new ShortcutInfoCompat.Builder(this, meeting.meetingName)
|
||||
@@ -284,21 +284,21 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
private void shareMeeting(Meeting meeting) {
|
||||
Intent sendIntent = new Intent();
|
||||
final Intent sendIntent = new Intent();
|
||||
sendIntent.setAction(Intent.ACTION_SEND);
|
||||
sendIntent.putExtra(Intent.EXTRA_TEXT, meeting.info());
|
||||
sendIntent.setType("text/plain");
|
||||
|
||||
Intent shareIntent = Intent.createChooser(sendIntent, null);
|
||||
final Intent shareIntent = Intent.createChooser(sendIntent, null);
|
||||
startActivity(shareIntent);
|
||||
}
|
||||
|
||||
public void fillBlank() {
|
||||
EditText editMeetingName = findViewById(R.id.TextMeetingName);
|
||||
EditText editID = findViewById(R.id.textBoxID);
|
||||
EditText editPW = findViewById(R.id.editTextTextPassword2);
|
||||
AutoCompleteTextView editName = findViewById(R.id.textBoxName);
|
||||
EditText editAtt = findViewById(R.id.editAtt);
|
||||
final EditText editMeetingName = findViewById(R.id.TextMeetingName);
|
||||
final EditText editID = findViewById(R.id.textBoxID);
|
||||
final EditText editPW = findViewById(R.id.editTextTextPassword2);
|
||||
final AutoCompleteTextView editName = findViewById(R.id.textBoxName);
|
||||
final EditText editAtt = findViewById(R.id.editAtt);
|
||||
|
||||
editMeetingName.setText("");
|
||||
editID.setText("");
|
||||
@@ -309,8 +309,8 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
public void fillWithSelectedMeeting() {
|
||||
AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
|
||||
int search = meetingsController.searchMeetingInList(meetingsController.getMeetings(), textMeetingName.getText().toString());
|
||||
final AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
|
||||
final int search = meetingsController.searchMeetingInList(meetingsController.getMeetings(), textMeetingName.getText().toString());
|
||||
if (search != -1) {
|
||||
fillMeeting(search);
|
||||
}
|
||||
@@ -318,15 +318,15 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
@SuppressLint("ClickableViewAccessibility")
|
||||
public void fillDropdownMeetingName() {
|
||||
ArrayList<Meeting> meetings = meetingsController.getMeetings();
|
||||
final ArrayList<Meeting> meetings = meetingsController.getMeetings();
|
||||
|
||||
String[] meetingNames = new String[meetings.size()];
|
||||
for (int i = 0; i < meetings.size(); i++) {
|
||||
meetingNames[i] = meetings.get(i).meetingName;
|
||||
}
|
||||
|
||||
AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
|
||||
AutoSuggestAdapter adapter = new AutoSuggestAdapter(this, android.R.layout.simple_dropdown_item_1line);
|
||||
final AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
|
||||
final AutoSuggestAdapter adapter = new AutoSuggestAdapter(this, android.R.layout.simple_dropdown_item_1line);
|
||||
adapter.setData(Arrays.asList(meetingNames));
|
||||
textMeetingName.setAdapter(adapter);
|
||||
|
||||
@@ -337,16 +337,16 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
@SuppressLint("ClickableViewAccessibility")
|
||||
public void fillDropdownAttendeeName(int meetingIndex) {
|
||||
Meeting meeting = meetingsController.getMeetings().get(meetingIndex);
|
||||
ArrayList<Attendee> attendees = meeting.attendees;
|
||||
final Meeting meeting = meetingsController.getMeetings().get(meetingIndex);
|
||||
final ArrayList<Attendee> attendees = meeting.attendees;
|
||||
|
||||
String[] attNames = new String[attendees.size()];
|
||||
for (int i = 0; i < attendees.size(); i++) {
|
||||
attNames[i] = attendees.get(i).name;
|
||||
}
|
||||
|
||||
AutoCompleteTextView textName = findViewById(R.id.textBoxName);
|
||||
AutoSuggestAdapter adapter = new AutoSuggestAdapter(this, android.R.layout.simple_dropdown_item_1line);
|
||||
final AutoCompleteTextView textName = findViewById(R.id.textBoxName);
|
||||
final AutoSuggestAdapter adapter = new AutoSuggestAdapter(this, android.R.layout.simple_dropdown_item_1line);
|
||||
|
||||
adapter.setData(Arrays.asList(attNames));
|
||||
textName.setAdapter(adapter);
|
||||
@@ -357,18 +357,18 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
private void fillWithSelectedAtt(int meetingIndex) {
|
||||
AutoCompleteTextView textName = findViewById(R.id.textBoxName);
|
||||
EditText editAtt = findViewById(R.id.editAtt);
|
||||
int found = meetingsController.getMeetings().get(meetingIndex).searchAttendee(textName.getText().toString());
|
||||
final AutoCompleteTextView textName = findViewById(R.id.textBoxName);
|
||||
final EditText editAtt = findViewById(R.id.editAtt);
|
||||
final int found = meetingsController.getMeetings().get(meetingIndex).searchAttendee(textName.getText().toString());
|
||||
editAtt.setText(meetingsController.getMeetings().get(meetingIndex).attendees.get(found).num);
|
||||
}
|
||||
|
||||
public void fillMeeting(Meeting meeting) {
|
||||
EditText editMeetingName = findViewById(R.id.TextMeetingName);
|
||||
EditText editID = findViewById(R.id.textBoxID);
|
||||
EditText editPW = findViewById(R.id.editTextTextPassword2);
|
||||
EditText editName = findViewById(R.id.textBoxName);
|
||||
EditText editAtt = findViewById(R.id.editAtt);
|
||||
final EditText editMeetingName = findViewById(R.id.TextMeetingName);
|
||||
final EditText editID = findViewById(R.id.textBoxID);
|
||||
final EditText editPW = findViewById(R.id.editTextTextPassword2);
|
||||
final EditText editName = findViewById(R.id.textBoxName);
|
||||
final EditText editAtt = findViewById(R.id.editAtt);
|
||||
|
||||
editID.setError(null);
|
||||
editID.clearFocus();
|
||||
@@ -392,23 +392,24 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
public void btnJoin_onClick(View view) {
|
||||
saveMeetingFromUI();
|
||||
Meeting currMeeting = createCurrMeetingFromUI();
|
||||
final Meeting currMeeting = createCurrMeetingFromUI();
|
||||
new ZoomLink(this, currMeeting).launch();
|
||||
}
|
||||
|
||||
public Meeting createCurrMeetingFromUI() {
|
||||
EditText editMeetingName = findViewById(R.id.TextMeetingName);
|
||||
EditText editID = findViewById(R.id.textBoxID);
|
||||
EditText editPW = findViewById(R.id.editTextTextPassword2);
|
||||
EditText editName = findViewById(R.id.textBoxName);
|
||||
EditText editAtt = findViewById(R.id.editAtt);
|
||||
final EditText editMeetingName = findViewById(R.id.TextMeetingName);
|
||||
final EditText editID = findViewById(R.id.textBoxID);
|
||||
final EditText editPW = findViewById(R.id.editTextTextPassword2);
|
||||
final EditText editName = findViewById(R.id.textBoxName);
|
||||
final EditText editAtt = findViewById(R.id.editAtt);
|
||||
|
||||
return new Meeting(editMeetingName.getText().toString(), editID.getText().toString(), editPW.getText().toString(), editName.getText().toString(), editAtt.getText().toString());
|
||||
}
|
||||
|
||||
public void importMeeting(Meeting meeting, boolean updateAttendee) {
|
||||
ArrayList<Meeting> listMeetings = meetingsController.getMeetings();
|
||||
int foundCurr = meetingsController.searchMeetingInList(listMeetings, meeting.meetingName);
|
||||
final ArrayList<Meeting> listMeetings = meetingsController.getMeetings();
|
||||
final int foundCurr = meetingsController.searchMeetingInList(listMeetings, meeting.meetingName);
|
||||
|
||||
if (foundCurr == -1) {
|
||||
listMeetings.add(meeting);
|
||||
if (listMeetings.size() == 1) {
|
||||
@@ -418,7 +419,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
} else {
|
||||
Meeting currMeeting = meetingsController.getMeetings().get(foundCurr);
|
||||
final Meeting currMeeting = meetingsController.getMeetings().get(foundCurr);
|
||||
currMeeting.meetingID = meeting.meetingID;
|
||||
currMeeting.meetingPWD = meeting.meetingPWD;
|
||||
if (updateAttendee)
|
||||
@@ -437,15 +438,15 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
public void saveMeetingFromUI() {
|
||||
Meeting currMeetingUI = createCurrMeetingFromUI();
|
||||
final Meeting currMeetingUI = createCurrMeetingFromUI();
|
||||
|
||||
if (currMeetingUI.meetingID.equals("")) {
|
||||
EditText editID = findViewById(R.id.textBoxID);
|
||||
final EditText editID = findViewById(R.id.textBoxID);
|
||||
editID.requestFocus();
|
||||
editID.setError(getString(R.string.meetingWithoutID));
|
||||
return;
|
||||
} else if (currMeetingUI.meetingName.equals("")) {
|
||||
EditText editMName = findViewById(R.id.TextMeetingName);
|
||||
final EditText editMName = findViewById(R.id.TextMeetingName);
|
||||
editMName.setText(currMeetingUI.meetingID);
|
||||
currMeetingUI.meetingName = currMeetingUI.meetingID;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user