joel/ZoomHelperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

added final where possible

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