diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java index 73d495ad9..d6fdb5301 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java @@ -92,32 +92,6 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P super.onActivityCreated(savedInstanceState); this.setListAdapter(new WifiPeerListAdapter(getActivity(), R.layout.row_peer_device, peerDevices)); - ImageButton editUserDeviceName = getActivity().findViewById(R.id.btn_edit_device_name); - editUserDeviceName.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if(userDevice != null) { - //TODO: Dialog to take input & call this method: - //((DeviceActionListener) getActivity()).changeDeviceName("Sood"); - - if(((LocalFileTransferActivity) getActivity()).isWifiP2pEnabled()) { - FragmentTransaction fragmentTransaction = getActivity().getSupportFragmentManager().beginTransaction(); - Fragment prev = getActivity().getSupportFragmentManager().findFragmentByTag("EditDeviceNameDialog"); - if (prev != null) { - fragmentTransaction.remove(prev); // To prevent multiple instances of the DialogFragment - } - fragmentTransaction.addToBackStack(null); - - EditDeviceNameDialog dialogFragment = new EditDeviceNameDialog(); - // For DialogFragments, show() handles the fragment commit and display - dialogFragment.show(fragmentTransaction, "EditDeviceNameDialog"); - } else { - Toast.makeText(getActivity(), "Enable WiFi P2P to change device name", Toast.LENGTH_SHORT).show(); - } - } - } - }); - if(((LocalFileTransferActivity) getActivity()).isFileSender()) { fileSender = true; fileUriList = ((LocalFileTransferActivity) getActivity()).getFileURIArrayList(); @@ -359,7 +333,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P public interface DeviceActionListener { - void changeDeviceName(String deviceNewName); + /*void changeDeviceName(String deviceNewName);*/ /*void showDetails(WifiP2pDevice device);*/ @@ -372,41 +346,6 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P void closeLocalFileTransferActivity(); } - public static class EditDeviceNameDialog extends DialogFragment { - - @NonNull - @Override - public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - - builder.setView(R.layout.dialog_edit_device_name) - .setPositiveButton("Update", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - EditText changeDeviceName = EditDeviceNameDialog.this.getDialog().findViewById(R.id.edit_text_change_device_name); - String deviceNewName = changeDeviceName.getText().toString(); - //Toast.makeText(getActivity(), "Changing name to: " + deviceNewName.getText().toString(), Toast.LENGTH_SHORT).show(); - - if(deviceNewName != null && !deviceNewName.equals("")) { - ((DeviceActionListener) getActivity()).changeDeviceName(deviceNewName); - } else { - Toast.makeText(getActivity(), "Error: Empty name field", Toast.LENGTH_SHORT).show(); - } - - //dialog.cancel(); - } - }) - .setNeutralButton("Dismiss", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - } - }); - - return builder.create(); - } - } - public static class PeerGroupHandshakeAsyncTask extends AsyncTask { private DeviceListFragment deviceListFragment; diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java index 7033b8aad..824b01de6 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java @@ -519,30 +519,6 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi } } - // TODO: Remove this feature since reflection of hidden methods/fields is restricted from Pie (& will subsequently lead to exceptions) - @Override - public void changeDeviceName(String deviceNewName) { - try { - Method method = manager.getClass().getMethod("setDeviceName", WifiP2pManager.Channel.class, String.class, WifiP2pManager.ActionListener.class); - method.invoke(manager, channel, deviceNewName, new WifiP2pManager.ActionListener() { - @Override - public void onSuccess() { - Toast.makeText(LocalFileTransferActivity.this, "Name successfully changed", Toast.LENGTH_LONG).show(); - resetPeers(); - } - - @Override - public void onFailure(int reason) { - Toast.makeText(LocalFileTransferActivity.this, "Request failed: " + reason, Toast.LENGTH_SHORT).show(); - Log.d(TAG, "Name change failed: " + getErrorMessage(reason)); - } - }); - - } catch (Exception e) { - e.printStackTrace(); - } - } - public boolean isFileSender() { return fileSendingDevice; } diff --git a/app/src/main/res/layout/fragment_device_list.xml b/app/src/main/res/layout/fragment_device_list.xml index e527639d5..cd63694ea 100644 --- a/app/src/main/res/layout/fragment_device_list.xml +++ b/app/src/main/res/layout/fragment_device_list.xml @@ -18,7 +18,7 @@ android:textStyle="italic" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toLeftOf="@id/btn_edit_device_name" + app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> - -