greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Stefan Schüller 2020-06-27 23:37:55 +02:00 committed by GitHub
commit c3b24d8405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.java
View File

@ -29,6 +29,7 @@ import android.widget.EditText;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
@ -43,6 +44,7 @@ import net.schueller.peertube.database.Server;
import net.schueller.peertube.database.ServerViewModel; import net.schueller.peertube.database.ServerViewModel;
import net.schueller.peertube.fragment.AddServerFragment; import net.schueller.peertube.fragment.AddServerFragment;
import java.util.Objects; import java.util.Objects;
public class ServerAddressBookActivity extends CommonActivity implements AddServerFragment.OnFragmentInteractionListener { public class ServerAddressBookActivity extends CommonActivity implements AddServerFragment.OnFragmentInteractionListener {