Skip to content
This repository was archived by the owner on Apr 12, 2022. It is now read-only.

Commit 5557a8c

Browse files
giomfogiomfo
committed
Rebase from vector-im/riot-android
Update matrix-sdk.aar lib - build 1875 - Revision: ccf12449b8f09b06a7a8f501b9d7a382270b2305 Last rebase was performed June 1 2018. Here is the list of changes from vector-im/riot-android changes: Changes in Riot 0.8.XX (2018-08-24) =================================================== Features: - Manage server quota notices (#2440) Improvements: - Do not ask permission to write external storage at startup (#2483) - Update settings icon and transparent logo for notifications and navigation drawer (#2492) - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514) - Fix some plural and puzzle strings, and remove other unused ones (#2444) - Manage System Alerts in a dedicated section Other changes: - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0 - move PieFractionView from the SDK to the client (#2525) Bugfix: - Fix media sharing (#2530) - Fix notification sound issue in settings (#2524) - Disable app icon badge for "listen for event" notification (#2104) Changes in Riot 0.8.13 (2018-08-09) =================================================== Features: - Resurrect performance metrics (#2391) - Telemetry to report incidence of UISIs (#2330) - Add a previewer for previewing media before sending it into the room (#1742|#2445) - Implements ReplyTo feature (#2390) - Add auto completion for slash commands (#2384) - Support Room Versioning (#2441) Improvements: - Update matrix-sdk.aar lib (v0.9.7). - Piwik: Update the way how stats are reported (#2402) - Improve BugReport screen: display a preview of the screenshot (#2318) - In the settings, move theme settings just below "language" (#2439) - Improve the display of the sources of the message in the dialog (#2348) - Improve the display of the buttons and the reason in the room preview (#2352) - In the flair section on settings, notify the user when he has no flair (#2430) - Improve GDPR consent webview management (#2491) - Support external keyboard to send messages for recent devices (#220, #1279) - When user ignores or un-ignores someone, notify that the app will restart (#2437) Other changes: - Remove dependency to `android-gif-drawable` lib and use Glide to animate logo on Splashscreen (#2421) - Keep only Room.getState() method and remove Room.getLiveState() because they are similar (matrix-org/matrix-android-sdk#310) Bugfix: - Fix issue on incoming call screen when "Do not disturb mode" is active (#2417) - Fix issue when selecting sound for notifications in the settings - Fix issue when changing device name in the settings (#2416) - Fix issue on verifying device, update the wording of the description message (#1067) - Messages with code blocks show other HTML as plain text (#2280) - Message with <p> was sometimes not properly formatted (#2275) - Fix notification issue when Riot is not started (#2451) - Fix Unable to add Matrix apps (#2466) - Riot auto joined a public room (#2472) - Remove last traces of Firebase analytics (#2481) - code blocks are escaped and therefore hard readable (#2484) - Restore the navigation of the back button in the public rooms preview header (#2473) - Fix issue on preference screen: device lists was not displayed (#2409) - Ensure notification has a title (#2242) Changes in Riot 0.8.12 (2018-07-06) =================================================== Bugfix: - Fix issue on vanished favorite and low priority room (#2413) Changes in Riot 0.8.11 (2018-07-03) =================================================== Features: - Re-request keys manually for encrypted events (#2319) - Add option to send voice message to a room, using a third application to record message. To enable in the Labs settings (PR #1762) Improvements: - Update matrix-sdk.aar lib (v0.9.6). - New Floating Action Menu in Home screen (PR #2335) - Add spacing to device keys (#2314) - use apply() instead of commit() to save shared prefs (#2231) - Do not ring if "Do Not Disturb" is active (#1072) - Manage the "consent not given" error when declining a room invite Other changes: - Remove "Matrix application" activation from the Lab section in the settings (#2341) Bugfix: - Remove black borders on 18:9 phone (#2063) - Auto dismiss the join/reject room notification when user select an action (#2354) - Fix some crashes reported by the PlayStore (#2380, #2382, #2383, #2395) - Fix issues in UrlPreviews (#2312) Translations: - Galician thanks to Miguel Branco Build: - Add script to check code quality - Travis will now check if CHANGES.rst has been modified for each PR ------ Merge commit '94b7925a57b800db62b5ec87966d994ff53392b4' into develop # Conflicts: # vector/src/main/java/im/vector/activity/VectorRoomActivity.java # vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java # vector/src/main/java/im/vector/db/VectorContentProvider.java # vector/src/main/java/im/vector/dialogs/ConsentNotGivenHelper.kt # vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt # vector/src/main/res/values/strings.xml # vector/src/main/res/values/styles.xml
2 parents d1fb2d8 + 94b7925 commit 5557a8c

File tree

71 files changed

+1043
-678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1043
-678
lines changed

‎CHANGES.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@ Changes in Riot 0.8.14 (2018-XX-XX)
22
===================================================
33

44
Features:
5-
-
5+
- Manage server quota notices (#2440)
66

77
Improvements:
88
- Do not ask permission to write external storage at startup (#2483)
99
- Update settings icon and transparent logo for notifications and navigation drawer (#2492)
1010
- URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514)
1111
- Fix some plural and puzzle strings, and remove other unused ones (#2444)
12+
- Manage System Alerts in a dedicated section
1213

1314
Other changes:
1415
- Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0
1516
- move PieFractionView from the SDK to the client (#2525)
1617

1718
Bugfix:
18-
-
19+
- Fix media sharing (#2530)
20+
- Fix notification sound issue in settings (#2524)
21+
- Disable app icon badge for "listen for event" notification (#2104)
1922

2023
Translations:
2124
-

‎vector/libs/matrix-sdk.aar

3.03 KB
Binary file not shown.

‎vector/src/main/java/fr/gouv/tchap/activity/TchapLoginActivity.java

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import im.vector.activity.FallbackLoginActivity;
8989
import im.vector.activity.MXCActionBarActivity;
9090
import im.vector.activity.SplashActivity;
91+
import im.vector.dialogs.ResourceLimitDialogHelper;
9192
import im.vector.receiver.VectorRegistrationReceiver;
9293
import im.vector.receiver.VectorUniversalLinkReceiver;
9394
import im.vector.services.EventStreamService;
@@ -271,6 +272,8 @@ public void onReceive(Context context, Intent intent) {
271272
}
272273
};
273274

275+
private ResourceLimitDialogHelper mResourceLimitDialogHelper;
276+
274277
private boolean mIsWaitingNetworkConnection = false;
275278

276279
/**
@@ -455,9 +458,14 @@ public void onClick(View view) {
455458
}
456459
});
457460

458-
if (!isFirstCreation()) {
459-
restoreSavedData(getSavedInstanceState());
461+
if (isFirstCreation()) {
462+
mResourceLimitDialogHelper = new ResourceLimitDialogHelper(this, null);
463+
} else {
464+
final Bundle savedInstanceState = getSavedInstanceState();
465+
mResourceLimitDialogHelper = new ResourceLimitDialogHelper(this, savedInstanceState);
466+
restoreSavedData(savedInstanceState);
460467
}
468+
addToRestorables(mResourceLimitDialogHelper);
461469

462470
refreshDisplay();
463471

@@ -983,32 +991,37 @@ public void onUnexpectedError(Exception e) {
983991
* @param matrixError the matrix error
984992
*/
985993
private void onFailureDuringAuthRequest(MatrixError matrixError) {
986-
String message = matrixError.getLocalizedMessage();
987994
enableLoadingScreen(false);
988995

989-
// detect if it is a Matrix SDK issue
990-
String errCode = matrixError.errcode;
996+
final String errCode = matrixError.errcode;
997+
998+
if (MatrixError.RESOURCE_LIMIT_EXCEEDED.equals(errCode)) {
999+
Log.e(LOG_TAG, "## onFailureDuringAuthRequest(): RESOURCE_LIMIT_EXCEEDED");
1000+
mResourceLimitDialogHelper.displayDialog(matrixError);
1001+
} else {
1002+
final String message;
9911003

992-
if (null != errCode) {
9931004
if (TextUtils.equals(errCode, MatrixError.FORBIDDEN)) {
994-
message = getResources().getString(R.string.login_error_forbidden);
1005+
message = getString(R.string.login_error_forbidden);
9951006
} else if (TextUtils.equals(errCode, MatrixError.UNKNOWN_TOKEN)) {
996-
message = getResources().getString(R.string.login_error_unknown_token);
1007+
message = getString(R.string.login_error_unknown_token);
9971008
} else if (TextUtils.equals(errCode, MatrixError.BAD_JSON)) {
998-
message = getResources().getString(R.string.login_error_bad_json);
1009+
message = getString(R.string.login_error_bad_json);
9991010
} else if (TextUtils.equals(errCode, MatrixError.NOT_JSON)) {
1000-
message = getResources().getString(R.string.login_error_not_json);
1011+
message = getString(R.string.login_error_not_json);
10011012
} else if (TextUtils.equals(errCode, MatrixError.LIMIT_EXCEEDED)) {
1002-
message = getResources().getString(R.string.login_error_limit_exceeded);
1013+
message = getString(R.string.login_error_limit_exceeded);
10031014
} else if (TextUtils.equals(errCode, MatrixError.USER_IN_USE)) {
1004-
message = getResources().getString(R.string.login_error_user_in_use);
1015+
message = getString(R.string.login_error_user_in_use);
10051016
} else if (TextUtils.equals(errCode, MatrixError.LOGIN_EMAIL_URL_NOT_YET)) {
1006-
message = getResources().getString(R.string.login_error_login_email_not_yet);
1017+
message = getString(R.string.login_error_login_email_not_yet);
1018+
} else {
1019+
message = matrixError.getLocalizedMessage();
10071020
}
1008-
}
10091021

1010-
Log.e(LOG_TAG, "## onFailureDuringAuthRequest(): Msg= \"" + message + "\"");
1011-
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show();
1022+
Log.e(LOG_TAG, "## onFailureDuringAuthRequest(): Msg= \"" + message + "\"");
1023+
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show();
1024+
}
10121025
}
10131026

10141027
/**
@@ -2168,6 +2181,12 @@ public void onUsernameAvailabilityChecked(boolean isAvailable) {
21682181
}*/
21692182
}
21702183

2184+
@Override
2185+
public void onResourceLimitExceeded(MatrixError e) {
2186+
enableLoadingScreen(false);
2187+
mResourceLimitDialogHelper.displayDialog(e);
2188+
}
2189+
21712190

21722191
/*
21732192
* *********************************************************************************************

‎vector/src/main/java/fr/gouv/tchap/activity/TchapPublicRoomSelectionActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
import im.vector.PublicRoomsManager;
4646
import im.vector.R;
4747
import im.vector.activity.CommonActivityUtils;
48-
import im.vector.activity.RiotAppCompatActivity;
4948
import fr.gouv.tchap.fragments.TchapPublicRoomsFragment;
49+
import im.vector.activity.VectorAppCompatActivity;
5050

5151
/**
5252
* List all the public rooms by considering all known room directories.
5353
*/
54-
public class TchapPublicRoomSelectionActivity extends RiotAppCompatActivity implements android.support.v7.widget.SearchView.OnQueryTextListener {
54+
public class TchapPublicRoomSelectionActivity extends VectorAppCompatActivity implements android.support.v7.widget.SearchView.OnQueryTextListener {
5555

5656
private static final String LOG_TAG = TchapPublicRoomSelectionActivity.class.getSimpleName();
5757

‎vector/src/main/java/fr/gouv/tchap/fragments/TchapContactFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import im.vector.R;
5252
import im.vector.activity.CommonActivityUtils;
5353
import fr.gouv.tchap.activity.TchapLoginActivity;
54-
import im.vector.activity.RiotAppCompatActivity;
54+
import im.vector.activity.VectorAppCompatActivity;
5555
import im.vector.adapters.ParticipantAdapterItem;
5656
import fr.gouv.tchap.adapters.TchapContactAdapter;
5757
import im.vector.contacts.Contact;
@@ -276,7 +276,7 @@ public void onSelectItem(Room room, int position) {
276276

277277
@Override
278278
public void onSelectItem(ParticipantAdapterItem contact, int position) {
279-
DinsicUtils.startDirectChat((RiotAppCompatActivity) getActivity(), mSession, contact);
279+
DinsicUtils.startDirectChat((VectorAppCompatActivity) getActivity(), mSession, contact);
280280
}
281281
}, this, this);
282282
mRecycler.setAdapter(mAdapter);

‎vector/src/main/java/fr/gouv/tchap/fragments/TchapPublicRoomsFragment.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import im.vector.PublicRoomsManager;
4949
import im.vector.R;
5050
import im.vector.activity.CommonActivityUtils;
51-
import im.vector.activity.RiotAppCompatActivity;
51+
import im.vector.activity.VectorAppCompatActivity;
5252
import im.vector.activity.VectorRoomActivity;
5353
import im.vector.adapters.AdapterSection;
5454
import im.vector.fragments.VectorBaseFragment;
@@ -61,7 +61,7 @@ public class TchapPublicRoomsFragment extends VectorBaseFragment {
6161
private static final String LOG_TAG = TchapPublicRoomsFragment.class.getSimpleName();
6262
private static final String CURRENT_FILTER = "CURRENT_FILTER";
6363

64-
protected RiotAppCompatActivity mActivity;
64+
protected VectorAppCompatActivity mActivity;
6565

6666
protected String mCurrentFilter;
6767

@@ -104,8 +104,8 @@ public View onCreateView(final LayoutInflater inflater, final ViewGroup containe
104104
public void onActivityCreated(final Bundle savedInstanceState) {
105105
super.onActivityCreated(savedInstanceState);
106106

107-
if (getActivity() instanceof RiotAppCompatActivity) {
108-
mActivity = (RiotAppCompatActivity) getActivity();
107+
if (getActivity() instanceof VectorAppCompatActivity) {
108+
mActivity = (VectorAppCompatActivity) getActivity();
109109
}
110110
mSession = Matrix.getInstance(getActivity()).getDefaultSession();
111111

‎vector/src/main/java/fr/gouv/tchap/util/DinsicUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import im.vector.R;
5959
import im.vector.activity.CommonActivityUtils;
6060
import fr.gouv.tchap.activity.TchapLoginActivity;
61-
import im.vector.activity.RiotAppCompatActivity;
61+
import im.vector.activity.VectorAppCompatActivity;
6262
import im.vector.activity.VectorRoomActivity;
6363
import im.vector.adapters.ParticipantAdapterItem;
6464
import im.vector.contacts.Contact;
@@ -341,7 +341,7 @@ public void onClick(DialogInterface dialog, int id) {
341341
* @param canCreate create the direct chat if it does not exist.
342342
* @return boolean that says if the direct chat room is found or not
343343
*/
344-
public static boolean openDirectChat(final RiotAppCompatActivity activity, String participantId, final MXSession session, boolean canCreate) {
344+
public static boolean openDirectChat(final VectorAppCompatActivity activity, String participantId, final MXSession session, boolean canCreate) {
345345
Room existingRoom = isDirectChatRoomAlreadyExist(participantId, session, true);
346346
boolean succeeded = false;
347347

@@ -515,7 +515,7 @@ public static Room isDirectChatRoomAlreadyExist(String aUserId, MXSession mSessi
515515
* @param session the current session
516516
* @param selectedContact the selected contact
517517
*/
518-
public static void startDirectChat (final RiotAppCompatActivity activity, final MXSession session, final ParticipantAdapterItem selectedContact) {
518+
public static void startDirectChat (final VectorAppCompatActivity activity, final MXSession session, final ParticipantAdapterItem selectedContact) {
519519
if (selectedContact.mIsValid) {
520520
// Tell if contact is tchap user
521521
if (MXSession.isUserId(selectedContact.mUserId)) {
@@ -578,7 +578,7 @@ public void onClick(DialogInterface dialog, int id) {
578578
* @param session the current session
579579
* @param selectedUser the selected tchap user
580580
*/
581-
public static void startDirectChat(final RiotAppCompatActivity activity, final MXSession session, User selectedUser) {
581+
public static void startDirectChat(final VectorAppCompatActivity activity, final MXSession session, User selectedUser) {
582582
// Consider here that the provided id is a correct matrix identifier, we don't check again
583583
// Try first to open an existing direct chat
584584
if (!openDirectChat(activity, selectedUser.user_id, session, false)) {

‎vector/src/main/java/im/vector/LoginHandler.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ public void getSupportedLoginFlows(Context ctx, final HomeServerConnectionConfig
151151
LoginRestClient client = new LoginRestClient(hsConfig);
152152

153153
client.getSupportedLoginFlows(new UnrecognizedCertApiCallback<List<LoginFlow>>(hsConfig, callback) {
154+
@Override
155+
public void onSuccess(List<LoginFlow> info) {
156+
callback.onSuccess(info);
157+
}
158+
154159
@Override
155160
public void onAcceptedCert() {
156161
getSupportedLoginFlows(appCtx, hsConfig, callback);
@@ -221,6 +226,11 @@ public void submitEmailTokenValidation(final Context aCtx,
221226
ThirdPidRestClient restClient = new ThirdPidRestClient(aHomeServerConfig);
222227

223228
pid.submitValidationToken(restClient, aToken, aClientSecret, aSid, new UnrecognizedCertApiCallback<Boolean>(aHomeServerConfig, aRespCallback) {
229+
@Override
230+
public void onSuccess(Boolean info) {
231+
aRespCallback.onSuccess(info);
232+
}
233+
224234
@Override
225235
public void onAcceptedCert() {
226236
submitEmailTokenValidation(aCtx, aHomeServerConfig, aToken, aClientSecret, aSid, aRespCallback);

‎vector/src/main/java/im/vector/RegistrationManager.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,12 @@ public void onRegistrationSuccess() {
214214
public void onRegistrationFailed(String message) {
215215
listener.onUsernameAvailabilityChecked(!TextUtils.equals(MatrixError.USER_IN_USE, message));
216216
}
217+
218+
@Override
219+
public void onResourceLimitExceeded(MatrixError e) {
220+
// Should not happen, consider user is available, registration will fail later on
221+
listener.onUsernameAvailabilityChecked(true);
222+
}
217223
});
218224
}
219225
}
@@ -352,6 +358,11 @@ public void onRegistrationFailed(String message) {
352358
listener.onRegistrationFailed(message);
353359
}
354360
}
361+
362+
@Override
363+
public void onResourceLimitExceeded(MatrixError e) {
364+
listener.onResourceLimitExceeded(e);
365+
}
355366
});
356367
} else {
357368
// TODO Report this fix in Riot
@@ -404,6 +415,11 @@ public void onRegistrationFailed(String message) {
404415
listener.onRegistrationFailed(message);
405416
}
406417
}
418+
419+
@Override
420+
public void onResourceLimitExceeded(MatrixError e) {
421+
listener.onResourceLimitExceeded(e);
422+
}
407423
});
408424
}
409425

@@ -977,6 +993,8 @@ public void onMatrixError(MatrixError e) {
977993
Log.e(LOG_TAG, "JsonUtils.toRegistrationFlowResponse " + castExcept.getLocalizedMessage(), castExcept);
978994
}
979995
listener.onRegistrationFailed(ERROR_MISSING_STAGE);
996+
} else if (TextUtils.equals(e.errcode, MatrixError.RESOURCE_LIMIT_EXCEEDED)) {
997+
listener.onResourceLimitExceeded(e);
980998
} else {
981999
listener.onRegistrationFailed("");
9821000
}
@@ -995,6 +1013,8 @@ private interface InternalRegistrationListener {
9951013
void onRegistrationSuccess();
9961014

9971015
void onRegistrationFailed(String message);
1016+
1017+
void onResourceLimitExceeded(MatrixError e);
9981018
}
9991019

10001020
/*
@@ -1027,5 +1047,7 @@ public interface RegistrationListener {
10271047
void onWaitingCaptcha();
10281048

10291049
void onThreePidRequestFailed(String message);
1050+
1051+
void onResourceLimitExceeded(MatrixError e);
10301052
}
10311053
}

‎vector/src/main/java/im/vector/UnrecognizedCertApiCallback.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* Handle certificate errors in API callbacks
99
*/
10-
public class UnrecognizedCertApiCallback<T> extends SimpleApiCallback<T> {
10+
public abstract class UnrecognizedCertApiCallback<T> extends SimpleApiCallback<T> {
1111

1212
private HomeServerConnectionConfig mHsConfig;
1313
private ApiCallback mCallback;
@@ -27,9 +27,7 @@ public UnrecognizedCertApiCallback(HomeServerConnectionConfig hsConfig) {
2727
*
2828
* The usual behavior is to play the request again
2929
*/
30-
public void onAcceptedCert() {
31-
32-
}
30+
public abstract void onAcceptedCert();
3331

3432
/**
3533
* The request failed because of an unknown TLS certificate or a network error

‎vector/src/main/java/im/vector/activity/AbstractWidgetActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import java.util.*
4949
*
5050
* Layout MUST contains a WebView with ID 'widget_webview'
5151
*/
52-
abstract class AbstractWidgetActivity : RiotAppCompatActivity() {
52+
abstract class AbstractWidgetActivity : VectorAppCompatActivity() {
5353

5454
/* ==========================================================================================
5555
* UI

‎vector/src/main/java/im/vector/activity/AccountCreationActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/**
4141
* AccountCreationActivity is the fallback account creation activity
4242
*/
43-
public class AccountCreationActivity extends RiotAppCompatActivity {
43+
public class AccountCreationActivity extends VectorAppCompatActivity {
4444
private static final String LOG_TAG = AccountCreationActivity.class.getSimpleName();
4545

4646
public static final String EXTRA_HOME_SERVER_ID = "AccountCreationActivity.EXTRA_HOME_SERVER_ID";

‎vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
/**
4949
* AccountCreationCaptchaActivity displays a webview to check captchas.
5050
*/
51-
public class AccountCreationCaptchaActivity extends RiotAppCompatActivity {
51+
public class AccountCreationCaptchaActivity extends VectorAppCompatActivity {
5252
private static final String LOG_TAG = AccountCreationCaptchaActivity.class.getSimpleName();
5353

5454
public static final String EXTRA_HOME_SERVER_URL = "AccountCreationCaptchaActivity.EXTRA_HOME_SERVER_URL";

‎vector/src/main/java/im/vector/activity/CountryPickerActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import im.vector.util.ThemeUtils;
4040
import kotlin.Pair;
4141

42-
public class CountryPickerActivity extends RiotAppCompatActivity implements CountryAdapter.OnSelectCountryListener, SearchView.OnQueryTextListener {
42+
public class CountryPickerActivity extends VectorAppCompatActivity implements CountryAdapter.OnSelectCountryListener, SearchView.OnQueryTextListener {
4343

4444
private static final String EXTRA_IN_WITH_INDICATOR = "EXTRA_IN_WITH_INDICATOR";
4545
public static final String EXTRA_OUT_COUNTRY_NAME = "EXTRA_OUT_COUNTRY_NAME";

‎vector/src/main/java/im/vector/activity/DeactivateAccountActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.matrix.androidsdk.rest.model.MatrixError
3131
/**
3232
* Displays the Account deactivation screen.
3333
*/
34-
class DeactivateAccountActivity : RiotAppCompatActivity() {
34+
class DeactivateAccountActivity : VectorAppCompatActivity() {
3535

3636
/* ==========================================================================================
3737
* UI

‎vector/src/main/java/im/vector/activity/FallbackLoginActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* FallbackLoginActivity is the fallback login activity
4646
* i.e this activity is created when the client does not support the
4747
*/
48-
public class FallbackLoginActivity extends RiotAppCompatActivity {
48+
public class FallbackLoginActivity extends VectorAppCompatActivity {
4949
private static final String LOG_TAG = FallbackLoginActivity.class.getSimpleName();
5050

5151
public static final String EXTRA_HOME_SERVER_ID = "FallbackLoginActivity.EXTRA_HOME_SERVER_ID";

‎vector/src/main/java/im/vector/activity/HistoricalRoomsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
/**
6565
* Displays the historical rooms list
6666
*/
67-
public class HistoricalRoomsActivity extends RiotAppCompatActivity implements
67+
public class HistoricalRoomsActivity extends VectorAppCompatActivity implements
6868
SearchView.OnQueryTextListener,
6969
HomeRoomAdapter.OnSelectRoomListener,
7070
AbsAdapter.MoreRoomActionListener,

0 commit comments

Comments
 (0)