@@ -909,40 +909,17 @@ public static void setToggleDirectMessageRoom(final MXSession aSession,
909909 final String aRoomId ,
910910 String aParticipantUserId ,
911911 final Activity fromActivity ,
912- final ApiCallback <Void > callback ) {
912+ @ NonNull final ApiCallback <Void > callback ) {
913913
914914 if ((null == aSession ) || (null == fromActivity ) || TextUtils .isEmpty (aRoomId )) {
915- Log .d (LOG_TAG , "## setToggleDirectMessageRoom(): failure - invalid input parameters" );
915+ Log .e (LOG_TAG , "## setToggleDirectMessageRoom(): failure - invalid input parameters" );
916+ callback .onUnexpectedError (new Exception ("## setToggleDirectMessageRoom(): failure - invalid input parameters" ));
916917 } else {
917- aSession .toggleDirectChatRoom (aRoomId , aParticipantUserId , new ApiCallback <Void >() {
918+ aSession .toggleDirectChatRoom (aRoomId , aParticipantUserId , new SimpleApiCallback <Void >(callback ) {
918919 @ Override
919920 public void onSuccess (Void info ) {
920921 callback .onSuccess (null );
921922 }
922-
923- @ Override
924- public void onNetworkError (Exception e ) {
925- Log .d (LOG_TAG , "## setToggleDirectMessageRoom(): invite() onNetworkError Msg=" + e .getLocalizedMessage ());
926- if (null != callback ) {
927- callback .onNetworkError (e );
928- }
929- }
930-
931- @ Override
932- public void onMatrixError (MatrixError e ) {
933- Log .d (LOG_TAG , "## setToggleDirectMessageRoom(): invite() onMatrixError Msg=" + e .getLocalizedMessage ());
934- if (null != callback ) {
935- callback .onMatrixError (e );
936- }
937- }
938-
939- @ Override
940- public void onUnexpectedError (Exception e ) {
941- Log .d (LOG_TAG , "## setToggleDirectMessageRoom(): invite() onUnexpectedError Msg=" + e .getLocalizedMessage ());
942- if (null != callback ) {
943- callback .onUnexpectedError (e );
944- }
945- }
946923 });
947924 }
948925 }
@@ -1012,19 +989,14 @@ public int compare(RoomSummary lhs, RoomSummary rhs) {
1012989
1013990 new AlertDialog .Builder (fromActivity )
1014991 .setTitle (R .string .send_files_in )
1015- .setNegativeButton (R .string .cancel ,
1016- new DialogInterface .OnClickListener () {
1017- @ Override
1018- public void onClick (DialogInterface dialog , int which ) {
1019- dialog .dismiss ();
1020- }
1021- })
992+ .setNegativeButton (R .string .cancel , null )
1022993 .setAdapter (adapter ,
1023994 new DialogInterface .OnClickListener () {
1024995
1025996 @ Override
1026997 public void onClick (DialogInterface dialog , final int which ) {
1027998 dialog .dismiss ();
999+
10281000 fromActivity .runOnUiThread (new Runnable () {
10291001 @ Override
10301002 public void run () {
@@ -1052,34 +1024,6 @@ public void run() {
10521024 // Media utils
10531025 //==============================================================================================================
10541026
1055- /**
1056- * Save a media in the downloads directory and offer to open it with a third party application.
1057- *
1058- * @param activity the activity
1059- * @param savedMediaPath the media path
1060- * @param mimeType the media mime type.
1061- */
1062- public static void openMedia (final Activity activity , final String savedMediaPath , final String mimeType ) {
1063- if ((null != activity ) && (null != savedMediaPath )) {
1064- activity .runOnUiThread (new Runnable () {
1065- @ Override
1066- public void run () {
1067- try {
1068- File file = new File (savedMediaPath );
1069- Intent intent = new Intent ();
1070- intent .setAction (android .content .Intent .ACTION_VIEW );
1071- intent .setDataAndType (Uri .fromFile (file ), mimeType );
1072- activity .startActivity (intent );
1073- } catch (ActivityNotFoundException e ) {
1074- Toast .makeText (activity , e .getLocalizedMessage (), Toast .LENGTH_LONG ).show ();
1075- } catch (Exception e ) {
1076- Log .d (LOG_TAG , "## openMedia(): Exception Msg=" + e .getMessage (), e );
1077- }
1078- }
1079- });
1080- }
1081- }
1082-
10831027 /**
10841028 * Copy a file into a dstPath directory.
10851029 * The output filename can be provided.
@@ -1189,11 +1133,11 @@ protected Pair<String, Exception> doInBackground(Void... params) {
11891133 protected void onPostExecute (Pair <String , Exception > result ) {
11901134 if (null != callback ) {
11911135 if (null == result ) {
1192- callback .onNetworkError (new Exception ("Null parameters" ));
1136+ callback .onUnexpectedError (new Exception ("Null parameters" ));
11931137 } else if (null != result .first ) {
11941138 callback .onSuccess (result .first );
11951139 } else {
1196- callback .onNetworkError (result .second );
1140+ callback .onUnexpectedError (result .second );
11971141 }
11981142 }
11991143 }
@@ -1513,9 +1457,7 @@ public void onClick(DialogInterface dialog, int which) {
15131457 /**
15141458 * Export the e2e keys for a dedicated session.
15151459 * {@link im.vector.util.PermissionsToolsKt#PERMISSIONS_FOR_WRITING_FILES} has to be granted
1516- *
1517- * TODO Export as a Share
1518- *
1460+ * <p>
15191461 *
15201462 * @param session the session
15211463 * @param password the password
@@ -1532,7 +1474,7 @@ public static void exportKeys(final MXSession session, final String password, fi
15321474 return ;
15331475 }
15341476
1535- session .getCrypto ().exportRoomKeys (password , new ApiCallback <byte []>() {
1477+ session .getCrypto ().exportRoomKeys (password , new SimpleApiCallback <byte []>(callback ) {
15361478 @ Override
15371479 public void onSuccess (byte [] bytesArray ) {
15381480 try {
@@ -1541,62 +1483,20 @@ public void onSuccess(byte[] bytesArray) {
15411483 stream .close ();
15421484
15431485 saveMediaIntoDownloads (appContext ,
1544- new File (Uri .parse (url ).getPath ()), "riot-keys.txt" , "text/plain" , new SimpleApiCallback <String >() {
1486+ new File (Uri .parse (url ).getPath ()), "riot-keys.txt" , "text/plain" , new SimpleApiCallback <String >(callback ) {
15451487 @ Override
15461488 public void onSuccess (String path ) {
15471489 if (null != callback ) {
15481490 callback .onSuccess (path );
15491491 }
15501492 }
1551-
1552- @ Override
1553- public void onNetworkError (Exception e ) {
1554- if (null != callback ) {
1555- callback .onNetworkError (e );
1556- }
1557- }
1558-
1559- @ Override
1560- public void onMatrixError (MatrixError e ) {
1561- if (null != callback ) {
1562- callback .onMatrixError (e );
1563- }
1564- }
1565-
1566- @ Override
1567- public void onUnexpectedError (Exception e ) {
1568- if (null != callback ) {
1569- callback .onUnexpectedError (e );
1570- }
1571- }
15721493 });
15731494 } catch (Exception e ) {
15741495 if (null != callback ) {
1575- callback .onMatrixError ( new MatrixError ( null , e . getLocalizedMessage ()) );
1496+ callback .onUnexpectedError ( e );
15761497 }
15771498 }
15781499 }
1579-
1580- @ Override
1581- public void onNetworkError (Exception e ) {
1582- if (null != callback ) {
1583- callback .onNetworkError (e );
1584- }
1585- }
1586-
1587- @ Override
1588- public void onMatrixError (MatrixError e ) {
1589- if (null != callback ) {
1590- callback .onMatrixError (e );
1591- }
1592- }
1593-
1594- @ Override
1595- public void onUnexpectedError (Exception e ) {
1596- if (null != callback ) {
1597- callback .onUnexpectedError (e );
1598- }
1599- }
16001500 });
16011501 }
16021502
0 commit comments