ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When a conversation was already open it affected the file sharing process.

Browse Source
This commit is contained in:
Lyndon
2017-11-06 22:17:45 +01:00
parent 07737782dd
commit 7cd5ff902b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java
View File

@@ -13,6 +13,7 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.View; import android.view.View;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
@@ -22,6 +23,7 @@ import javax.inject.Named;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import de.beyondsoft.ownchat.R; import de.beyondsoft.ownchat.R;
import de.beyondsoft.ownchat.data.AppPrefsConstants; import de.beyondsoft.ownchat.data.AppPrefsConstants;
import de.beyondsoft.ownchat.data.prefs.BooleanPreference; import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
@@ -50,10 +52,6 @@ public class SharingActivity extends RuntimePermissionActivity implements Sharin
@Named(AppPrefsConstants.LOGIN_TOKEN) @Named(AppPrefsConstants.LOGIN_TOKEN)
StringPreference mLoginTokenPreference; StringPreference mLoginTokenPreference;
@Inject
@Named(AppPrefsConstants.USER_ID)
LongPreference mUserIdPreference;
@BindView(R.id.sharing_contacts_recycler_view) @BindView(R.id.sharing_contacts_recycler_view)
RecyclerView mContactsRecyclerView; RecyclerView mContactsRecyclerView;
@@ -101,6 +99,8 @@ public class SharingActivity extends RuntimePermissionActivity implements Sharin
} }
private void returnToContactList(int requestCode) { private void returnToContactList(int requestCode) {
mSelectedFilePath.delete();
mIsComingFromSharingActivity.set(false);
startActivity(new Intent(this, MainActivity.class)); startActivity(new Intent(this, MainActivity.class));
finishAffinity(); finishAffinity();
} }
@@ -195,4 +195,9 @@ public class SharingActivity extends RuntimePermissionActivity implements Sharin
public void setGroups(ArrayList<Group> groups) { public void setGroups(ArrayList<Group> groups) {
mContactsAdapter.setGroups(groups); mContactsAdapter.setGroups(groups);
} }
@OnClick(R.id.chat_toolbar_back_arrow)
public void onBackArrowClick(View view) {
returnToContactList(0);
}
} }