Skip to content

Commit

Permalink
Implemented automatic insertion of demo users in demo channel, and pa…
Browse files Browse the repository at this point in the history
…id users in their own private channels after they have been registered to that channel by our company. Also made many graphical improvements in the in-channel layouts.
  • Loading branch information
Theofilos-Chamalis committed Feb 21, 2015
1 parent 922cea1 commit 427bdd3
Show file tree
Hide file tree
Showing 5 changed files with 291 additions and 187 deletions.
6 changes: 4 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ dependencies {
compile 'com.android.support:recyclerview-v7:21.+'
compile files('/home/theofilos/new_git/QRPushToTalk/libraries/android-async-http-1.4.6.jar')
compile files('/home/theofilos/new_git/QRPushToTalk/libraries/gson-2.3.1.jar')
compile files('/home/theo/git/QRPushToTalk/libraries/android-async-http-1.4.6.jar')
compile files('/home/theo/git/QRPushToTalk/libraries/gson-2.3.1.jar')
}


Expand All @@ -62,8 +64,8 @@ android {
minSdkVersion 14
targetSdkVersion 21
applicationId "com.terracom.qrpttbeta"
versionCode 79
versionName "0.8.9"
versionCode 80
versionName "0.9.0"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
buildConfigField "boolean", "DONATE_NAG", "false"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ public class QRPushToTalkActivity extends ActionBarActivity implements ListView.
*/
public static final String EXTRA_DRAWER_FRAGMENT = "drawer_fragment";

public static final String LastChannelPreference = "lastchannelloggedprefs";
public static String nameOfSavedLastLoggedChannel = "";

private QRPushToTalkService.QRPushToTalkBinder mService;
private QRPushToTalkDatabase mDatabase;
private Settings mSettings;
Expand Down Expand Up @@ -386,6 +389,16 @@ protected void onDestroy() {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
preferences.unregisterOnSharedPreferenceChangeListener(this);
mDatabase.close();


if(!ServerEditFragment.CompanyNameStr.equals("")){
SharedPreferences mysettings = getSharedPreferences(LastChannelPreference,0);
SharedPreferences.Editor myEditor = mysettings.edit();
myEditor.putString("LastChannel",ServerEditFragment.CompanyNameStr);
myEditor.commit();
}


super.onDestroy();
}

Expand Down Expand Up @@ -747,6 +760,11 @@ public void onDisconnected(JumbleException e) throws RemoteException {
}
}*/


SharedPreferences mysettings = getSharedPreferences(LastChannelPreference,0);
nameOfSavedLastLoggedChannel = mysettings.getString("LastChannel","");


ServerConnectTask connectTask = new ServerConnectTask(this, mDatabase);
connectTask.execute(server);
}
Expand Down
Loading

0 comments on commit 427bdd3

Please sign in to comment.